[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/6] gtk: check for existing grabs in gd_grab_{p
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH 1/6] gtk: check for existing grabs in gd_grab_{pointer, keyboard} |
Date: |
Wed, 9 Sep 2015 16:46:21 +0200 |
On Wed, Sep 9, 2015 at 11:28 AM, Gerd Hoffmann <address@hidden> wrote:
> 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 <address@hidden>
> ---
> ui/gtk.c | 25 ++++++++++++++++++++-----
> 1 file changed, 20 insertions(+), 5 deletions(-)
>
Reviewed-by: Marc-André Lureau <address@hidden>
> 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 {
>
> 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);
>
> /** Utility Functions **/
>
> @@ -849,7 +851,6 @@ static gboolean gd_button_event(GtkWidget *widget,
> GdkEventButton *button,
> /* implicitly grab the input at the first click in the relative mode */
> if (button->button == 1 && button->type == GDK_BUTTON_PRESS &&
> !qemu_input_is_absolute() && s->ptr_owner != vc) {
> - gd_ungrab_pointer(s);
> if (!vc->window) {
> gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(s->grab_item),
> TRUE);
> @@ -1259,6 +1260,14 @@ static void gd_grab_devices(VirtualConsole *vc, bool
> grab,
>
> static void gd_grab_keyboard(VirtualConsole *vc)
> {
> + if (vc->s->kbd_owner) {
> + if (vc->s->kbd_owner == 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 = gtk_widget_get_display(vc->gfx.drawing_area);
> +
> + if (vc->s->ptr_owner) {
> + if (vc->s->ptr_owner == vc) {
> + return;
> + } else {
> + gd_ungrab_pointer(vc->s);
> + }
> + }
> +
> #if GTK_CHECK_VERSION(3, 0, 0)
> GdkDeviceManager *mgr = 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, void
> *opaque)
> VirtualConsole *vc = gd_vc_find_current(s);
>
> 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,
> GdkEventCrossing *crossing,
> GtkDisplayState *s = vc->s;
>
> if (gd_grab_on_hover(s)) {
> - gd_ungrab_keyboard(s);
> gd_grab_keyboard(vc);
> gd_update_caption(s);
> }
> --
> 1.8.3.1
>
>
--
Marc-André Lureau
- [Qemu-devel] [PATCH 0/6] gtk: tweak grab handling, misc fixes., Gerd Hoffmann, 2015/09/09
- [Qemu-devel] [PATCH 4/6] gtk: set free_scale when setting zoom_fit, Gerd Hoffmann, 2015/09/09
- [Qemu-devel] [PATCH 2/6] gtk: move gd_update_caption calls to gd_{grab, ungrab}_{pointer, keyboard}, Gerd Hoffmann, 2015/09/09
- [Qemu-devel] [PATCH 1/6] gtk: check for existing grabs in gd_grab_{pointer, keyboard}, Gerd Hoffmann, 2015/09/09
- Re: [Qemu-devel] [PATCH 1/6] gtk: check for existing grabs in gd_grab_{pointer, keyboard},
Marc-André Lureau <=
- [Qemu-devel] [PATCH 6/6] gtk: setlocale for LC_MESSAGES only, Gerd Hoffmann, 2015/09/09
- [Qemu-devel] [PATCH 5/6] gtk: don't grab input when entering fullscreen., Gerd Hoffmann, 2015/09/09
- [Qemu-devel] [PATCH 3/6] gtk: trace input grab reason, Gerd Hoffmann, 2015/09/09