diff options
| -rw-r--r-- | src/gtkutil.c | 6 | ||||
| -rw-r--r-- | src/xwidget.c | 14 |
2 files changed, 19 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 9e676cd025b..8f8db4ed372 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -853,7 +853,11 @@ xg_is_menu_window (Display *dpy, Window wdesc) { GtkWidget *fw = gtk_bin_get_child (GTK_BIN (gwdesc)); if (GTK_IS_MENU (fw)) - return true; + { + GtkWidget *parent + = gtk_menu_shell_get_parent_shell (GTK_MENU_SHELL (fw)); + return GTK_IS_MENU_BAR (parent); + } } return false; diff --git a/src/xwidget.c b/src/xwidget.c index 5da2aa1743b..e07b290acbf 100644 --- a/src/xwidget.c +++ b/src/xwidget.c @@ -907,6 +907,10 @@ xwidget_button_1 (struct xwidget_view *view, GdkEvent *xg_event = gdk_event_new (down_p ? GDK_BUTTON_PRESS : GDK_BUTTON_RELEASE); struct xwidget *model = XXWIDGET (view->model); GtkWidget *target; +#ifdef HAVE_XINPUT2 + struct x_display_info *dpyinfo; + struct xi_device_t *xi_device; +#endif /* X and Y should be relative to the origin of view->wdesc. */ x += view->clip_left; @@ -930,6 +934,16 @@ xwidget_button_1 (struct xwidget_view *view, xg_event->button.time = time; xg_event->button.device = find_suitable_pointer (view->frame); +#ifdef HAVE_XINPUT2 + dpyinfo = FRAME_DISPLAY_INFO (view->frame); + for (int idx = 0; idx < dpyinfo->num_devices; ++idx) + { + xi_device = &dpyinfo->devices[idx]; + + XIUngrabDevice (view->dpy, xi_device->device_id, CurrentTime); + } +#endif + gtk_main_do_event (xg_event); gdk_event_free (xg_event); } |