Merge lp:~cimi/overlay-scrollbar/add-remove-toplevel-filter-func into lp:overlay-scrollbar

[Andrea Cimitan]

Various changes, trying to allocate issues for the BadAlloc, optimizing pager, removing the toplevel_filter_func

[lp:~cimi/overlay-scrollbar/add-remove-toplevel-filter-func]

150. By Andrea Cimitan on 2011-03-09

removed toplevel_connect, put everything in realize

151. By Andrea Cimitan on 2011-03-09

Added parent_urealize_cb

[Ted Gould (ted)]

Pretty big change! I don't see anything off.

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-03-08 02:17:15 +0000
+++ os/os-pager.c	2011-03-09 16:19:25 +0000
@@ -48,8 +48,7 @@
 static void os_pager_finalize (GObject *object);
 static void os_pager_create (OsPager *pager);
 static void os_pager_draw (OsPager *pager);
-static void os_pager_draw_bitmap (GdkPixmap *pixmap, GdkRectangle mask);
-static void os_pager_draw_pixmap (GdkPixmap *pixmap, gboolean active);
+static void os_pager_draw_bitmap (GdkPixmap *pixmap);
 static void os_pager_mask (OsPager *pager);
 
 /* Private functions */
@@ -90,16 +89,17 @@
 static void
 os_pager_draw (OsPager *pager)
 {
-  GdkPixmap *pixmap;
   OsPagerPrivate *priv;
+  GtkStyle *style;
 
   priv = OS_PAGER_GET_PRIVATE (pager);
 
-  pixmap = gdk_pixmap_new (NULL, priv->allocation.width,
-                           priv->allocation.height, 24);
-  os_pager_draw_pixmap (pixmap, priv->active);
-
-  gdk_window_set_back_pixmap (priv->pager_window, pixmap, FALSE);
+  style = gtk_widget_get_style (priv->parent);
+
+  gdk_window_set_background (priv->pager_window,
+                             priv->active ? &style->base[GTK_STATE_SELECTED] :
+                                            &style->base[GTK_STATE_INSENSITIVE]);
+
   gdk_window_clear (priv->pager_window);
 }
 
@@ -112,23 +112,25 @@
 
   priv = OS_PAGER_GET_PRIVATE (pager);
 
-  bitmap = gdk_pixmap_new (NULL, priv->allocation.width,
-                           priv->allocation.height, 1);
-  os_pager_draw_bitmap (bitmap, priv->mask);
-
-  gdk_window_shape_combine_mask (priv->pager_window, bitmap, 0, 0);
+  bitmap = gdk_pixmap_new (NULL, MAX (1, priv->mask.width),
+                           MAX (1, priv->mask.height), 1);
+  os_pager_draw_bitmap (bitmap);
+
+  gdk_window_shape_combine_mask (priv->pager_window, bitmap,
+                                 priv->mask.x, priv->mask.y);
+
+  g_object_unref (bitmap);
 }
 
 /* Draw on the bitmap of the pager, to get a mask. */
 static void
-os_pager_draw_bitmap (GdkBitmap    *bitmap,
-                      GdkRectangle  mask)
+os_pager_draw_bitmap (GdkBitmap *bitmap)
 {
   cairo_t *cr_surface;
   cairo_surface_t *surface;
   gint width, height;
 
-  gdk_drawable_get_size (bitmap, &width, &height);
+  gdk_pixmap_get_size (bitmap, &width, &height);
 
   surface = cairo_xlib_surface_create_for_bitmap
       (GDK_DRAWABLE_XDISPLAY (bitmap), gdk_x11_drawable_get_xid (bitmap),
@@ -136,42 +138,11 @@
 
   cr_surface = cairo_create (surface);
 
-  cairo_set_operator (cr_surface, CAIRO_OPERATOR_CLEAR);
-  cairo_paint (cr_surface);
-
-  cairo_set_operator (cr_surface, CAIRO_OPERATOR_OVER);
-  cairo_rectangle (cr_surface, mask.x, mask.y, mask.width, mask.height);
-  cairo_set_source_rgb (cr_surface, 1.0, 1.0, 1.0);
-  cairo_fill (cr_surface);
-
-  cairo_destroy (cr_surface);
-}
-
-/* Draw on the pixmap of the pager, the real drawing. */
-static void
-os_pager_draw_pixmap (GdkPixmap *pixmap,
-                      gboolean   active)
-{
-  cairo_t *cr_surface;
-  cairo_surface_t *surface;
-  gint width, height;
-
-  gdk_drawable_get_size (pixmap, &width, &height);
-
-  surface = cairo_xlib_surface_create
-      (GDK_DRAWABLE_XDISPLAY (pixmap), gdk_x11_drawable_get_xid (pixmap),
-       GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (pixmap)), width, height);
-
-  cr_surface = cairo_create (surface);
-
-  if (active)
-    cairo_set_source_rgb (cr_surface, 240.0 / 255.0, 119.0 / 255.0, 70.0 / 255.0);
-  else
-    cairo_set_source_rgb (cr_surface, 0.85, 0.85, 0.85);
-
-  cairo_paint (cr_surface);
-
-  cairo_destroy (cr_surface);
+  cairo_paint (cr_surface);
+
+  cairo_destroy (cr_surface);
+
+  cairo_surface_destroy (surface);
 }
 
 /* Type definition. */
