[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 3/4] gtk: Remember the last grabbed pointer posit
From: |
Takashi Iwai |
Subject: |
[Qemu-devel] [PATCH v3 3/4] gtk: Remember the last grabbed pointer position |
Date: |
Fri, 4 Apr 2014 12:41:23 +0200 |
It's pretty annoying that the pointer reappears at a random place once
after grabbing and ungrabbing the input. Better to restore to the
original position where the pointer was grabbed.
Reference: https://bugzilla.novell.com/show_bug.cgi?id=849587
Tested-by: Cole Robinson <address@hidden>
Reviewed-by: Cole Robinson <address@hidden>
Signed-off-by: Takashi Iwai <address@hidden>
---
ui/gtk.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 913cc3f70c02..6668bd8226d5 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -159,6 +159,8 @@ typedef struct GtkDisplayState
gboolean last_set;
int last_x;
int last_y;
+ int grab_x_root;
+ int grab_y_root;
double scale_x;
double scale_y;
@@ -971,8 +973,8 @@ static void gd_ungrab_keyboard(GtkDisplayState *s)
static void gd_grab_pointer(GtkDisplayState *s)
{
-#if GTK_CHECK_VERSION(3, 0, 0)
GdkDisplay *display = gtk_widget_get_display(s->drawing_area);
+#if GTK_CHECK_VERSION(3, 0, 0)
GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
GList *devices = gdk_device_manager_list_devices(mgr,
GDK_DEVICE_TYPE_MASTER);
@@ -996,6 +998,8 @@ static void gd_grab_pointer(GtkDisplayState *s)
tmp = tmp->next;
}
g_list_free(devices);
+ gdk_device_get_position(gdk_device_manager_get_client_pointer(mgr),
+ NULL, &s->grab_x_root, &s->grab_y_root);
#else
gdk_pointer_grab(gtk_widget_get_window(s->drawing_area),
FALSE, /* All events to come to our window directly */
@@ -1007,13 +1011,15 @@ static void gd_grab_pointer(GtkDisplayState *s)
NULL, /* Allow cursor to move over entire desktop */
s->null_cursor,
GDK_CURRENT_TIME);
+ gdk_display_get_pointer(display, NULL,
+ &s->grab_x_root, &s->grab_y_root, NULL);
#endif
}
static void gd_ungrab_pointer(GtkDisplayState *s)
{
-#if GTK_CHECK_VERSION(3, 0, 0)
GdkDisplay *display = gtk_widget_get_display(s->drawing_area);
+#if GTK_CHECK_VERSION(3, 0, 0)
GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
GList *devices = gdk_device_manager_list_devices(mgr,
GDK_DEVICE_TYPE_MASTER);
@@ -1027,8 +1033,14 @@ static void gd_ungrab_pointer(GtkDisplayState *s)
tmp = tmp->next;
}
g_list_free(devices);
+ gdk_device_warp(gdk_device_manager_get_client_pointer(mgr),
+ gtk_widget_get_screen(s->drawing_area),
+ s->grab_x_root, s->grab_y_root);
#else
gdk_pointer_ungrab(GDK_CURRENT_TIME);
+ gdk_display_warp_pointer(display,
+ gtk_widget_get_screen(s->drawing_area),
+ s->grab_x_root, s->grab_y_root);
#endif
}
--
1.9.1
- [Qemu-devel] [PATCH v3 0/4] Fix relative pointer tracking on Gtk UI, Takashi Iwai, 2014/04/04
- [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Takashi Iwai, 2014/04/04
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Gerd Hoffmann, 2014/04/07
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Takashi Iwai, 2014/04/07
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Michael S. Tsirkin, 2014/04/07
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Gerd Hoffmann, 2014/04/08
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Michael S. Tsirkin, 2014/04/08
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Gerd Hoffmann, 2014/04/08
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Michael S. Tsirkin, 2014/04/08
- Re: [Qemu-devel] [PATCH v3 4/4] gtk: Add "Grab On Click" option, Takashi Iwai, 2014/04/08
[Qemu-devel] [PATCH v3 3/4] gtk: Remember the last grabbed pointer position,
Takashi Iwai <=
[Qemu-devel] [PATCH v3 2/4] gtk: Fix the relative pointer tracking mode, Takashi Iwai, 2014/04/04
[Qemu-devel] [PATCH v3 1/4] gtk: Use gtk generic event signal instead of motion-notify-event, Takashi Iwai, 2014/04/04
Re: [Qemu-devel] [PATCH v3 0/4] Fix relative pointer tracking on Gtk UI, Brian Jackson, 2014/04/04
Re: [Qemu-devel] [PATCH v3 0/4] Fix relative pointer tracking on Gtk UI, Michael S. Tsirkin, 2014/04/06