Merge lp:~azzar1/compiz-core/scale-left-padding into lp:compiz-core/0.9.5

[Andrea Azzarone]

Add a left padding option to the scale plugin. We really need it to fix the bug #893670.
Using the padding to create the dnd redirect window will fix also the bug #727904.

[lp:~azzar1/compiz-core/scale-left-padding]

2912. By Andrea Azzarone on 2012-01-15

Ops

[Sam Spilsbury (smspillaz)]

The scale plugin needs tests, but thats outside the scope of this merge review

review: Approve

[Sam Spilsbury (smspillaz)]

OK, I did some thinking about this and this comes back to an idea I've had for a while but not yet had time to implement.

We need to have a concept of "overlay struts" in the EWMH or our own extension to it, eg _COMPIZ_NET_OVERLAY_STRUT. Such "struts" allow us to specify parts of the screen which are never available for output operations. That way the scale, expo and other plugins would be able to adjust all layouts to compensate for this lack of screen space on screen-level operations.

_COMPIZ_IS_NET_OVERLAY would be a property on any window which also sets _NET_WM_STRUT or _NET_WM_STRUT_PARTIAL which basically indicates that the area is reserved for both window and screen level operations. So the scale plugin would adjust its layout and dnd window accordingly

review: Needs Information

[Sam Spilsbury (smspillaz)]

Now that we are using overlay struts, this is redundant

Unmerged revisions

2912. By Andrea Azzarone on 2012-01-15

Ops

2911. By Andrea Azzarone on 2012-01-15

Add a left padding option to the scale plugin.

2910. By Daniel van Vugt on 2012-01-13

Fix 'make install' failing to install headers properly (LP: #915186)

2909. By Daniel van Vugt on 2012-01-12

Fix warnings due to signed/unsigned int comparison in CompTimer. (LP: #893998)
Merged: lp:~smspillaz/compiz-core/fix-timer-warnings-893998
without any of its prereqs.

=== modified file 'plugins/scale/scale.xml.in'
--- plugins/scale/scale.xml.in	2011-09-19 13:00:51 +0000
+++ plugins/scale/scale.xml.in	2012-01-15 23:31:25 +0000
@@ -15,6 +15,13 @@
 	<options>
 	    <group>
 		<_short>Appearance</_short>
+			<option name="left_padding" type="int">
+				<_short>Left padding</_short>
+				<_long>Left padding</_long>
+				<default>64</default>
+				<min>0</min>
+				<max>250</max>
+			</option>
 			<option name="spacing" type="int">
 				<_short>Spacing</_short>
 				<_long>Space between windows</_long>
 
=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2011-10-21 15:20:26 +0000
+++ plugins/scale/src/scale.cpp	2012-01-15 23:31:25 +0000
@@ -440,12 +440,14 @@
     int x, y, width, height;
     int lines, n, nSlots;
     int spacing;
+    int left_padding;
 
     if (!nWindows)
 	return;
 
     lines   = sqrt (nWindows + 1);
     spacing = optionGetSpacing ();
+    left_padding = optionGetLeftPadding ();
     nSlots  = 0;
 
     y      = workArea.y () + spacing;
@@ -455,8 +457,8 @@
     {
 	n = MIN (nWindows - nSlots, ceilf ((float) nWindows / lines));
 
-	x     = workArea.x () + spacing;
-	width = (workArea.width () - (n + 1) * spacing) / n;
+	x     = workArea.x () + left_padding + spacing;
+	width = (workArea.width () - left_padding - (n + 1) * spacing) / n;
 
 	for (j = 0; j < n; j++)
 	{
@@ -1052,6 +1054,8 @@
 bool
 PrivateScaleScreen::ensureDndRedirectWindow ()
 {
+    int left_padding = optionGetLeftPadding ();
+
     if (!dndTarget)
     {
 	XSetWindowAttributes attr;
@@ -1071,7 +1075,7 @@
     }
 
     XMoveResizeWindow (screen->dpy (), dndTarget,
-		       0, 0, screen->width (), screen->height ());
+		       left_padding, 0, screen->width () - left_padding, screen->height ());
     XMapRaised (screen->dpy (), dndTarget);
 
     return true;