[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH ui/gtk 07/13] Conditionalize use of gdk_display_warp
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH ui/gtk 07/13] Conditionalize use of gdk_display_warp_pointer |
Date: |
Mon, 25 Feb 2013 15:20:40 +0000 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
---
ui/gtk.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 182a16c..93c3b43 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -501,7 +501,6 @@ static gboolean gd_motion_event(GtkWidget *widget,
GdkEventMotion *motion,
}
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);
int x = (int)motion->x_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 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);
+#endif
s->last_x = -1;
s->last_y = -1;
return FALSE;
--
1.8.1.2
- [Qemu-devel] [PATCH ui/gtk 00/13] Add support for GTK3 & fix GTK 2.18, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 02/13] Remove use of gdk_drawable_get_{screen, display}, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 05/13] Remove use of GtkVBox in GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 01/13] Add compat for gdk_drawable_get_size on GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 04/13] Conditionalize use of gdk_pointer_grab / gdk_pointer_ungrab, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 03/13] Conditionalize use of gdk_keyboard_grab / gdk_keyboard_ungrab, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 08/13] Conditionalize use of gtk_widget_size_request, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 07/13] Conditionalize use of gdk_display_warp_pointer,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH ui/gtk 13/13] Add compat for GDK_KEY_XXX symbols, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 09/13] Replace expose-event handler with draw handler in GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 11/13] Add support for enabling build with GTK3, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 10/13] Ensure x_keymap.o is built when GTK is enabled, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 06/13] Replace gtk_menu_append with gtk_menu_shell_append, Daniel P. Berrange, 2013/02/25
- [Qemu-devel] [PATCH ui/gtk 12/13] Add compat macro for gtk_widget_get_realized, Daniel P. Berrange, 2013/02/25
- Re: [Qemu-devel] [PATCH ui/gtk 00/13] Add support for GTK3 & fix GTK 2.18, Daniel P. Berrange, 2013/02/27
- Re: [Qemu-devel] [PATCH ui/gtk 00/13] Add support for GTK3 & fix GTK 2.18, Anthony Liguori, 2013/02/27