diff options
| author | Jonathon Jongsma <jjongsma@redhat.com> | 2015-01-16 15:04:34 -0600 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-02-23 23:00:42 +0100 |
| commit | 06d1dfaf2245b1dd05abb13f7eb0a7d3a36be008 (patch) | |
| tree | 75ce46fbcd12531a626aface004c8e0f4143eec6 | |
| parent | 976a6baeba782eab6c8d8f47229dae4251581a5d (diff) | |
| download | spice-06d1dfaf2245b1dd05abb13f7eb0a7d3a36be008.tar.gz spice-06d1dfaf2245b1dd05abb13f7eb0a7d3a36be008.tar.xz spice-06d1dfaf2245b1dd05abb13f7eb0a7d3a36be008.zip | |
Change reds_handle_agent_mouse_event() to take RedsState arg
| -rw-r--r-- | server/inputs-channel.c | 6 | ||||
| -rw-r--r-- | server/reds.c | 5 | ||||
| -rw-r--r-- | server/reds.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/server/inputs-channel.c b/server/inputs-channel.c index 18f2f129..8b6c1991 100644 --- a/server/inputs-channel.c +++ b/server/inputs-channel.c @@ -395,7 +395,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui mouse_state->y = pos->y; mouse_state->buttons = RED_MOUSE_BUTTON_STATE_TO_AGENT(pos->buttons_state); mouse_state->display_id = pos->display_id; - reds_handle_agent_mouse_event(mouse_state); + reds_handle_agent_mouse_event(reds, mouse_state); break; } case SPICE_MSGC_INPUTS_MOUSE_PRESS: { @@ -412,7 +412,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_press->buttons_state) | (dz == -1 ? VD_AGENT_UBUTTON_MASK : 0) | (dz == 1 ? VD_AGENT_DBUTTON_MASK : 0); - reds_handle_agent_mouse_event(&inputs_channel->mouse_state); + reds_handle_agent_mouse_event(reds, &inputs_channel->mouse_state); } else if (tablet) { SpiceTabletInterface *sif; sif = SPICE_CONTAINEROF(tablet->base.sif, SpiceTabletInterface, base); @@ -432,7 +432,7 @@ static int inputs_channel_handle_parsed(RedChannelClient *rcc, uint32_t size, ui if (reds_get_agent_mouse() && reds_has_vdagent()) { inputs_channel->mouse_state.buttons = RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_release->buttons_state); - reds_handle_agent_mouse_event(&inputs_channel->mouse_state); + reds_handle_agent_mouse_event(reds, &inputs_channel->mouse_state); } else if (tablet) { SpiceTabletInterface *sif; sif = SPICE_CONTAINEROF(tablet->base.sif, SpiceTabletInterface, base); diff --git a/server/reds.c b/server/reds.c index 0b6edd2e..3ed91bd8 100644 --- a/server/reds.c +++ b/server/reds.c @@ -779,10 +779,11 @@ static void vdi_port_send_tokens_to_client(RedClient *client, uint32_t tokens, v static void vdi_port_on_free_self_token(void *opaque) { + RedsState *reds = opaque; if (inputs_inited() && reds->pending_mouse_event) { spice_debug("pending mouse event"); - reds_handle_agent_mouse_event(inputs_get_mouse_state()); + reds_handle_agent_mouse_event(reds, inputs_get_mouse_state()); } } @@ -799,7 +800,7 @@ int reds_has_vdagent(void) return !!vdagent; } -void reds_handle_agent_mouse_event(const VDAgentMouseState *mouse_state) +void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mouse_state) { SpiceCharDeviceWriteBuffer *char_dev_buf; VDInternalBuf *internal_buf; diff --git a/server/reds.h b/server/reds.h index 0849fca9..b59ebf2d 100644 --- a/server/reds.h +++ b/server/reds.h @@ -62,7 +62,7 @@ void reds_unregister_channel(RedsState *reds, RedChannel *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 +void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState *mouse_state); // used by inputs_channel enum { RED_RENDERER_INVALID, |