[Spice-devel] [PATCH spice-gtk v4 4/6] gtk: Avoid deprecated gdk_keyboard_grab

[Christophe Fergeau]

Acked-by: Christophe Fergeau <cfergeau at redhat.com>

On Tue, Feb 14, 2017 at 07:05:16PM +0100, Pavel Grunt wrote:
> gdk_keyboard_grab() was deprecated in 3.0 for gdk_device_grab()
> but that was also deprecated for gdk_seat_grab() in 3.20
> ---
>  src/spice-widget.c | 26 ++++++++++++++++++++++++++
>  1 file changed, 26 insertions(+)
> 
> diff --git a/src/spice-widget.c b/src/spice-widget.c
> index f3fa911..9d99c80 100644
> --- a/src/spice-widget.c
> +++ b/src/spice-widget.c
> @@ -819,6 +819,17 @@ SpiceGrabSequence *spice_display_get_grab_keys(SpiceDisplay *display)
>      return d->grabseq;
>  }
>  
> +#if GTK_CHECK_VERSION(3, 20, 0)
> +static GdkSeat *spice_display_get_default_seat(SpiceDisplay *display)
> +{
> +    GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(display));
> +    GdkDisplay *gdk_display = gdk_window_get_display(window);
> +    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> +    return gdk_display_get_default_seat(gdk_display);
> +    G_GNUC_END_IGNORE_DEPRECATIONS
> +}
> +#endif
> +
>  /* FIXME: gdk_keyboard_grab/ungrab() is deprecated */
>  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
>  
> @@ -857,8 +868,19 @@ static void try_keyboard_grab(SpiceDisplay *display)
>                                              GetModuleHandle(NULL), 0);
>      g_warn_if_fail(d->keyboard_hook != NULL);
>  #endif
> +#if GTK_CHECK_VERSION(3, 20, 0)
> +    status = gdk_seat_grab(spice_display_get_default_seat(display),
> +                           gtk_widget_get_window(widget),
> +                           GDK_SEAT_CAPABILITY_KEYBOARD,
> +                           FALSE,
> +                           NULL,
> +                           NULL,
> +                           NULL,
> +                           NULL);
> +#else
>      status = gdk_keyboard_grab(gtk_widget_get_window(widget), FALSE,
>                                 GDK_CURRENT_TIME);
> +#endif
>      if (status != GDK_GRAB_SUCCESS) {
>          g_warning("keyboard grab failed %u", status);
>          d->keyboard_grab_active = false;
> @@ -877,7 +899,11 @@ static void try_keyboard_ungrab(SpiceDisplay *display)
>          return;
>  
>      SPICE_DEBUG("ungrab keyboard");
> +#if GTK_CHECK_VERSION(3, 20, 0)
> +    gdk_seat_ungrab(spice_display_get_default_seat(display));
> +#else
>      gdk_keyboard_ungrab(GDK_CURRENT_TIME);
> +#endif
>  #ifdef G_OS_WIN32
>      // do not use g_clear_pointer as Windows API have different linkage
>      if (d->keyboard_hook) {
> -- 
> 2.11.1
> 
> _______________________________________________
> Spice-devel mailing list
> Spice-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/spice-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/spice-devel/attachments/20170216/67667157/attachment.sig>