summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo Lu <luangruo@yahoo.com>2021-12-21 19:25:26 +0800
committerPo Lu <luangruo@yahoo.com>2021-12-21 19:26:40 +0800
commit264589cdf762d015c8ecd102afb7eb61dc0ad65b (patch)
treea9b880e25189bd4a65fd253870283677a23bfe85
parentcf6dc1838af4b3d0604d0848e1ac0d4fbd9c3dbc (diff)
downloademacs-264589cdf762d015c8ecd102afb7eb61dc0ad65b.tar.gz
Fix xg_event_is_scrollbar for grab-related events on XI2
* src/gtkutil.c (xg_event_is_for_scrollbar): Don't return true if event coordinates are outside the frame on XInput 2.
-rw-r--r--src/gtkutil.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 7370a795c08..0f1c1103649 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4805,7 +4805,13 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
#else
gwin = gdk_display_get_window_at_pointer (gdpy, NULL, NULL);
#endif
+#ifndef HAVE_XINPUT2
retval = gwin != gtk_widget_get_window (f->output_data.xp->edit_widget);
+#else
+ retval = (gwin
+ && (gwin
+ != gtk_widget_get_window (f->output_data.xp->edit_widget)));
+#endif
#ifdef HAVE_XINPUT2
GtkWidget *grab = gtk_grab_get_current ();
if (event->type == GenericEvent