From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX5M7-0003nK-S7 for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WX5Lz-0004gZ-9c for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:56:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WX5Lz-0004gN-2R for qemu-devel@nongnu.org; Mon, 07 Apr 2014 04:56:31 -0400 From: Gerd Hoffmann Date: Mon, 7 Apr 2014 10:56:19 +0200 Message-Id: <1396860980-7130-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1396860980-7130-1-git-send-email-kraxel@redhat.com> References: <1396860980-7130-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 3/4] gtk: Remember the last grabbed pointer position List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Takashi Iwai , Gerd Hoffmann , Anthony Liguori From: Takashi Iwai 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 Reviewed-by: Cole Robinson Tested-by: Michael S. Tsirkin Signed-off-by: Takashi Iwai Signed-off-by: Gerd Hoffmann --- ui/gtk.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index 913cc3f..6668bd8 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.8.3.1