From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37752) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbndk-0000Fm-8P for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:39:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zbnde-00068I-3j for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:39:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34778) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zbndd-00067r-Sp for qemu-devel@nongnu.org; Tue, 15 Sep 2015 06:39:02 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 81677157773 for ; Tue, 15 Sep 2015 10:39:01 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 15 Sep 2015 12:38:50 +0200 Message-Id: <1442313535-4549-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1442313535-4549-1-git-send-email-kraxel@redhat.com> References: <1442313535-4549-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 1/6] gtk: check for existing grabs in gd_grab_{pointer, keyboard} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann If a grab is already active for our window, do nothing. If a grab is already active for another window, release it. Cleanup some checks and ungrab calls in the code which are not needed any more. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau --- ui/gtk.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/ui/gtk.c b/ui/gtk.c index df2a79e..24a1edb 100644 --- a/ui/gtk.c +++ b/ui/gtk.c @@ -167,6 +167,8 @@ struct GtkDisplayState { =20 static void gd_grab_pointer(VirtualConsole *vc); static void gd_ungrab_pointer(GtkDisplayState *s); +static void gd_grab_keyboard(VirtualConsole *vc); +static void gd_ungrab_keyboard(GtkDisplayState *s); =20 /** Utility Functions **/ =20 @@ -849,7 +851,6 @@ static gboolean gd_button_event(GtkWidget *widget, Gd= kEventButton *button, /* implicitly grab the input at the first click in the relative mode= */ if (button->button =3D=3D 1 && button->type =3D=3D GDK_BUTTON_PRESS = && !qemu_input_is_absolute() && s->ptr_owner !=3D vc) { - gd_ungrab_pointer(s); if (!vc->window) { gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_i= tem), TRUE); @@ -1259,6 +1260,14 @@ static void gd_grab_devices(VirtualConsole *vc, bo= ol grab, =20 static void gd_grab_keyboard(VirtualConsole *vc) { + if (vc->s->kbd_owner) { + if (vc->s->kbd_owner =3D=3D vc) { + return; + } else { + gd_ungrab_keyboard(vc->s); + } + } + #if GTK_CHECK_VERSION(3, 0, 0) gd_grab_devices(vc, true, GDK_SOURCE_KEYBOARD, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, @@ -1292,6 +1301,15 @@ static void gd_ungrab_keyboard(GtkDisplayState *s) static void gd_grab_pointer(VirtualConsole *vc) { GdkDisplay *display =3D gtk_widget_get_display(vc->gfx.drawing_area)= ; + + if (vc->s->ptr_owner) { + if (vc->s->ptr_owner =3D=3D vc) { + return; + } else { + gd_ungrab_pointer(vc->s); + } + } + #if GTK_CHECK_VERSION(3, 0, 0) GdkDeviceManager *mgr =3D gdk_display_get_device_manager(display); gd_grab_devices(vc, true, GDK_SOURCE_MOUSE, @@ -1352,9 +1370,7 @@ static void gd_menu_grab_input(GtkMenuItem *item, v= oid *opaque) VirtualConsole *vc =3D gd_vc_find_current(s); =20 if (gd_is_grab_active(s)) { - if (!gd_grab_on_hover(s)) { - gd_grab_keyboard(vc); - } + gd_grab_keyboard(vc); gd_grab_pointer(vc); } else { gd_ungrab_keyboard(s); @@ -1415,7 +1431,6 @@ static gboolean gd_enter_event(GtkWidget *widget, G= dkEventCrossing *crossing, GtkDisplayState *s =3D vc->s; =20 if (gd_grab_on_hover(s)) { - gd_ungrab_keyboard(s); gd_grab_keyboard(vc); gd_update_caption(s); } --=20 1.8.3.1