@@ -192,7 +163,7 @@
 static void
 os_pager_init (OsPager *pager)
 {
-  GdkRectangle allocation;
+  GdkRectangle allocation, mask;
   OsPagerPrivate *priv;
 
   priv = OS_PAGER_GET_PRIVATE (pager);
@@ -204,7 +175,14 @@
 
   priv->allocation = allocation;
 
-  priv->active = TRUE;
+  mask.x = 0;
+  mask.y = 0;
+  mask.width = 1;
+  mask.height = 1;
+
+  priv->mask = mask;
+
+  priv->active = FALSE;
   priv->visible = FALSE;
 }
 

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-08 15:02:30 +0000
+++ os/os-scrollbar.c	2011-03-09 16:19:25 +0000
@@ -62,9 +62,9 @@
   gboolean enter_notify_event;
   gboolean motion_notify_event;
   gboolean value_changed_event;
-  gboolean toplevel_connected;
   gboolean fullsize;
   gboolean proximity;
+  gboolean filter;
   gboolean can_hide;
   gboolean can_rgba;
   gint win_x;
@@ -100,7 +100,6 @@
 static void os_scrollbar_swap_adjustment (OsScrollbar *scrollbar, GtkAdjustment *adjustment);
 static void os_scrollbar_swap_parent (OsScrollbar *scrollbar, GtkWidget *parent);
 static void os_scrollbar_swap_thumb (OsScrollbar *scrollbar, GtkWidget *thumb);
-static void os_scrollbar_toplevel_connect (OsScrollbar *scrollbar);
 static gboolean thumb_button_press_event_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 static gboolean thumb_button_release_event_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 static gboolean thumb_enter_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
@@ -108,11 +107,12 @@
 static gboolean thumb_motion_notify_event_cb (GtkWidget *widget, GdkEventMotion *event, gpointer user_data);
 static void pager_move (OsScrollbar *scrollbar);
 static void pager_set_allocation (OsScrollbar *scrollbar);
+static void pager_set_state (OsScrollbar *scrollbar);
 static void adjustment_changed_cb (GtkAdjustment *adjustment, gpointer user_data);
 static void adjustment_value_changed_cb (GtkAdjustment *adjustment, gpointer user_data);
-static gboolean parent_expose_event_cb (GtkWidget *widget, GdkEventExpose *event, gpointer user_data);
 static void parent_realize_cb (GtkWidget *widget, gpointer user_data);
 static void parent_size_allocate_cb (GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
+static void parent_unrealize_cb (GtkWidget *widget, gpointer user_data);
 static gboolean toplevel_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event, gpointer user_data);
 static GdkFilterReturn toplevel_filter_func (GdkXEvent *gdkxevent, GdkEvent *event, gpointer user_data);
 static gboolean toplevel_leave_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
@@ -551,11 +551,11 @@
   if (priv->parent != NULL)
     {
       g_signal_handlers_disconnect_by_func (G_OBJECT (priv->parent),
-                                            G_CALLBACK (parent_expose_event_cb), scrollbar);
-      g_signal_handlers_disconnect_by_func (G_OBJECT (priv->parent),
                                             G_CALLBACK (parent_realize_cb), scrollbar);
       g_signal_handlers_disconnect_by_func (G_OBJECT (priv->parent),
                                             G_CALLBACK (parent_size_allocate_cb), scrollbar);
+      g_signal_handlers_disconnect_by_func (G_OBJECT (priv->parent),
+                                            G_CALLBACK (parent_unrealize_cb), scrollbar);
 
       g_object_unref (priv->parent);
     }
