Merge lp:~cimi/overlay-scrollbar/unity-net-workarea-region into lp:overlay-scrollbar

[Andrea Cimitan]

[lp:~cimi/overlay-scrollbar/unity-net-workarea-region]

251. By Andrea Cimitan on 2011-06-12

Cast the two GdkRectangle

252. By Andrea Cimitan on 2011-06-12

Gets the root window of the proper screen and display

253. By Andrea Cimitan on 2011-06-12

Added a FIXME

254. By Andrea Cimitan on 2011-06-12

Now uses the right window on the right screen

255. By Andrea Cimitan on 2011-06-12

Added a FIXME for the root window on screen-changed

256. By Andrea Cimitan on 2011-06-12

Added comment to the static function

257. By Andrea Cimitan on 2011-06-12

Typo

258. By Andrea Cimitan on 2011-06-12

Removed the FIXME as the screen does not change for a widget in X11

[Ted Gould (ted)]

You're right in the comment! You should put the clear in the if statement so that it doesn't change unless you're sure you're making it better. If for some reason it failed, it's better to leave it in the default state rather than clearing it.

review: Approve

[Andrea Cimitan (cimi)]

but in sanitize_x/y, if the region is empty, usage of region is skipped... so again, won't change much if the xgetwindowproperty fail.

basically we have two solutions if xgetwindowproperty fails:
1) the scrollbars won't take into account the struts (like now, because the region is cleared everytime).
2) the scrollbars will use the region calculated before (if the region will be cleared only inside the if statement).

[Ted Gould (ted)]

Would it make things simpler if we just make the default square be the
screensize and then we don't have to detect if it's empty?

[Andrea Cimitan (cimi)]

it's exactly the same ted. the code to clear the region is used just because union is used, so if you don't clear the previous region then you'll obtain a bigger region

=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-06-09 17:12:44 +0000
+++ os/os-scrollbar.c	2011-06-12 23:49:28 +0000
@@ -27,6 +27,8 @@
 #include "os-scrollbar.h"
 #include "os-private.h"
 #include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>
 #include <X11/extensions/XInput2.h>
 #include "math.h"
 
@@ -86,7 +88,9 @@
 };
 
 static Atom net_active_window_atom = None;
+static Atom unity_net_workarea_region_atom = None;
 static GList *os_root_list = NULL;
+static cairo_region_t *os_workarea = NULL;
 
 static void swap_adjustment (OsScrollbar *scrollbar, GtkAdjustment *adjustment);
 static void swap_thumb (OsScrollbar *scrollbar, GtkWidget *thumb);
@@ -270,6 +274,56 @@
     }
 }
 
+/* calculate the workarea using _UNITY_NET_WORKAREA_REGION */
+static void
+calc_workarea (Display *display,
+               Window   root)
+{
+  Atom type;
+  cairo_rectangle_int_t test;
+  gint result, fmt;
+  gulong nitems, nleft;
+  guchar *property_data;
+  gulong *long_data;
+  guint i;
+
+  result = XGetWindowProperty (display, root,
+                               unity_net_workarea_region_atom,
+                               0L, 4096L, FALSE, XA_CARDINAL,
+                               &type, &fmt, &nitems, &nleft, &property_data);
+
+  /* clear the os_workarea region,
+   * before the union with the new rectangles.
+   * Maybe it'd be better to place this call
+   * inside the if statement below. */
+  cairo_region_subtract (os_workarea, os_workarea);
+
+  if (result == Success && property_data)
+    {
+      long_data = (gulong*) property_data;
+
+      if (fmt == 32 && type == XA_CARDINAL && nitems % 4 == 0)
+        {
+          int count;
+          unsigned int i;
+          
+          count = nitems / 4;
+
+          for (i = 0; i < count; i++)
+            {
+              cairo_rectangle_int_t rect;
+
+              rect.x = long_data[i * 4 + 0];
+              rect.y = long_data[i * 4 + 1];
+              rect.width = long_data[i * 4 + 2];
+              rect.height = long_data[i * 4 + 3];
+
+              cairo_region_union_rectangle (os_workarea, &rect);
+            }
+        }
+    }
+}
+
 /* deactivate the pager if it's the case */
 static void
 deactivate_pager (OsScrollbar *scrollbar)
