Acked-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx>
On Tue, 2016-04-19 at 11:00 -0500, Jonathon Jongsma wrote:
> From: Christophe Fergeau <cfergeau@xxxxxxxxxx>
>
> ---
> server/inputs-channel.c | 8 ++++----
> server/reds.c | 8 ++++----
> server/reds.h | 2 +-
> 3 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/server/inputs-channel.c b/server/inputs-channel.c
> index d1af9cf..da26cf6 100644
> --- a/server/inputs-channel.c
> +++ b/server/inputs-channel.c
> @@ -363,8 +363,8 @@ static int inputs_channel_handle_parsed(RedChannelClient
> *rcc, uint32_t size, ui
> if (reds_get_mouse_mode(reds) != SPICE_MOUSE_MODE_CLIENT) {
> break;
> }
> - spice_assert((reds_get_agent_mouse(reds) && reds_has_vdagent(reds))
> || tablet);
> - if (!reds_get_agent_mouse(reds) || !reds_has_vdagent(reds)) {
> + spice_assert((reds_config_get_agent_mouse(reds) &&
> reds_has_vdagent(reds)) || tablet);
> + if (!reds_config_get_agent_mouse(reds) || !reds_has_vdagent(reds)) {
> SpiceTabletInterface *sif;
> sif = SPICE_CONTAINEROF(tablet->base.sif, SpiceTabletInterface,
> base);
> sif->position(tablet, pos->x, pos->y,
> RED_MOUSE_STATE_TO_LOCAL(pos->buttons_state));
> @@ -387,7 +387,7 @@ static int inputs_channel_handle_parsed(RedChannelClient
> *rcc, uint32_t size, ui
> dz = 1;
> }
> if (reds_get_mouse_mode(reds) == SPICE_MOUSE_MODE_CLIENT) {
> - if (reds_get_agent_mouse(reds) && reds_has_vdagent(reds)) {
> + if (reds_config_get_agent_mouse(reds) && reds_has_vdagent(reds))
> {
> inputs_channel->mouse_state.buttons =
> RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_press
> ->buttons_state) |
> (dz == -1 ? VD_AGENT_UBUTTON_MASK : 0) |
> @@ -409,7 +409,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(reds) == SPICE_MOUSE_MODE_CLIENT) {
> - if (reds_get_agent_mouse(reds) && reds_has_vdagent(reds)) {
> + if (reds_config_get_agent_mouse(reds) && reds_has_vdagent(reds))
> {
> inputs_channel->mouse_state.buttons =
> RED_MOUSE_BUTTON_STATE_TO_AGENT(mouse_release
> ->buttons_state);
> reds_handle_agent_mouse_event(reds, &inputs_channel
> ->mouse_state);
> diff --git a/server/reds.c b/server/reds.c
> index 68f4cca..5ee913a 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -699,7 +699,7 @@ static void reds_set_mouse_mode(RedsState *reds, uint32_t
> mode)
> main_channel_push_mouse_mode(reds->main_channel, reds->mouse_mode, reds
> ->is_client_mouse_allowed);
> }
>
> -gboolean reds_get_agent_mouse(const RedsState *reds)
> +gboolean reds_config_get_agent_mouse(const RedsState *reds)
> {
> return reds->config->agent_mouse;
> }
> @@ -2927,7 +2927,7 @@ static inline void on_activating_ticketing(RedsState
> *reds)
> }
> }
>
> -static void reds_set_image_compression(RedsState *reds, SpiceImageCompression
> val)
> +static void reds_config_set_image_compression(RedsState *reds,
> SpiceImageCompression val)
> {
> if (val == reds->config->image_compression) {
> return;
> @@ -3766,11 +3766,11 @@ SPICE_GNUC_VISIBLE int
> spice_server_set_image_compression(SpiceServer *s,
> if (comp == SPICE_IMAGE_COMPRESSION_LZ4) {
> spice_warning("LZ4 compression not supported, falling back to auto
> GLZ");
> comp = SPICE_IMAGE_COMPRESSION_AUTO_GLZ;
> - reds_set_image_compression(s, comp);
> + reds_config_set_image_compression(s, comp);
> return -1;
> }
> #endif
> - reds_set_image_compression(s, comp);
> + reds_config_set_image_compression(s, comp);
> return 0;
> }
>
> diff --git a/server/reds.h b/server/reds.h
> index 5b33432..ef1f2a8 100644
> --- a/server/reds.h
> +++ b/server/reds.h
> @@ -58,7 +58,7 @@ void reds_set_client_mouse_allowed(RedsState *reds,
> void reds_register_channel(RedsState *reds, RedChannel *channel);
> void reds_unregister_channel(RedsState *reds, RedChannel *channel);
> int reds_get_mouse_mode(RedsState *reds); // used by inputs_channel
> -gboolean reds_get_agent_mouse(const RedsState *reds); // used by
> inputs_channel
> +gboolean reds_config_get_agent_mouse(const RedsState *reds); // used by
> inputs_channel
> int reds_has_vdagent(RedsState *reds); // used by inputs channel
> void reds_handle_agent_mouse_event(RedsState *reds, const VDAgentMouseState
> *mouse_state); // used by inputs_channel
>
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel