summaryrefslogtreecommitdiff
path: root/src/gtkutil.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gtkutil.c')
-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