[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/25] gtk: keep track of grab owner
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 14/25] gtk: keep track of grab owner |
Date: |
Wed, 21 May 2014 10:43:50 +0200 |
Simplifies grab state tracking and makes ungrab more reliable.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 0e35abf..d87bd1b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -185,6 +185,8 @@ struct GtkDisplayState {
int last_y;
int grab_x_root;
int grab_y_root;
+ VirtualConsole *kbd_owner;
+ VirtualConsole *ptr_owner;
gboolean full_screen;
@@ -1058,11 +1060,19 @@ static void gd_grab_keyboard(VirtualConsole *vc)
FALSE,
GDK_CURRENT_TIME);
#endif
+ vc->s->kbd_owner = vc;
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)
GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area);
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,
&vc->s->grab_x_root, &vc->s->grab_y_root, NULL);
#endif
+ vc->s->ptr_owner = vc;
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);
#if GTK_CHECK_VERSION(3, 0, 0)
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_pointer(vc);
} else {
- gd_ungrab_keyboard(vc);
- gd_ungrab_pointer(vc);
+ gd_ungrab_keyboard(s);
+ gd_ungrab_pointer(s);
}
gd_update_caption(s);
@@ -1227,7 +1245,7 @@ static gboolean gd_leave_event(GtkWidget *widget,
GdkEventCrossing *crossing,
GtkDisplayState *s = vc->s;
if (!gd_is_grab_active(s) && gd_grab_on_hover(s)) {
- gd_ungrab_keyboard(vc);
+ gd_ungrab_keyboard(s);
}
return TRUE;
--
1.8.3.1
- [Qemu-devel] [PATCH 02/25] gtk: zap vte size requests, (continued)
- [Qemu-devel] [PATCH 02/25] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 04/25] gtk: Add a scrollbar for text consoles, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 10/25] gtk: simplify resize, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 05/25] gtk: remove page numbering assumtions from the code, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 06/25] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 09/25] gtk: use device type as label, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 21/25] gtk: Add handling for the xfree86 keycodes, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 08/25] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 12/25] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 11/25] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 14/25] gtk: keep track of grab owner,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 13/25] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 15/25] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 01/25] gtk: zap scrolled_window, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 22/25] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 19/25] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 18/25] gtk: update all windows on mouse mode changes, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 17/25] gtk: fix grab checks, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 07/25] gtk: move vga state into VirtualGfxConsole, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 20/25] gtk: enable untabify for gfx, Gerd Hoffmann, 2014/05/21
- [Qemu-devel] [PATCH 16/25] gtk: update gd_update_caption, Gerd Hoffmann, 2014/05/21