Fix motion not being reported on GTK when mouse moves over toolbar

* src/gtkutil.c (xg_event_is_for_scrollbar): Make code
consistent between XI2 and Core Input.

diff --git a/src/gtkutil.c b/src/gtkutil.c
index c46a2b3a6a1710db1065e172633c51f5a9bd94a6..ea9c91d316bc0bad414f1606ebc8841e24089047 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -4853,9 +4853,8 @@ xg_event_is_for_scrollbar (struct frame *f, const EVENT *event)
             && event->type == GenericEvent
             && (event->xgeneric.extension
                 == FRAME_DISPLAY_INFO (f)->xi2_opcode)
-            && ((event->xgeneric.evtype == XI_ButtonPress
-                 && xev->detail < 4)
-                || (event->xgeneric.evtype == XI_Motion)))
+            && (event->xgeneric.evtype == XI_ButtonPress
+                && xev->detail < 4))
            || (event->type == ButtonPress
                && event->xbutton.button < 4)))
 #else
@@ -4887,19 +4886,7 @@ 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
-         && event->xgeneric.evtype == XI_Motion)
-       retval = retval || (grab && GTK_IS_SCROLLBAR (grab));
-#endif
     }
 #ifdef HAVE_XINPUT2
   else if (f && ((FRAME_DISPLAY_INFO (f)->supports_xi2