Merge lp:~cimi/overlay-scrollbar/fix-951121 into lp:overlay-scrollbar

[Andrea Cimitan]

Deal with XI2 new event handling

[Charles Kerr (charlesk)]

Looks okay.

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2012-02-21 17:06:16 +0000
+++ os/os-scrollbar.c	2012-03-13 14:25:23 +0000
@@ -1794,15 +1794,11 @@
   return FALSE;
 }
 
-static gboolean
-thumb_enter_notify_event_cb (GtkWidget        *widget,
-                             GdkEventCrossing *event,
-                             gpointer          user_data)
+static void
+enter_event (OsScrollbar *scrollbar)
 {
-  OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
 
-  scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
 
   priv->event |= OS_EVENT_ENTER_NOTIFY;
@@ -1812,6 +1808,29 @@
 
   if (priv->state & OS_STATE_INTERNAL)
     priv->state |= OS_STATE_LOCKED;
+}
+
+static gboolean
+thumb_enter_notify_event_cb (GtkWidget        *widget,
+                             GdkEventCrossing *event,
+                             gpointer          user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
+
+#ifdef USE_GTK3
+  /* Gtk+ 3.3.18 emits more GdkEventCrossing
+   * with touch devices, skip few events. */
+  if (event->mode == GDK_CROSSING_TOUCH_BEGIN ||
+      event->mode == GDK_CROSSING_TOUCH_END ||
+      event->mode == GDK_CROSSING_DEVICE_SWITCH)
+    return FALSE;
+#endif
+
+  enter_event (scrollbar);
 
   return FALSE;
 }
@@ -1827,6 +1846,22 @@
   scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
 
+#ifdef USE_GTK3
+  /* Gtk+ 3.3.18 emits more GdkEventCrossing
+   * with touch devices, skip few events.
+   * Last line skips the event if the pointer is still in the window:
+   * this happens with touch devices because Gtk+ emits 
+   * GDK_CROSSING_UNGRAB to the touch device, thus calling leave-notify,
+   * and we want to skip those events.
+   * 
+   * FIXME the logic of this event should be rewritten. */
+  if (event->mode == GDK_CROSSING_TOUCH_BEGIN ||
+      event->mode == GDK_CROSSING_TOUCH_END ||
+      event->mode == GDK_CROSSING_DEVICE_SWITCH ||
+      window_at_pointer (event->window, NULL, NULL) == event->window)
+    return FALSE;
+#endif
+
   /* When exiting the thumb horizontally (or vertically),
    * in LOCKED state, remove the lock. */
   if ((priv->state & OS_STATE_LOCKED) &&
@@ -1853,6 +1888,8 @@
                                                           scrollbar);
         }
 
+      priv->event &= ~(OS_EVENT_ENTER_NOTIFY);
+
       priv->hidable_thumb = TRUE;
 
       if (priv->source_hide_thumb_id != 0)
@@ -1982,6 +2019,14 @@
   scrollbar = OS_SCROLLBAR (user_data);
   priv = scrollbar->priv;
 
+#ifdef USE_GTK3
+  /* On touch devices with XI2 and Gtk+ >= 3.3.18,
+   * the event enter-notify is not emitted.
+   * Deal with it in motion-notify. */ 
+  if (!(priv->event & OS_EVENT_ENTER_NOTIFY))
+    enter_event (scrollbar);
+#endif
+
   if (priv->event & OS_EVENT_BUTTON_PRESS)
     {
       gint x, y;

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2012-01-18 17:30:27 +0000
+++ os/os-thumb.c	2012-03-13 14:25:23 +0000
@@ -945,6 +945,9 @@
   thumb = OS_THUMB (widget);
   priv = thumb->priv;
 
+  /* This event is called more times with Gtk+ 3 and XI2 devices,
+   * let's accept that because the overhead is still minimal. */
+
   /* If we exit the thumb when a button is pressed,
    * there's no need to stop the animation, it should
    * already be stopped.