@@ -566,12 +566,12 @@
     {
       g_object_ref_sink (priv->parent);
 
-      g_signal_connect (G_OBJECT (priv->parent), "expose-event",
-                        G_CALLBACK (parent_expose_event_cb), scrollbar);
       g_signal_connect (G_OBJECT (priv->parent), "realize",
                         G_CALLBACK (parent_realize_cb), scrollbar);
       g_signal_connect (G_OBJECT (priv->parent), "size-allocate",
                         G_CALLBACK (parent_size_allocate_cb), scrollbar);
+      g_signal_connect (G_OBJECT (priv->parent), "unrealize",
+                        G_CALLBACK (parent_unrealize_cb), scrollbar);
     }
 }
 
@@ -617,35 +617,6 @@
     }
 }
 
-/* Create elements. */
-/* FIXME(Cimi): Needs to be improved. */
-static void
-os_scrollbar_toplevel_connect (OsScrollbar *scrollbar)
-{
-  OsScrollbarPrivate *priv;
-  gint x_pos, y_pos;
-
-  priv = OS_SCROLLBAR_GET_PRIVATE (OS_SCROLLBAR (scrollbar));
-
-  g_return_if_fail (priv->parent != NULL);
-  g_return_if_fail (GDK_IS_WINDOW (gtk_widget_get_window (priv->parent)));
-
-  gdk_window_add_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, scrollbar);
-  g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (priv->parent)), "configure-event",
-                    G_CALLBACK (toplevel_configure_event_cb), scrollbar);
-  g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (priv->parent)), "leave-notify-event",
-                    G_CALLBACK (toplevel_leave_notify_event_cb), scrollbar);
-  priv->toplevel_connected = TRUE;
-
-  gdk_window_get_position (gtk_widget_get_window (priv->parent), &x_pos, &y_pos);
-
-  os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
-
-  os_scrollbar_move_thumb (scrollbar, x_pos + priv->thumb_all.x, y_pos + priv->thumb_all.y);
-
-  os_scrollbar_store_window_position (scrollbar);
-}
-
 static gboolean
 thumb_button_press_event_cb (GtkWidget      *widget,
                              GdkEventButton *event,
@@ -928,6 +899,20 @@
 }
 
 static void
+pager_set_state (OsScrollbar *scrollbar)
+{
+  OsScrollbarPrivate *priv;
+
+  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+
+  if (gdk_screen_get_active_window (gtk_widget_get_screen (priv->parent)) !=
+      gtk_widget_get_window (priv->parent))
+    os_pager_set_active (OS_PAGER (priv->pager), FALSE);
+  else
+    os_pager_set_active (OS_PAGER (priv->pager), TRUE);
+}
+
+static void
 adjustment_changed_cb (GtkAdjustment *adjustment,
                        gpointer       user_data)
 {
@@ -976,25 +961,6 @@
   pager_move (scrollbar);
 }
 
-static gboolean
-parent_expose_event_cb (GtkWidget      *widget,
-                        GdkEventExpose *event,
-                        gpointer        user_data)
-{
-  OsScrollbar *scrollbar;
-  OsScrollbarPrivate *priv;
-
-  scrollbar = OS_SCROLLBAR (user_data);
-  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
-
-  if (!priv->toplevel_connected)
-    {
-      os_scrollbar_toplevel_connect (scrollbar);
-    }
-
-  return FALSE;
-}
-
 static void
 parent_realize_cb (GtkWidget *widget,
                    gpointer   user_data)
@@ -1005,6 +971,19 @@
   scrollbar = OS_SCROLLBAR (user_data);
   priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
 
+  if (priv->filter == FALSE && priv->proximity == TRUE)
+    {
+      priv->filter =  TRUE;
+      gdk_window_add_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, scrollbar);
+    }
+
+  g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (priv->parent)), "configure-event",
+                    G_CALLBACK (toplevel_configure_event_cb), scrollbar);
+  g_signal_connect (G_OBJECT (gtk_widget_get_toplevel (priv->parent)), "leave-notify-event",
+                    G_CALLBACK (toplevel_leave_notify_event_cb), scrollbar);
+
+  os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
+
   os_pager_set_parent (OS_PAGER (priv->pager), priv->parent);
 }
 