@@ -364,7 +418,7 @@
             gint         x,
             gint         y)
 {
-  GdkRectangle rect;
+  cairo_rectangle_int_t rect;
   OsScrollbarPrivate *priv;
   gint screen_width, n_monitor;
   GdkScreen *screen;
@@ -375,9 +429,37 @@
    * to calculate monitor boundaries. */
   screen = gtk_widget_get_screen (GTK_WIDGET (scrollbar)); 
   n_monitor = gdk_screen_get_monitor_at_point (screen, x - 1, y);
-  gdk_screen_get_monitor_geometry (screen, n_monitor, &rect);
-
-  screen_width = rect.x + rect.width;
+  gdk_screen_get_monitor_geometry (screen, n_monitor, (GdkRectangle*) &rect);
+
+  if (cairo_region_is_empty (os_workarea))
+    screen_width = rect.x + rect.width;
+  else
+    {
+      cairo_region_t *monitor_workarea;
+      cairo_rectangle_int_t tmp_rect;
+      gint i, x, width;
+
+      x = rect.x;
+      width = rect.width;
+
+      monitor_workarea = cairo_region_create_rectangle (&rect);
+
+      cairo_region_intersect (monitor_workarea, os_workarea);
+
+      for (i = 0; i < cairo_region_num_rectangles (monitor_workarea); i++)
+        {
+          cairo_region_get_rectangle (monitor_workarea, i, &tmp_rect);
+
+          if (tmp_rect.x > x)
+            x = tmp_rect.x;
+          if (tmp_rect.x + tmp_rect.width < width)
+            width = tmp_rect.x + tmp_rect.width;
+        }
+
+      screen_width = x + width;
+
+      cairo_region_destroy (monitor_workarea);
+    }
 
   if (priv->orientation == GTK_ORIENTATION_VERTICAL &&
       (n_monitor != gdk_screen_get_monitor_at_point (screen, x - 1 + priv->slider.width, y) ||
@@ -399,7 +481,7 @@
             gint         x,
             gint         y)
 {
-  GdkRectangle rect;
+  cairo_rectangle_int_t rect;
   OsScrollbarPrivate *priv;
   gint screen_height, n_monitor;
   GdkScreen *screen;
@@ -410,9 +492,37 @@
    * to calculate monitor boundaries. */
   screen = gtk_widget_get_screen (GTK_WIDGET (scrollbar)); 
   n_monitor = gdk_screen_get_monitor_at_point (screen, x, y - 1);
-  gdk_screen_get_monitor_geometry (screen, n_monitor, &rect);
-  
-  screen_height = rect.y + rect.height;
+  gdk_screen_get_monitor_geometry (screen, n_monitor, (GdkRectangle*) &rect);
+
+  if (cairo_region_is_empty (os_workarea))  
+    screen_height = rect.y + rect.height;
+  else
+    {
+      cairo_region_t *monitor_workarea;
+      cairo_rectangle_int_t tmp_rect;
+      gint i, y, height;
+
+      y = rect.y;
+      height = rect.height;
+
+      monitor_workarea = cairo_region_create_rectangle (&rect);
+
+      cairo_region_intersect (monitor_workarea, os_workarea);
+
+      for (i = 0; i < cairo_region_num_rectangles (monitor_workarea); i++)
+        {
+          cairo_region_get_rectangle (monitor_workarea, i, &tmp_rect);
+
+          if (tmp_rect.y > y)
+            y = tmp_rect.y;
+          if (tmp_rect.y + tmp_rect.height < height)
+            height = tmp_rect.y + tmp_rect.height;
+        }
+
+      screen_height = y + height;
+
+      cairo_region_destroy (monitor_workarea);
+    }
 
   if (priv->orientation == GTK_ORIENTATION_HORIZONTAL &&
       (n_monitor != gdk_screen_get_monitor_at_point (screen, x, y - 1 + priv->slider.height) ||
@@ -847,10 +957,16 @@
 
   xev = gdkxevent;
 
-  if (xev->xany.type == PropertyNotify &&
-      xev->xproperty.atom == net_active_window_atom)
+  if (xev->type == PropertyNotify)
     {
-      g_list_foreach (os_root_list, root_gfunc, NULL);
+      if (xev->xproperty.atom == net_active_window_atom)
+        {
+          g_list_foreach (os_root_list, root_gfunc, NULL);
+        }
+      else if (xev->xproperty.atom == unity_net_workarea_region_atom)
+        {
+          calc_workarea (xev->xany.display, xev->xany.window);
+        }
     }
 
   return GDK_FILTER_CONTINUE;
@@ -1997,16 +2113,22 @@
 
   if (os_root_list == NULL)
     {
+      GdkScreen *screen;
       GdkWindow *root;
 
       /* used in the root_filter_func to match the right property. */
       net_active_window_atom = gdk_x11_get_xatom_by_name ("_NET_ACTIVE_WINDOW");
+      unity_net_workarea_region_atom = gdk_x11_get_xatom_by_name ("_UNITY_NET_WORKAREA_REGION");
 
       /* append the object to the static linked list. */
       os_root_list = g_list_append (os_root_list, scrollbar);
 
+      /* create the region. */
+      os_workarea = cairo_region_create ();
+
       /* apply the root_filter_func. */
-      root = gdk_get_default_root_window ();
+      screen = gtk_widget_get_screen (GTK_WIDGET (scrollbar));
+      root = gdk_screen_get_root_window (screen);
       gdk_window_set_events (root, gdk_window_get_events (root) |
                                    GDK_PROPERTY_CHANGE_MASK);
       gdk_window_add_filter (root, root_filter_func, NULL);
@@ -2091,6 +2213,12 @@
       priv->window_group = NULL;
     }
 
+  if (os_workarea != NULL)
+    {
+      cairo_region_destroy (os_workarea);
+      os_workarea = NULL;
+    }
+
   swap_adjustment (scrollbar, NULL);
   swap_thumb (scrollbar, NULL);