ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk: Remember the last grabbed pointer position 

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 <crobinso@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
Tested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Takashi Iwai 2014-04-04 12:41:23 +02:00 committed by Gerd Hoffmann
parent e61031cdd8
commit ecce1929bc
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/gtk.c
View File

@ -159,6 +159,8 @@ typedef struct GtkDisplayState
gboolean last_set; gboolean last_set;
int last_x; int last_x;
int last_y; int last_y;
int grab_x_root;
int grab_y_root;
double scale_x; double scale_x;
double scale_y; double scale_y;
@ -971,8 +973,8 @@ static void gd_ungrab_keyboard(GtkDisplayState *s)
static void gd_grab_pointer(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); GdkDisplay *display = gtk_widget_get_display(s->drawing_area);
#if GTK_CHECK_VERSION(3, 0, 0)
GdkDeviceManager *mgr = gdk_display_get_device_manager(display); GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
GList *devices = gdk_device_manager_list_devices(mgr, GList *devices = gdk_device_manager_list_devices(mgr,
GDK_DEVICE_TYPE_MASTER); GDK_DEVICE_TYPE_MASTER);
@ -996,6 +998,8 @@ static void gd_grab_pointer(GtkDisplayState *s)
tmp = tmp->next; tmp = tmp->next;
} }
g_list_free(devices); 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 #else
gdk_pointer_grab(gtk_widget_get_window(s->drawing_area), gdk_pointer_grab(gtk_widget_get_window(s->drawing_area),
FALSE, /* All events to come to our window directly */ 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 */ NULL, /* Allow cursor to move over entire desktop */
s->null_cursor, s->null_cursor,
GDK_CURRENT_TIME); GDK_CURRENT_TIME);
gdk_display_get_pointer(display, NULL,
&s->grab_x_root, &s->grab_y_root, NULL);
#endif #endif
} }
static void gd_ungrab_pointer(GtkDisplayState *s) static void gd_ungrab_pointer(GtkDisplayState *s)
{ {
#if GTK_CHECK_VERSION(3, 0, 0)
GdkDisplay *display = gtk_widget_get_display(s->drawing_area); GdkDisplay *display = gtk_widget_get_display(s->drawing_area);
#if GTK_CHECK_VERSION(3, 0, 0)
GdkDeviceManager *mgr = gdk_display_get_device_manager(display); GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
GList *devices = gdk_device_manager_list_devices(mgr, GList *devices = gdk_device_manager_list_devices(mgr,
GDK_DEVICE_TYPE_MASTER); GDK_DEVICE_TYPE_MASTER);
@ -1027,8 +1033,14 @@ static void gd_ungrab_pointer(GtkDisplayState *s)
tmp = tmp->next; tmp = tmp->next;
} }
g_list_free(devices); 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 #else
gdk_pointer_ungrab(GDK_CURRENT_TIME); 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 #endif
} }