Merge lp:~cimi/overlay-scrollbar/performance-tweaks into lp:overlay-scrollbar

[Andrea Cimitan]

First branch containing fixes for performance

[Javier Jardón (jjardon)]

review: Approve

=== modified file 'os/os-pager.c'
--- os/os-pager.c	2011-03-15 18:03:47 +0000
+++ os/os-pager.c	2011-03-16 15:43:24 +0000
@@ -40,15 +40,27 @@
   gint height;
 };
 
+static gboolean rectangle_changed (GdkRectangle rectangle1, GdkRectangle rectangle2);
 static void os_pager_dispose (GObject *object);
 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);
 static void os_pager_mask (OsPager *pager);
 
 /* Private functions */
 
+static gboolean
+rectangle_changed (GdkRectangle rectangle1,
+                   GdkRectangle rectangle2)
+{
+  if (rectangle1.x != rectangle2.x) return TRUE;
+  if (rectangle1.y != rectangle2.y) return TRUE;
+  if (rectangle1.width  != rectangle2.width)  return TRUE;
+  if (rectangle1.height != rectangle2.height) return TRUE;
+
+  return FALSE;
+}
+
 /* Create a pager. */
 static void
 os_pager_create (OsPager *pager)
@@ -106,44 +118,15 @@
 static void
 os_pager_mask (OsPager *pager)
 {
-  GdkBitmap *bitmap;
   OsPagerPrivate *priv;
 
   priv = pager->priv;
 
-  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);
+  gdk_window_shape_combine_region (priv->pager_window,
+                                   gdk_region_rectangle (&priv->mask),
+                                   0, 0);
 
   gdk_window_clear (priv->pager_window);
-
-  g_object_unref (bitmap);
-}
-
-/* Draw on the bitmap of the pager, to get a mask. */
-static void
-os_pager_draw_bitmap (GdkBitmap *bitmap)
-{
-  cairo_t *cr_surface;
-  cairo_surface_t *surface;
-  gint 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),
-       GDK_SCREEN_XSCREEN (gdk_drawable_get_screen (bitmap)), width, height);
-
-  cr_surface = cairo_create (surface);
-
-  cairo_paint (cr_surface);
-
-  cairo_destroy (cr_surface);
-
-  cairo_surface_destroy (surface);
 }
 
 /* Type definition. */
@@ -257,6 +240,9 @@
 
   priv = pager->priv;
 
+  if (!rectangle_changed (priv->mask, mask))
+    return;
+
   priv->mask = mask;
 
   if (priv->parent == NULL)
@@ -376,6 +362,9 @@
 
   priv = pager->priv;
 
+  if (!rectangle_changed (priv->allocation, rectangle))
+    return;
+
   priv->allocation = rectangle;
 
   if (priv->parent == NULL)

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-03-15 15:43:22 +0000
+++ os/os-scrollbar.c	2011-03-16 15:43:24 +0000
@@ -101,7 +101,6 @@
 static gboolean thumb_leave_notify_event_cb (GtkWidget *widget, GdkEventCrossing *event, gpointer user_data);
 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);
@@ -656,8 +655,6 @@
 
           priv->pointer_x = event->x;
           priv->pointer_y = event->y;
-
-          gtk_widget_queue_draw (widget);
         }
     }
 
@@ -703,8 +700,6 @@
 
           priv->button_press_event = FALSE;
           priv->motion_notify_event = FALSE;
-
-          gtk_widget_queue_draw (widget);
         }
     }
 
@@ -782,9 +777,6 @@
           priv->value_changed_event = FALSE;
         }
 
-      if (!priv->motion_notify_event)
-        gtk_widget_queue_draw (widget);
-
       priv->motion_notify_event = TRUE;
 
       os_scrollbar_move (scrollbar, event->x_root, event->y_root);
@@ -875,40 +867,6 @@
   os_pager_move_resize (OS_PAGER (priv->pager), mask);
 }
 
