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

gtk: keep track of grab owner

Browse Source 
Simplifies grab state tracking and makes ungrab more reliable.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-05-06 11:01:31 +02:00
parent 1c856da57b
commit 4c638e2e4b
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/gtk.c
View File

@ -185,6 +185,8 @@ struct GtkDisplayState {
int last_y; int last_y;
int grab_x_root; int grab_x_root;
int grab_y_root; int grab_y_root;
VirtualConsole *kbd_owner;
VirtualConsole *ptr_owner;
gboolean full_screen; gboolean full_screen;
@ -1058,11 +1060,19 @@ static void gd_grab_keyboard(VirtualConsole *vc)
FALSE, FALSE,
GDK_CURRENT_TIME); GDK_CURRENT_TIME);
#endif #endif
vc->s->kbd_owner = vc;
trace_gd_grab(vc->label, "kbd", true); trace_gd_grab(vc->label, "kbd", true);
} }
static void gd_ungrab_keyboard(VirtualConsole *vc) static void gd_ungrab_keyboard(GtkDisplayState *s)
{ {
VirtualConsole *vc = s->kbd_owner;
if (vc == NULL) {
return;
}
s->kbd_owner = NULL;
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area); GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area);
GdkDeviceManager *mgr = gdk_display_get_device_manager(display); GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
@ -1127,11 +1137,19 @@ static void gd_grab_pointer(VirtualConsole *vc)
gdk_display_get_pointer(display, NULL, gdk_display_get_pointer(display, NULL,
&vc->s->grab_x_root, &vc->s->grab_y_root, NULL); &vc->s->grab_x_root, &vc->s->grab_y_root, NULL);
#endif #endif
vc->s->ptr_owner = vc;
trace_gd_grab(vc->label, "ptr", true); trace_gd_grab(vc->label, "ptr", true);
} }
static void gd_ungrab_pointer(VirtualConsole *vc) static void gd_ungrab_pointer(GtkDisplayState *s)
{ {
VirtualConsole *vc = s->ptr_owner;
if (vc == NULL) {
return;
}
s->ptr_owner = NULL;
GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area); GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area);
#if GTK_CHECK_VERSION(3, 0, 0) #if GTK_CHECK_VERSION(3, 0, 0)
GdkDeviceManager *mgr = gdk_display_get_device_manager(display); GdkDeviceManager *mgr = gdk_display_get_device_manager(display);
@ -1168,8 +1186,8 @@ static void gd_menu_grab_input(GtkMenuItem *item, void *opaque)
gd_grab_keyboard(vc); gd_grab_keyboard(vc);
gd_grab_pointer(vc); gd_grab_pointer(vc);
} else { } else {
gd_ungrab_keyboard(vc); gd_ungrab_keyboard(s);
gd_ungrab_pointer(vc); gd_ungrab_pointer(s);
} }
gd_update_caption(s); gd_update_caption(s);
@ -1227,7 +1245,7 @@ static gboolean gd_leave_event(GtkWidget *widget, GdkEventCrossing *crossing,
GtkDisplayState *s = vc->s; GtkDisplayState *s = vc->s;
if (!gd_is_grab_active(s) && gd_grab_on_hover(s)) { if (!gd_is_grab_active(s) && gd_grab_on_hover(s)) {
gd_ungrab_keyboard(vc); gd_ungrab_keyboard(s);
} }
return TRUE; return TRUE;