mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionalize use of gdk_display_warp_pointer

Browse Source 
In GTK3 the gdk_display_warp_pointer method is deprecated.
Instead we should use gdk_device_warp on the GdkDevice
instead associated with the event being processed.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-id: 1361805646-6425-8-git-send-email-berrange@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Daniel P. Berrange 2013-02-25 15:20:40 +00:00 committed by Anthony Liguori
parent 530daf82c1
commit 8906de769b
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/gtk.c
View File

@ -501,7 +501,6 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,
} }
if (!kbd_mouse_is_absolute() && gd_is_grab_active(s)) { if (!kbd_mouse_is_absolute() && gd_is_grab_active(s)) {
GdkDisplay *display = gtk_widget_get_display(s->drawing_area);
GdkScreen *screen = gtk_widget_get_screen(s->drawing_area); GdkScreen *screen = gtk_widget_get_screen(s->drawing_area);
int x = (int)motion->x_root; int x = (int)motion->x_root;
int y = (int)motion->y_root; int y = (int)motion->y_root;
@ -527,7 +526,13 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,
} }
if (x != (int)motion->x_root || y != (int)motion->y_root) { if (x != (int)motion->x_root || y != (int)motion->y_root) {
#if GTK_CHECK_VERSION(3, 0, 0)
GdkDevice *dev = gdk_event_get_device((GdkEvent *)motion);
gdk_device_warp(dev, screen, x, y);
#else
GdkDisplay *display = gtk_widget_get_display(widget);
gdk_display_warp_pointer(display, screen, x, y); gdk_display_warp_pointer(display, screen, x, y);
#endif
s->last_x = -1; s->last_x = -1;
s->last_y = -1; s->last_y = -1;
return FALSE; return FALSE;