Merge lp:~cimi/overlay-scrollbar/g-source-remove-for-timeout into lp:overlay-scrollbar

[Andrea Cimitan]

As the bugreport... seems cleaner and safer

[Andrea Cimitan (cimi)]

this branch follows lp:~cimi/ayatana-scrollbar/lock-internal-thumb

[Kalle Valo (kvalo)]

Looks good to me.

review: Approve

[lp:~cimi/overlay-scrollbar/g-source-remove-for-timeout]

195. By Andrea Cimitan on 2011-04-05

Don't set source_ids to 0 if I'm later assigning them the value returned from g_timeout_add

[Kalle Valo (kvalo)]

Update makes sense.

review: Approve

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-04-04 21:29:28 +0000
+++ os/os-scrollbar.c	2011-04-05 15:24:51 +0000
@@ -55,17 +55,22 @@
   gboolean enter_notify_event;
   gboolean motion_notify_event;
   gboolean value_changed_event;
+  gboolean can_deactivate_pager;
+  gboolean can_hide;
+  gboolean filter;
   gboolean fullsize;
+  gboolean internal;
+  gboolean lock_position;
   gboolean proximity;
-  gboolean filter;
-  gboolean can_deactivate_pager;
-  gboolean can_hide;
   gint win_x;
   gint win_y;
   gint slide_initial_slider_position;
   gint slide_initial_coordinate;
   gint pointer_x;
   gint pointer_y;
+  guint32 source_deactivate_pager_id;
+  guint32 source_hide_thumb_id;
+  guint32 source_unlock_thumb_id;
 };
 
 static gboolean os_scrollbar_expose_event (GtkWidget *widget, GdkEventExpose *event);
@@ -86,6 +91,7 @@
 static gboolean os_scrollbar_deactivate_pager_cb (gpointer user_data);
 static void os_scrollbar_hide_thumb (OsScrollbar *scrollbar);
 static gboolean os_scrollbar_hide_thumb_cb (gpointer user_data);
+static gboolean os_scrollbar_unlock_thumb_cb (gpointer user_data);
 static void os_scrollbar_move (OsScrollbar *scrollbar, gint mouse_x, gint mouse_y);
 static void os_scrollbar_move_thumb (OsScrollbar *scrollbar, gint x, gint y);
 static void os_scrollbar_notify_adjustment_cb (GObject *object, gpointer user_data);
@@ -350,10 +356,14 @@
 static gboolean
 os_scrollbar_deactivate_pager_cb (gpointer user_data)
 {
-  OsScrollbar *scrollbar = OS_SCROLLBAR (user_data);
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
 
   os_scrollbar_deactivate_pager (scrollbar);
-  g_object_unref (scrollbar);
+  priv->source_deactivate_pager_id = 0;
 
   return FALSE;
 }
@@ -376,10 +386,31 @@
 static gboolean
 os_scrollbar_hide_thumb_cb (gpointer user_data)
 {
-  OsScrollbar *scrollbar = OS_SCROLLBAR (user_data);
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
 
   os_scrollbar_hide_thumb (scrollbar);
-  g_object_unref (scrollbar);
+  priv->source_hide_thumb_id = 0;
+
+  return FALSE;
+}
+
+static gboolean
+os_scrollbar_unlock_thumb_cb (gpointer user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = scrollbar->priv;
+
+  if (priv->can_hide)
+    priv->lock_position = FALSE;
+
+  priv->source_unlock_thumb_id = 0;
 
   return FALSE;
 }
@@ -473,7 +504,13 @@
   if (priv->orientation == GTK_ORIENTATION_VERTICAL &&
       (n_monitor != gdk_screen_get_monitor_at_point (screen, x - 1 + priv->slider.width, y) ||
        (x - 1 + priv->slider.width) >= screen_width))
-    return x - DEFAULT_PAGER_WIDTH - priv->slider.width;
+    {
+      priv->internal = TRUE;
+      return x - DEFAULT_PAGER_WIDTH - priv->slider.width;
+    }
+
+  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+    priv->internal = FALSE;
 
   return x;
 }
@@ -501,7 +538,13 @@
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
       (n_monitor != gdk_screen_get_monitor_at_point (screen, x, y - 1 + priv->slider.height) ||
        (y - 1 + priv->slider.height) >= screen_height))
-    return y - DEFAULT_PAGER_WIDTH - priv->slider.height;
+    {
+      priv->internal = TRUE;
+      return y - DEFAULT_PAGER_WIDTH - priv->slider.height;
+    }
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
+    priv->internal = FALSE;
 
   return y;
 }
@@ -715,6 +758,9 @@
   priv->can_deactivate_pager = FALSE;
   priv->can_hide = FALSE;
 
+  if (priv->internal)
+    priv->lock_position = TRUE;
+
   return FALSE;
 }
 
@@ -735,10 +781,19 @@
       priv->can_hide = TRUE;
     }
 
