[Spice-devel] [PATCH spice-gtk v4 3/6] gtk: Use gdk_device_warp

[Pavel Grunt]

On Thu, 2017-02-16 at 17:08 +0100, Christophe Fergeau wrote:
> On Tue, Feb 14, 2017 at 07:05:15PM +0100, Pavel Grunt wrote:
> > gdk_display_warp_pointer has been deprecated since Gtk 3.0
> 
> I guess you can mention in the log/in a comment that gdk_*_warp is a
> no-op on wayland.

ok, I will add a reference to the bug.

> 
> > 
> > Acked-by: Victor Toso <victortoso at redhat.com>
> > ---
> >  src/spice-widget.c | 20 ++++++++++----------
> >  1 file changed, 10 insertions(+), 10 deletions(-)
> > 
> > diff --git a/src/spice-widget.c b/src/spice-widget.c
> > index c39373c..f3fa911 100644
> > --- a/src/spice-widget.c
> > +++ b/src/spice-widget.c
> > @@ -119,6 +119,7 @@ static void release_keys(SpiceDisplay
> > *display);
> >  static void size_allocate(GtkWidget *widget, GtkAllocation *conf,
> > gpointer data);
> >  static gboolean draw_event(GtkWidget *widget, cairo_t *cr,
> > gpointer data);
> >  static void update_size_request(SpiceDisplay *display);
> > +static GdkDevice *gdk_window_get_pointing_device(GdkWindow
> > *window);
> >  
> >  /* --------------------------------------------------------------
> > -- */
> >  
> > @@ -1112,14 +1113,11 @@ static void mouse_wrap(SpiceDisplay
> > *display, GdkEventMotion *motion)
> >      yr = gdk_screen_get_height(screen) / 2;
> >  
> >      if (xr != (gint)motion->x_root || yr != (gint)motion->y_root) 
> > {
> > +        GdkWindow *window =
> > gtk_widget_get_window(GTK_WIDGET(display));
> >          /* FIXME: we try our best to ignore that next pointer
> > move event.. */
> >          gdk_display_sync(gdk_screen_get_display(screen));
> >  
> > -        /* FIXME: gdk_display_warp_pointer() is deprecated */
> > -        G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> > -        gdk_display_warp_pointer(gtk_widget_get_display(GTK_WIDGE
> > T(display)),
> > -                                 screen, xr, yr);
> > -        G_GNUC_END_IGNORE_DEPRECATIONS
> > +        gdk_device_warp(gdk_window_get_pointing_device(window),
> > screen, xr, yr);
> >          d->mouse_last_x = -1;
> >          d->mouse_last_y = -1;
> >      }
> > @@ -1127,7 +1125,7 @@ static void mouse_wrap(SpiceDisplay
> > *display, GdkEventMotion *motion)
> >  
> >  }
> >  
> > -/* FIXME: gdk_pointer_ungrab()/gdk_display_warp_pointer() are
> > deprecated */
> > +/* FIXME: gdk_pointer_ungrab() is deprecated */
> >  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
> >  
> >  static void try_mouse_ungrab(SpiceDisplay *display)
> > @@ -1135,6 +1133,7 @@ static void try_mouse_ungrab(SpiceDisplay
> > *display)
> >      SpiceDisplayPrivate *d = display->priv;
> >      double s;
> >      int x, y;
> > +    GdkWindow *window;
> >  
> >      if (!d->mouse_grab_active)
> >          return;
> > @@ -1150,14 +1149,15 @@ static void try_mouse_ungrab(SpiceDisplay
> > *display)
> >  
> >      spice_display_get_scaling(display, &s, &x, &y, NULL, NULL);
> >  
> > -    gdk_window_get_root_coords(gtk_widget_get_window(GTK_WIDGET(d
> > isplay)),
> > +    window = gtk_widget_get_window(GTK_WIDGET(display));
> > +    gdk_window_get_root_coords(window,
> >                                 x + d->mouse_guest_x * s,
> >                                 y + d->mouse_guest_y * s,
> >                                 &x, &y);
> >  
> > -    gdk_display_warp_pointer(gtk_widget_get_display(GTK_WIDGET(di
> > splay)),
> > -                             gtk_widget_get_screen(GTK_WIDGET(dis
> > play)),
> > -                             x, y);
> > +    gdk_device_warp(gdk_window_get_pointing_device(window),
> > +                    gtk_widget_get_screen(GTK_WIDGET(display)),
> > +                    x, y);
> >  
> >      g_signal_emit(display, signals[SPICE_DISPLAY_MOUSE_GRAB], 0,
> > false);
> >      spice_gtk_session_set_pointer_grabbed(d->gtk_session, false);
> > -- 
> > 2.11.1
> > 
> > _______________________________________________
> > Spice-devel mailing list
> > Spice-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/spice-devel