[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs |
Date: |
Mon, 26 May 2014 10:14:14 +0200 |
Make ungrab hotkey work with detached windows.
Enable pointer grabs for detached windows.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 8215841..298419b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -773,10 +773,7 @@ static gboolean gd_button_event(GtkWidget *widget,
GdkEventButton *button,
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item),
TRUE);
} else {
-#if 0
- /* FIXME: no way (yet) to ungrab */
gd_grab_pointer(vc);
-#endif
gd_update_caption(s);
}
return TRUE;
@@ -945,6 +942,20 @@ static gboolean gd_tab_window_close(GtkWidget *widget,
GdkEvent *event,
return TRUE;
}
+static gboolean gd_win_grab(void *opaque)
+{
+ VirtualConsole *vc = opaque;
+
+ fprintf(stderr, "%s: %s\n", __func__, vc->label);
+ if (vc->s->ptr_owner) {
+ gd_ungrab_pointer(vc->s);
+ } else {
+ gd_grab_pointer(vc);
+ }
+ gd_update_caption(vc->s);
+ return TRUE;
+}
+
static void gd_menu_untabify(GtkMenuItem *item, void *opaque)
{
GtkDisplayState *s = opaque;
@@ -963,6 +974,13 @@ static void gd_menu_untabify(GtkMenuItem *item, void
*opaque)
G_CALLBACK(gd_tab_window_close), vc);
gtk_widget_show_all(vc->window);
+ GtkAccelGroup *ag = gtk_accel_group_new();
+ gtk_window_add_accel_group(GTK_WINDOW(vc->window), ag);
+
+ GClosure *cb = g_cclosure_new_swap(G_CALLBACK(gd_win_grab), vc, NULL);
+ gtk_accel_group_connect(ag, GDK_KEY_g, HOTKEY_MODIFIERS, 0, cb);
+
+ fprintf(stderr, "%s: %p\n", __func__, vc);
gd_update_caption(s);
}
}
--
1.8.3.1
- [Qemu-devel] [PULL 09/24] gtk: use device type as label, (continued)
- [Qemu-devel] [PULL 09/24] gtk: use device type as label, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 21/24] gtk: Add handling for the xfree86 keycodes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/24] gtk: simplify resize, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/24] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/24] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 16/24] gtk: update gd_update_caption, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 22/24] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 20/24] gtk: enable untabify for gfx, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 24/24] gtk: workaround gtk2 vte resize issue, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 17/24] gtk: fix grab checks, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/24] gtk: move vga state into VirtualGfxConsole, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 18/24] gtk: update all windows on mouse mode changes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 23/24] gtk: window sizing overhaul, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support., Peter Maydell, 2014/05/28