-/* Resize the overlay window. */
-static void
-pager_set_allocation (OsScrollbar *scrollbar)
-{
-  GdkRectangle rect;
-  OsScrollbarPrivate *priv;
-  gint offset;
-
-  priv = scrollbar->priv;
-
-  if (GTK_IS_SCROLLED_WINDOW (priv->parent) &&
-      gtk_scrolled_window_get_shadow_type (GTK_SCROLLED_WINDOW (priv->parent)) != GTK_SHADOW_NONE)
-    offset = 1;
-  else
-    offset = 0;
-
-  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-      rect.x = priv->overlay_all.x;
-      rect.y = priv->overlay_all.y + offset;
-      rect.width = DEFAULT_PAGER_WIDTH;
-      rect.height = priv->overlay_all.height - offset * 2;
-    }
-  else
-    {
-      rect.x = priv->overlay_all.x + offset;
-      rect.y = priv->overlay_all.y;
-      rect.width = priv->overlay_all.width - offset * 2;
-      rect.height = DEFAULT_PAGER_WIDTH;
-    }
-
-  os_pager_size_allocate (OS_PAGER (priv->pager), rect);
-}
-
 static void
 pager_set_state (OsScrollbar *scrollbar)
 {
@@ -1005,6 +963,7 @@
                          GtkAllocation *allocation,
                          gpointer       user_data)
 {
+  GdkRectangle rect;
   OsScrollbar *scrollbar;
   OsScrollbarPrivate *priv;
   gint offset;
@@ -1032,6 +991,11 @@
       priv->slider.height = DEFAULT_SCROLLBAR_HEIGHT;
       priv->overlay_all.x = allocation->x + allocation->width - DEFAULT_PAGER_WIDTH - offset;
       priv->thumb_all.x = allocation->x + allocation->width - offset;
+
+      rect.x = priv->overlay_all.x;
+      rect.y = priv->overlay_all.y + offset;
+      rect.width = DEFAULT_PAGER_WIDTH;
+      rect.height = priv->overlay_all.height - offset * 2;
     }
   else
     {
@@ -1039,6 +1003,11 @@
       priv->slider.height = DEFAULT_SCROLLBAR_WIDTH;
       priv->overlay_all.y = allocation->y + allocation->height - DEFAULT_PAGER_WIDTH - offset;
       priv->thumb_all.y = allocation->y + allocation->height - offset;
+
+      rect.x = priv->overlay_all.x + offset;
+      rect.y = priv->overlay_all.y;
+      rect.width = priv->overlay_all.width - offset * 2;
+      rect.height = DEFAULT_PAGER_WIDTH;
     }
 
   if (priv->adjustment != NULL)
@@ -1047,7 +1016,8 @@
       os_scrollbar_calc_layout_slider (scrollbar, priv->adjustment->value);
     }
 
-  pager_set_allocation (scrollbar);
+  os_pager_size_allocate (OS_PAGER (priv->pager), rect);
+
   pager_move (scrollbar);
 
   if (gtk_widget_get_realized (widget))
@@ -1094,15 +1064,13 @@
 
   os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
   os_scrollbar_calc_layout_slider (scrollbar, priv->adjustment->value);
+
   os_scrollbar_move_thumb (scrollbar,
                            event->x + priv->thumb_all.x + priv->slider.x,
                            event->y + priv->thumb_all.y + priv->slider.y);
 
   os_scrollbar_store_window_position (scrollbar);
 
-  pager_set_allocation (scrollbar);
-  pager_move (scrollbar);
-
   return FALSE;
 }
 
@@ -1132,9 +1100,6 @@
       /* get the motion_notify_event trough XEvent */
       if (xevent->type == MotionNotify)
         {
-          os_scrollbar_calc_layout_pager (scrollbar, priv->adjustment->value);
-          os_scrollbar_calc_layout_slider (scrollbar, priv->adjustment->value);
-
           /* proximity area */
           if (priv->orientation == GTK_ORIENTATION_VERTICAL)
             {

=== modified file 'os/os-thumb.c'
--- os/os-thumb.c	2011-03-14 15:17:25 +0000
+++ os/os-thumb.c	2011-03-16 15:43:24 +0000
@@ -266,7 +266,7 @@
   gint radius;
 
   thumb = OS_THUMB (widget);
-  priv = thumb->priv;;
+  priv = thumb->priv;
 
   state_type_down = GTK_STATE_NORMAL;
   state_type_up = GTK_STATE_NORMAL;