From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woq3K-0006iB-Kf for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Woq3D-0006m1-2z for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Woq3C-0006ll-Qh for qemu-devel@nongnu.org; Mon, 26 May 2014 04:14:31 -0400 From: Gerd Hoffmann Date: Mon, 26 May 2014 10:14:14 +0200 Message-Id: <1401092059-18503-20-git-send-email-kraxel@redhat.com> In-Reply-To: <1401092059-18503-1-git-send-email-kraxel@redhat.com> References: <1401092059-18503-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori Make ungrab hotkey work with detached windows. Enable pointer grabs for detached windows. Signed-off-by: Gerd Hoffmann --- 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