[Spice-devel] [PATCH v3] Remove global "allowed" variable

[Frediano Ziglio]

> This variable was always the same value as
> dispatcher_allows_client_mouse.
> ---
> Here's a third proposal where I remove reds_set_client_mouse_allowed() and
> incorporate the code directly into reds_update_client_mouse_allowed()
> 
>  server/reds.c | 23 ++++++++---------------
>  1 file changed, 8 insertions(+), 15 deletions(-)
> 
> diff --git a/server/reds.c b/server/reds.c
> index 827ba2a..dcb5834 100644
> --- a/server/reds.c
> +++ b/server/reds.c
> @@ -1856,17 +1856,6 @@ static void reds_handle_main_link(RedsState *reds,
> RedLinkInfo *link)
>       ((state & SPICE_MOUSE_BUTTON_MASK_MIDDLE) ? VD_AGENT_MBUTTON_MASK : 0)
>       |    \
>       ((state & SPICE_MOUSE_BUTTON_MASK_RIGHT) ? VD_AGENT_RBUTTON_MASK : 0))
>  
> -static void reds_set_client_mouse_allowed(RedsState *reds, int
> is_client_mouse_allowed, int x_res, int y_res)
> -{
> -    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);
> -    if (reds->is_client_mouse_allowed &&
> inputs_channel_has_tablet(reds->inputs_channel)) {
> -        inputs_channel_set_tablet_logical_size(reds->inputs_channel,
> reds->monitor_mode.x_res, reds->monitor_mode.y_res);
> -    }
> -}
> -
>  static void openssl_init(RedLinkInfo *link)
>  {
>      unsigned long f4 = RSA_F4;
> @@ -4193,7 +4182,6 @@ void reds_core_timer_remove(RedsState *reds,
>  
>  void reds_update_client_mouse_allowed(RedsState *reds)
>  {
> -    static int allowed = FALSE;
>      int allow_now = FALSE;
>      int x_res = 0;
>      int y_res = 0;
> @@ -4211,9 +4199,14 @@ void reds_update_client_mouse_allowed(RedsState *reds)
>          }
>      }
>  
> -    if (allow_now || allow_now != allowed) {
> -        allowed = allow_now;
> -        reds_set_client_mouse_allowed(reds, allowed, x_res, y_res);
> +    if (allow_now || allow_now != reds->dispatcher_allows_client_mouse) {
> +        reds->monitor_mode.x_res = x_res;
> +        reds->monitor_mode.y_res = y_res;
> +        reds->dispatcher_allows_client_mouse = allow_now;
> +        reds_update_mouse_mode(reds);
> +        if (reds->is_client_mouse_allowed &&
> inputs_channel_has_tablet(reds->inputs_channel)) {
> +            inputs_channel_set_tablet_logical_size(reds->inputs_channel,
> reds->monitor_mode.x_res, reds->monitor_mode.y_res);
> +        }
>      }
>  }
>  

You could reduce indentation inverting the if and putting a return.
But beside that optional thing,

Acked-by: Frediano Ziglio <fziglio at redhat.com>

Frediano