diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 14:24:51 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
| commit | 70451d293e496eb6ee9dc32e0737274dbba5dd97 (patch) | |
| tree | 5d243ddcdc46532490ef1a073be4c7fd8673919d /server | |
| parent | 6b712c31f363afb6e4136283b6f8a9d942a92e04 (diff) | |
| download | spice-70451d293e496eb6ee9dc32e0737274dbba5dd97.tar.gz spice-70451d293e496eb6ee9dc32e0737274dbba5dd97.tar.xz spice-70451d293e496eb6ee9dc32e0737274dbba5dd97.zip | |
Change reds_get_mouse_mode() to take RedsState arg
Diffstat (limited to 'server')
| -rw-r--r-- | server/inputs-channel.c | 8 | ||||
| -rw-r--r-- | server/reds.c | 2 | ||||
| -rw-r--r-- | server/reds.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/server/inputs-channel.c b/server/inputs-channel.c index d49e6bea..18f2f129 100644 --- a/server/inputs-channel.c +++ b/server/inputs-channel.c @@ -363,7 +363,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui red_channel_client_pipe_add_type(rcc, PIPE_ITEM_MOUSE_MOTION_ACK); icc->motion_count = 0; } - if (mouse && reds_get_mouse_mode() == SPICE_MOUSE_MODE_SERVER) { + if (mouse && reds_get_mouse_mode(reds) == SPICE_MOUSE_MODE_SERVER) { SpiceMouseInterface *sif; sif = SPICE_CONTAINEROF(mouse->base.sif, SpiceMouseInterface, base); sif->motion(mouse, @@ -380,7 +380,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui red_channel_client_pipe_add_type(rcc, PIPE_ITEM_MOUSE_MOTION_ACK); icc->motion_count = 0; } - if (reds_get_mouse_mode() != SPICE_MOUSE_MODE_CLIENT) { + if (reds_get_mouse_mode(reds) != SPICE_MOUSE_MODE_CLIENT) { break; } spice_assert((reds_get_agent_mouse() && reds_has_vdagent()) || tablet); @@ -406,7 +406,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui } else if (mouse_press->button == SPICE_MOUSE_BUTTON_DOWN) { dz = 1; } - if (reds_get_mouse_mode() == SPICE_MOUSE_MODE_CLIENT) { + if (reds_get_mouse_mode(reds) == SPICE_MOUSE_MODE_CLIENT) { if (reds_get_agent_mouse() && reds_has_vdagent()) { inputs_channel->mouse_state.buttons = RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_press->buttons_state) | @@ -428,7 +428,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui } case SPICE_MSGC_INPUTS_MOUSE_RELEASE: { SpiceMsgcMouseRelease *mouse_release = message; - if (reds_get_mouse_mode() == SPICE_MOUSE_MODE_CLIENT) { + if (reds_get_mouse_mode(reds) == SPICE_MOUSE_MODE_CLIENT) { if (reds_get_agent_mouse() && reds_has_vdagent()) { inputs_channel->mouse_state.buttons = RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_release->buttons_state); diff --git a/server/reds.c b/server/reds.c index 92475d3b..6540991b 100644 --- a/server/reds.c +++ b/server/reds.c @@ -539,7 +539,7 @@ static void reds_mig_disconnect(void) } } -int reds_get_mouse_mode(void) +int reds_get_mouse_mode(RedsState *reds) { return reds->mouse_mode; } diff --git a/server/reds.h b/server/reds.h index bedd7424..9688297c 100644 --- a/server/reds.h +++ b/server/reds.h @@ -59,7 +59,7 @@ void reds_set_client_mouse_allowed(int is_client_mouse_allowed, int x_res, int y_res); void reds_register_channel(RedsState *reds, RedChannel *channel); void reds_unregister_channel(RedsState *reds, RedChannel *channel); -int reds_get_mouse_mode(void); // used by inputs_channel +int reds_get_mouse_mode(RedsState *reds); // used by inputs_channel int reds_get_agent_mouse(void); // used by inputs_channel int reds_has_vdagent(void); // used by inputs channel void reds_handle_agent_mouse_event(const VDAgentMouseState *mouse_state); // used by inputs_channel |