[beryl-commits] r1458 - trunk/aquamarine/src

[onestone at server.beryl-project.org]

Author: onestone
Date: 2006-12-02 00:22:03 +0100 (Sat, 02 Dec 2006)
New Revision: 1458

Modified:
   trunk/aquamarine/src/window.cpp
Log:
aquamarine: fixed default decorations

Modified: trunk/aquamarine/src/window.cpp
===================================================================
--- trunk/aquamarine/src/window.cpp	2006-11-29 21:38:27 UTC (rev 1457)
+++ trunk/aquamarine/src/window.cpp	2006-12-01 23:22:03 UTC (rev 1458)
@@ -995,7 +995,7 @@
     *data++ = 0;
     *data++ = 0;
 
-    //TOP
+    // TOP LEFT
     *data++ =
         ((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
         ((GRAVITY_NORTH | GRAVITY_WEST) << 4) |
@@ -1010,21 +1010,8 @@
     *data++ = 0;
     *data++ = 0;
 
-    *data++ =
-        ((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
-        ((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
-        (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
-
-    *data++ = 0;
-    *data++ = -top;
-    *data++ = 0;
-    *data++ = 0;
-    *data++ = w_w;
-    *data++ = top;
-    *data++ = left;
-    *data++ = 0;
-
-    *data++ =
+	// TOP RIGHT
+	*data++ =
         ((GRAVITY_NORTH | GRAVITY_EAST) << 0) |
         ((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
         (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
@@ -1038,8 +1025,7 @@
     *data++ = left + w_w;
     *data++ = 0;
 
-
-    //BOTTOM
+	// BOTTOM LEFT
     *data++ =
         ((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
         ((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
@@ -1054,21 +1040,8 @@
     *data++ = 0;
     *data++ = w_h + top;
 
-    *data++ =
-        ((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
-        ((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
-        (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
-
-    *data++ = 0;
-    *data++ = 0;
-    *data++ = 0;
-    *data++ = bottom;
-    *data++ = w_w;
-    *data++ = bottom;
-    *data++ = left;
-    *data++ = w_h + top;
-
-    *data++ =
+	// BOTTOM RIGHT
+	*data++ =
         ((GRAVITY_SOUTH | GRAVITY_EAST) << 0) |
         ((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
         (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
@@ -1082,42 +1055,128 @@
     *data++ = left + w_w;
     *data++ = w_h + top;
 
-    //LEFT
+	// TOP CENTER
+	*data++ =
+		((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
+		(0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
+
+	*data++ = 0;
+	*data++ = -top;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = w_w;
+	*data++ = top;
+	*data++ = left;
+	*data++ = 0;
+
+	*data++ =
+		((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_NORTH | GRAVITY_EAST) << 4) |
+		(0 << 8) | (CLAMP_HORZ << 10) | (YY_MASK);
+
+	*data++ = w_w;
+	*data++ = -top;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = SHRT_MAX;
+	*data++ = top;
+	*data++ = left + w_w;
+	*data++ = 0;
+
+	// BOTTOM CENTER
+	*data++ =
+		((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
+		(0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
+
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = bottom;
+	*data++ = w_w;
+	*data++ = bottom;
+	*data++ = left;
+	*data++ = w_h + top;
+
+	*data++ =
+		((GRAVITY_SOUTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
+		(0 << 8) | (CLAMP_HORZ << 10) | (YY_MASK);
+
+	*data++ = w_w;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = bottom;
+	*data++ = SHRT_MAX;
+	*data++ = bottom;
+	*data++ = left + w_w;
+	*data++ = w_h + top;
+
+	//LEFT
+	*data++ =
+		((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
+		(0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
+
+	*data++ = -left;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = left;
+	*data++ = w_h;
+	*data++ = 0;
+	*data++ = top;
+
+	*data++ =
+		((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
+		((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
+		(0 << 8) | (CLAMP_VERT << 10) | (XX_MASK);
+
+	*data++ = -left;
+	*data++ = w_h;
+	*data++ = 0;
+	*data++ = 0;
+	*data++ = left;
+	*data++ = SHRT_MAX;
+	*data++ = 0;
+	*data++ = top + w_h;
+
+	//RIGHT
     *data++ =
-        ((GRAVITY_NORTH | GRAVITY_WEST) << 0) |
-        ((GRAVITY_SOUTH | GRAVITY_WEST) << 4) |
+        ((GRAVITY_NORTH | GRAVITY_EAST) << 0) |
+        ((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
         (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
 
-    *data++ = -left;
     *data++ = 0;
     *data++ = 0;
+    *data++ = right;
     *data++ = 0;
-    *data++ = left;
+    *data++ = right;
     *data++ = w_h;
-    *data++ = 0;
+    *data++ = w_w + left;
     *data++ = top;
 
-    //RIGHT
-    *data++ =
+	*data++ =
         ((GRAVITY_NORTH | GRAVITY_EAST) << 0) |
         ((GRAVITY_SOUTH | GRAVITY_EAST) << 4) |
-        (0 << 8) | (0 << 10) | (XX_MASK) | (YY_MASK);
+        (0 << 8) | (CLAMP_VERT << 10) | (XX_MASK);
 
     *data++ = 0;
-    *data++ = 0;
+    *data++ = w_h;
     *data++ = right;
     *data++ = 0;
     *data++ = right;
-    *data++ = w_h;
+    *data++ = SHRT_MAX;
     *data++ = w_w + left;
-    *data++ = top;
+    *data++ = top + w_h;
 
     Aquamarine::trapXError ();
     XChangeProperty (qt_xdisplay (), m_wid,
                      my_atom,
                      XA_INTEGER,
                      32, PropModeReplace, (unsigned char *)mdata,
-                     12 + (8 * 9));
+                     12 + (12 * 9));
     Aquamarine::popXError ();
     XSync (qt_xdisplay (), FALSE);
 }