-  g_timeout_add (TIMEOUT_THUMB_HIDE, os_scrollbar_deactivate_pager_cb,
-                 g_object_ref (scrollbar));
-  g_timeout_add (TIMEOUT_THUMB_HIDE, os_scrollbar_hide_thumb_cb,
-                 g_object_ref (scrollbar));
+  if (priv->source_deactivate_pager_id != 0)
+    g_source_remove (priv->source_deactivate_pager_id);
+
+  priv->source_deactivate_pager_id = g_timeout_add (TIMEOUT_THUMB_HIDE,
+                                                    os_scrollbar_deactivate_pager_cb,
+                                                    scrollbar);
+
+  if (priv->source_hide_thumb_id != 0)
+    g_source_remove (priv->source_hide_thumb_id);
+
+  priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_THUMB_HIDE,
+                                              os_scrollbar_hide_thumb_cb,
+                                              scrollbar);
 
   return FALSE;
 }
@@ -1057,6 +1112,8 @@
   if (!priv->enter_notify_event)
     gtk_widget_hide (GTK_WIDGET (priv->thumb));
 
+  priv->lock_position = FALSE;
+
   os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
   os_scrollbar_calc_layout_slider (scrollbar, priv->adjustment->value);
 
@@ -1102,6 +1159,9 @@
                 {
                   priv->can_hide = FALSE;
 
+                  if (priv->lock_position)
+                    return GDK_FILTER_CONTINUE;
+
                   if (priv->overlay.height > priv->slider.height)
                     {
                       gint x, y, x_pos, y_pos;
@@ -1125,6 +1185,7 @@
               else
                 {
                   priv->can_hide = TRUE;
+                  priv->lock_position = FALSE;
                   os_scrollbar_hide_thumb (scrollbar);
                 }
             }
@@ -1137,6 +1198,9 @@
                 {
                   priv->can_hide = FALSE;
 
+                  if (priv->lock_position)
+                    return GDK_FILTER_CONTINUE;
+
                   if (priv->overlay.width > priv->slider.width)
                     {
                       gint x, y, x_pos, y_pos;
@@ -1160,15 +1224,12 @@
               else
                 {
                   priv->can_hide = TRUE;
+                  priv->lock_position = FALSE;
                   os_scrollbar_hide_thumb (scrollbar);
                 }
             }
         }
     }
-    else
-    {
-      return GDK_FILTER_CONTINUE;
-    }
 
   return GDK_FILTER_CONTINUE;
 }
@@ -1188,10 +1249,26 @@
   priv->can_deactivate_pager = TRUE;
   priv->can_hide = TRUE;
 
-  g_timeout_add (TIMEOUT_TOPLEVEL_HIDE, os_scrollbar_deactivate_pager_cb,
-                 g_object_ref (scrollbar));
-  g_timeout_add (TIMEOUT_TOPLEVEL_HIDE, os_scrollbar_hide_thumb_cb,
-                 g_object_ref (scrollbar));
+  if (priv->source_deactivate_pager_id != 0)
+    g_source_remove (priv->source_deactivate_pager_id);
+
+  priv->source_deactivate_pager_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                    os_scrollbar_deactivate_pager_cb,
+                                                    scrollbar);
+
+  if (priv->source_hide_thumb_id != 0)
+    g_source_remove (priv->source_hide_thumb_id);
+
+  priv->source_hide_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                              os_scrollbar_hide_thumb_cb,
+                                              scrollbar);
+
+  if (priv->source_unlock_thumb_id != 0)
+    g_source_remove (priv->source_unlock_thumb_id);
+
+  priv->source_unlock_thumb_id = g_timeout_add (TIMEOUT_TOPLEVEL_HIDE,
+                                                os_scrollbar_unlock_thumb_cb,
+                                                scrollbar);
 
   return FALSE;
 }
@@ -1237,9 +1314,14 @@
 
   priv->can_deactivate_pager = TRUE;
   priv->can_hide = TRUE;
+  priv->filter = FALSE;
   priv->fullsize = FALSE;
+  priv->internal = FALSE;
+  priv->lock_position = FALSE;
   priv->proximity = FALSE;
-  priv->filter = FALSE;
+  priv->source_deactivate_pager_id = 0;
+  priv->source_hide_thumb_id = 0;
+  priv->source_unlock_thumb_id = 0;
 
   priv->pager = os_pager_new ();
 
@@ -1259,6 +1341,24 @@
   scrollbar = OS_SCROLLBAR (object);
   priv = scrollbar->priv;
 
+  if (priv->source_deactivate_pager_id != 0)
+    {
+      g_source_remove (priv->source_deactivate_pager_id);
+      priv->source_deactivate_pager_id = 0;
+    }
+
+  if (priv->source_hide_thumb_id != 0)
+    {
+      g_source_remove (priv->source_hide_thumb_id);
+      priv->source_hide_thumb_id = 0;
+    }
+
+  if (priv->source_unlock_thumb_id != 0)
+    {
+      g_source_remove (priv->source_unlock_thumb_id);
+      priv->source_unlock_thumb_id = 0;
+    }
+
   if (priv->pager != NULL)
     {
       g_object_unref (priv->pager);