diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 14:27:01 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
| commit | 9217a51b28157cfd33b5d8647cc638f055fb9e3a (patch) | |
| tree | 73e78745070582e698e8d44a33893172d378788c | |
| parent | 679e4d26e4a6ea480ca91f29356b29fe433ac995 (diff) | |
| download | spice-9217a51b28157cfd33b5d8647cc638f055fb9e3a.tar.gz spice-9217a51b28157cfd33b5d8647cc638f055fb9e3a.tar.xz spice-9217a51b28157cfd33b5d8647cc638f055fb9e3a.zip | |
Update reds_update_mouse_mode() to take RedsState arg
| -rw-r--r-- | server/reds.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/server/reds.c b/server/reds.c index 629889d1..c926f500 100644 --- a/server/reds.c +++ b/server/reds.c @@ -559,7 +559,7 @@ int reds_get_agent_mouse(void) return agent_mouse; } -static void reds_update_mouse_mode(void) +static void reds_update_mouse_mode(RedsState *reds) { int allowed = 0; int qxl_count = red_dispatcher_qxl_count(); @@ -588,7 +588,7 @@ static void reds_agent_remove(void) reds_reset_vdp(); vdagent = NULL; - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); if (reds_main_channel_connected() && !red_channel_waits_for_migrate_data(&reds->main_channel->base)) { main_channel_push_agent_disconnected(reds->main_channel); @@ -1669,7 +1669,7 @@ void reds_set_client_mouse_allowed(int is_client_mouse_allowed, int x_res, int y reds->monitor_mode.x_res = x_res; reds->monitor_mode.y_res = y_res; reds->dispatcher_allows_client_mouse = is_client_mouse_allowed; - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); if (reds->is_client_mouse_allowed && inputs_has_tablet()) { inputs_set_tablet_logical_size(reds->monitor_mode.x_res, reds->monitor_mode.y_res); } @@ -2869,7 +2869,7 @@ static SpiceCharDeviceState *attach_to_red_agent(SpiceCharDeviceInstance *sin) } vdagent = sin; - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); sif = SPICE_CONTAINEROF(vdagent->base.sif, SpiceCharDeviceInterface, base); if (sif->state) { @@ -3115,7 +3115,7 @@ SPICE_GNUC_VISIBLE int spice_server_add_interface(SpiceServer *s, if (inputs_set_tablet(SPICE_CONTAINEROF(sin, SpiceTabletInstance, base)) != 0) { return -1; } - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); if (reds->is_client_mouse_allowed) { inputs_set_tablet_logical_size(reds->monitor_mode.x_res, reds->monitor_mode.y_res); } @@ -3175,7 +3175,7 @@ SPICE_GNUC_VISIBLE int spice_server_remove_interface(SpiceBaseInstance *sin) if (strcmp(interface->type, SPICE_INTERFACE_TABLET) == 0) { spice_info("remove SPICE_INTERFACE_TABLET"); inputs_detach_tablet(SPICE_CONTAINEROF(sin, SpiceTabletInstance, base)); - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); } else if (strcmp(interface->type, SPICE_INTERFACE_PLAYBACK) == 0) { spice_info("remove SPICE_INTERFACE_PLAYBACK"); snd_detach_playback(SPICE_CONTAINEROF(sin, SpicePlaybackInstance, base)); @@ -3670,7 +3670,7 @@ SPICE_GNUC_VISIBLE int spice_server_set_agent_mouse(SpiceServer *s, int enable) { spice_assert(reds == s); agent_mouse = enable; - reds_update_mouse_mode(); + reds_update_mouse_mode(reds); return 0; } |