@@ -1045,12 +1024,36 @@
   if (priv->adjustment != NULL)
     os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
 
-  if (priv->pager != NULL)
-    pager_set_allocation (scrollbar);
+  pager_set_allocation (scrollbar);
 
   os_scrollbar_store_window_position (scrollbar);
 }
 
+static void
+parent_unrealize_cb (GtkWidget *widget,
+                     gpointer   user_data)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (user_data);
+  priv = OS_SCROLLBAR_GET_PRIVATE (scrollbar);
+
+  /* FIXME(Cimi) check if
+   * gtk_widget_get_window (priv->parent) and
+   * gtk_widget_get_toplevel (priv->parent))
+   * are ready to use, otherwise we might need to store them in priv */
+
+  gdk_window_remove_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, scrollbar);
+
+  g_signal_handlers_disconnect_by_func (G_OBJECT (gtk_widget_get_toplevel (priv->parent)),
+                                        G_CALLBACK (toplevel_configure_event_cb), scrollbar);
+  g_signal_handlers_disconnect_by_func (G_OBJECT (gtk_widget_get_toplevel (priv->parent)),
+                                        G_CALLBACK (toplevel_leave_notify_event_cb), scrollbar);
+
+  os_pager_set_parent (OS_PAGER (priv->pager), NULL);
+}
+
 static gboolean
 toplevel_configure_event_cb (GtkWidget         *widget,
                              GdkEventConfigure *event,
@@ -1099,7 +1102,7 @@
   g_return_val_if_fail (priv->pager != NULL, GDK_FILTER_CONTINUE);
   g_return_val_if_fail (priv->thumb != NULL, GDK_FILTER_CONTINUE);
 
-  if (priv->proximity && !priv->fullsize)
+  if (!priv->fullsize)
     {
       /* get the motion_notify_event trough XEvent */
       if (xevent->type == MotionNotify)
@@ -1185,20 +1188,14 @@
     }
     else
     {
-      os_pager_hide (OS_PAGER (priv->pager));
+      return GDK_FILTER_CONTINUE;
     }
 
   /* code to check if the window is active */
   if (xevent->type == PropertyNotify)
     {
-      GdkScreen *screen;
-      GdkWindow *active_window;
-
-      screen = gtk_widget_get_screen (priv->parent);
-
-      active_window = gdk_screen_get_active_window (screen);
-
-      if (active_window != gtk_widget_get_window (priv->parent))
+      if (gdk_screen_get_active_window (gtk_widget_get_screen (priv->parent)) !=
+          gtk_widget_get_window (priv->parent))
         {
           gtk_widget_hide (GTK_WIDGET (priv->thumb));
           os_pager_set_active (OS_PAGER (priv->pager), FALSE);
@@ -1267,6 +1264,7 @@
   priv->can_rgba = FALSE;
   priv->fullsize = FALSE;
   priv->proximity = FALSE;
+  priv->filter = FALSE;
 
   priv->pager = os_pager_new ();
 
@@ -1325,7 +1323,16 @@
 
   priv->proximity = TRUE;
 
-  os_pager_show (OS_PAGER (priv->pager));
+  pager_set_state (OS_SCROLLBAR (widget));
+
+  if (priv->fullsize == FALSE)
+    os_pager_show (OS_PAGER (priv->pager));
+
+  if (gtk_widget_get_realized (priv->parent) && priv->filter == FALSE)
+    {
+      priv->filter = TRUE;
+      gdk_window_add_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, OS_SCROLLBAR (widget));
+    }
 
 #if 0
   Display *display;
@@ -1408,6 +1415,12 @@
   priv->proximity = FALSE;
 
   os_pager_hide (OS_PAGER (priv->pager));
+
+  if (gtk_widget_get_realized (priv->parent) && priv->filter == TRUE)
+    {
+      priv->filter = FALSE;
+      gdk_window_remove_filter (gtk_widget_get_window (priv->parent), toplevel_filter_func, OS_SCROLLBAR (widget));
+    }
 }
 
 static void