Merge lp:~smspillaz/compiz-core/compiz-core.width-height-for-border into lp:compiz-core

[Sam Spilsbury]

Adds widthIncBorders heightIncBorders etc to window::Geometry as suggested by alan at https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/100543/comments/216930

[Daniel van Vugt (vanvugt)]

I think it would make sense to merge this branch into its prerequisite, perhaps.

[Alan Griffiths (alan-griffiths)]

> I think it would make sense to merge this branch into its prerequisite,
> perhaps.

+1

Unmerged revisions

2996. By Sam Spilsbury on 2012-04-04

Removed a lot of width () / height () + border () * 2 sillyness, replace with
more sturdy abstraction

2995. By Sam Spilsbury on 2012-04-03

Merge trunk

2994. By Sam Spilsbury on 2012-02-29

Use reference

2993. By Sam Spilsbury on 2012-02-28

Merge lp:compiz-core

2992. By Sam Spilsbury on 2012-02-28

Fix silly typo

2991. By Sam Spilsbury on 2012-02-28

Cleanup, fix removal of XSynchronize and detect error conditions

2990. By Sam Spilsbury on 2012-02-25

Also send moveNotify for override redirect windows

2989. By Sam Spilsbury on 2012-02-25

Added a note for a fixme

2988. By Sam Spilsbury on 2012-02-25

Also adjust the client position inside the frame whenever the frame value mask
indicates that it might have moved.

2987. By Sam Spilsbury on 2012-02-25

Update PrivateWindow::isInvisible

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-04 05:26:23 +0000
+++ plugins/decor/src/decor.cpp	2012-04-04 05:26:23 +0000
@@ -1714,7 +1714,6 @@
     XRectangle           rects[4];
     int                  x, y, width, height;
     CompWindow::Geometry server = window->serverGeometry ();
-    int                  bw = server.border () * 2;
     CompWindowExtents	 input;
     CompWindowExtents    border;
     Window		 parent;
@@ -1741,8 +1740,8 @@
 
     x      = window->border ().left - border.left;
     y      = window->border ().top - border.top;
-    width  = server.width () + input.left + input.right + bw;
-    height = server.height ()+ input.top  + input.bottom + bw;
+    width  = server.widthIncBorders () + input.left + input.right;
+    height = server.heightIncBorders ()+ input.top  + input.bottom ;
 
     /* Non switcher windows are rooted relative to the frame window of the client
      * and switchers need to be offset by the window geometry of the client */
@@ -1881,7 +1880,6 @@
     XRectangle           rects[4];
     int                  x, y, width, height;
     CompWindow::Geometry server = window->serverGeometry ();
-    int                  bw = server.border () * 2;
     CompWindowExtents	 input;
 
     /* Determine frame extents */
@@ -1892,8 +1890,8 @@
 
     x      = window->input ().left - input.left;
     y      = window->input ().top - input.top;
-    width  = server.width () + input.left + input.right + bw;
-    height = server.height ()+ input.top  + input.bottom + bw;
+    width  = server.widthIncBorders () + input.left + input.right;
+    height = server.heightIncBorders ()+ input.top  + input.bottom;
 
     if (window->shaded ())
 	height = input.top + input.bottom;
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-04-04 05:26:23 +0000
+++ plugins/move/src/move.cpp	2012-04-04 05:26:23 +0000
@@ -316,10 +316,8 @@
 
 	wX      = w->serverGeometry ().x ();
 	wY      = w->serverGeometry ().y ();
-	wWidth  = w->serverGeometry ().width () +
-		  w->serverGeometry ().border () * 2;
-	wHeight = w->serverGeometry ().height () +
-		  w->serverGeometry ().border () * 2;
+	wWidth  = w->serverGeometry ().widthIncBorders ();
+	wHeight = w->serverGeometry ().heightIncBorders ();
 
 	ms->x += xRoot - lastPointerX;
 	ms->y += yRoot - lastPointerY;
 
=== modified file 'plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2012-01-20 06:13:07 +0000
+++ plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2012-04-04 05:26:23 +0000
@@ -61,13 +61,11 @@
     }
 
     left   = x - border.left;
-    right  = left + g.width () +  (border.left +
-				   border.right +
-				   2 * g.border ());
+    right  = left + g.widthIncBorders () +  (border.left +
+					     border.right);
     top    = y - border.top;
-    bottom = top + g.height () + (border.top +
-				  border.bottom +
-				  2 * g.border ());
+    bottom = top + g.heightIncBorders () + (border.top +
+					    border.bottom);
 
     if ((right - left) > workArea.width ())
     {
 
=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-02-02 17:01:15 +0000
+++ plugins/place/src/place.cpp	2012-04-04 05:26:23 +0000
@@ -343,37 +343,36 @@
     CompWindow::Geometry geom;
     int      output;
 
+    geom.set (xwc->x, xwc->y, xwc->width, xwc->height,
+	      window->serverGeometry ().border ());
+
     if (clampToViewport)
     {
 	/* left, right, top, bottom target coordinates, clamed to viewport
 	 * sizes as we don't need to validate movements to other viewports;
 	 * we are only interested in inner-viewport movements */
 
-	x = xwc->x % screen->width ();
-	if ((x + xwc->width) < 0)
+	x = geom.x () % screen->width ();
+	if ((geom.x2 ()) < 0)
 	    x += screen->width ();
 
-	y = xwc->y % screen->height ();
-	if ((y + xwc->height) < 0)
+	y = geom.y () % screen->height ();
+	if ((geom.y2 ()) < 0)
 	    y += screen->height ();
     }
     else
     {
-	x = xwc->x;
-	y = xwc->y;
+	x = geom.x ();
+	y = geom.y ();
     }
 
     left   = x - window->border ().left;
-    right  = left + xwc->width +  (window->border ().left +
-				   window->border ().right +
-				   2 * window->serverGeometry ().border ());
+    right  = left + geom.widthIncBorders () +  (window->border ().left +
+						window->border ().right);
     top    = y - window->border ().top;
-    bottom = top + xwc->height + (window->border ().top +
-				  window->border ().bottom +
-				  2 * window->serverGeometry ().border ());
+    bottom = top + geom.heightIncBorders () + (window->border ().top +
+					       window->border ().bottom);
 
-    geom.set (xwc->x, xwc->y, xwc->width, xwc->height,
-	      window->serverGeometry ().border ());
     output   = screen->outputDeviceForGeometry (geom);
     workArea = screen->getWorkareaForOutput (output);
 
@@ -746,10 +745,8 @@
 {
     if (PlaceScreen::get (screen)->getPointerPosition (pos))
     {
-	unsigned int dx = (window->serverGeometry ().width () / 2) -
-			   window->serverGeometry ().border ();
-	unsigned int dy = (window->serverGeometry ().height () / 2) -
-			   window->serverGeometry ().border ();
+	unsigned int dx = (window->serverGeometry ().widthIncBorders () / 2);
+	unsigned int dy = (window->serverGeometry ().heightIncBorders () / 2);
 	pos -= CompPoint (dx, dy);
     }
     else
@@ -1200,14 +1197,12 @@
 
     extents.left   = pos.x () - window->border ().left;
     extents.top    = pos.y () - window->border ().top;
-    extents.right  = extents.left + window->serverWidth () +
+    extents.right  = extents.left + window->serverGeometry ().heightIncBorders () +
 		     (window->border ().left +
-		      window->border ().right +
-		      2 * window->serverGeometry ().border ());
-    extents.bottom = extents.top + window->serverHeight () +
+		      window->border ().right);
+    extents.bottom = extents.top + window->serverGeometry ().widthIncBorders () +
 		     (window->border ().top +
-		      window->border ().bottom +
-		      2 * window->serverGeometry ().border ());
+		      window->border ().bottom);
 
     delta = workArea.right () - extents.right;
     if (delta < 0)
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-04-04 05:26:23 +0000
+++ src/screen.cpp	2012-04-04 05:26:23 +0000
@@ -4060,8 +4060,8 @@
     CompRect rect (gm);
     int      offset;
 
-    rect.setWidth  (rect.width () + (gm.border () * 2));
-    rect.setHeight (rect.height () + (gm.border () * 2));
+    rect.setWidth  (gm.widthIncBorders ());
+    rect.setHeight (gm.heightIncBorders ());
 
     offset = rect.centerX () < 0 ? -1 : 0;
     viewport.setX (priv->vp.x () + ((rect.centerX () / width ()) + offset) %
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2012-04-04 05:26:23 +0000
+++ src/window.cpp	2012-04-04 05:26:23 +0000
@@ -918,8 +918,8 @@
 
     r.x      = -priv->serverGeometry.border ();
     r.y      = -priv->serverGeometry.border ();
-    r.width  = priv->serverGeometry.width () + priv->serverGeometry.border ();
-    r.height = priv->serverGeometry.height () + priv->serverGeometry.border ();
+    r.width  = priv->serverGeometry.widthIncBorders ();
+    r.height = priv->serverGeometry.heightIncBorders ();
 
     if (nBounding < 1)
     {
@@ -1854,9 +1854,9 @@
      * windows since we didn't resize them
      * on configureXWindow */
     if (priv->shaded)
-	height = priv->serverGeometry.height () - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+	height = priv->serverGeometry.heightIncBorders () - priv->serverInput.top - priv->serverInput.bottom;
     else
-	height = ce->height - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+	height = ce->height + priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
 
     /* set the frame geometry */
     priv->frameGeometry.set (ce->x, ce->y, ce->width, ce->height, ce->border_width);
@@ -4308,8 +4308,8 @@
 PrivateWindow::ensureWindowVisibility ()
 {
     int x1, y1, x2, y2;
-    int	width = serverGeometry.width () + serverGeometry.border () * 2;
-    int	height = serverGeometry.height () + serverGeometry.border () * 2;
+    int	width = serverGeometry.widthIncBorders ();
+    int	height = serverGeometry.heightIncBorders ();
     int dx = 0;
     int dy = 0;
 
@@ -6819,10 +6819,10 @@
 	/* Wait for the reparent to finish */
 	XSync (dpy, false);
 
-	xwc.x = serverGeometry.x () - serverGeometry.border ();
-	xwc.y = serverGeometry.y () - serverGeometry.border ();
-	xwc.width = serverGeometry.width () + serverGeometry.border () * 2;
-	xwc.height = serverGeometry.height () + serverGeometry.border () * 2;
+	xwc.x = serverGeometry.xMinusBorder ();
+	xwc.y = serverGeometry.yMinusBorder ();
+	xwc.width = serverGeometry.widthIncBorders ();
+	xwc.height = serverGeometry.heightIncBorders ();
 
 	XConfigureWindow (dpy, serverFrame, CWX | CWY | CWWidth | CWHeight, &xwc);
 
 
=== modified file 'src/window/geometry/include/core/windowgeometry.h'
--- src/window/geometry/include/core/windowgeometry.h	2012-01-19 20:08:32 +0000
+++ src/window/geometry/include/core/windowgeometry.h	2012-04-04 05:26:23 +0000
@@ -64,6 +64,12 @@
     compiz::window::Geometry  change (const compiz::window::Geometry &g, unsigned int mask) const;
     void		      applyChange (const compiz::window::Geometry &g, unsigned int mask);
 
+    int xMinusBorder () const { return x () - mBorder; }
+    int yMinusBorder () const { return y () - mBorder; }
+
+    unsigned int widthIncBorders () const { return width () + mBorder * 2; }
+    unsigned int heightIncBorders () const { return height () + mBorder * 2; }
+
 private:
     int mBorder;
 };
 
=== modified file 'src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp'
--- src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-03-30 16:30:13 +0000
+++ src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-04-04 05:26:23 +0000
@@ -87,3 +87,13 @@
     EXPECT_EQ (rg, compiz::window::Geometry (49, 99, 199, 299, 5));
     EXPECT_EQ (mask, CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT);
 }
+
+TEST_F(CompWindowGeometryTestGeometry, TestBorders)
+{
+    compiz::window::Geometry g (1, 1, 1, 1, 1);
+
+    EXPECT_EQ (g.xMinusBorder (), 0);
+    EXPECT_EQ (g.yMinusBorder (), 0);
+    EXPECT_EQ (g.widthIncBorders (), 3);
+    EXPECT_EQ (g.heightIncBorders (), 3);
+}
 
=== modified file 'src/windowgeometry.cpp'
--- src/windowgeometry.cpp	2012-04-04 05:26:23 +0000
+++ src/windowgeometry.cpp	2012-04-04 05:26:23 +0000
@@ -102,42 +102,38 @@
 int
 CompWindow::serverWidth () const
 {
-    return priv->serverGeometry.width () +
-	   2 * priv->serverGeometry.border ();
+    return priv->serverGeometry.widthIncBorders ();
 }
 
 int
 CompWindow::serverHeight () const
 {
-    return priv->serverGeometry.height () +
-	   2 * priv->serverGeometry.border ();
+    return priv->serverGeometry.heightIncBorders ();
 }
 
 const CompSize
 CompWindow::serverSize () const
 {
-    return CompSize (priv->serverGeometry.width () +
-		     2 * priv->serverGeometry.border (),
-		     priv->serverGeometry.height () +
-		     2 * priv->serverGeometry.border ());
+    return CompSize (priv->serverGeometry.widthIncBorders (),
+		     priv->serverGeometry.heightIncBorders ());
 }
 
 CompRect
 CompWindow::borderRect () const
 {
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->border.top,
-		     priv->geometry.width () + priv->geometry.border () * 2 +
+    return CompRect (priv->geometry.xMinusBorder () - priv->border.left,
+		     priv->geometry.yMinusBorder () - priv->border.top,
+		     priv->geometry.widthIncBorders () +
 		     priv->border.left + priv->border.right,
-		     priv->geometry.height () + priv->geometry.border () * 2 +
+		     priv->geometry.heightIncBorders () +
 		     priv->border.top + priv->border.bottom);
 }
 
 CompRect
 CompWindow::serverBorderRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->serverGeometry.y () - priv->geometry.border () - priv->border.top,
+    return CompRect (priv->serverGeometry.xMinusBorder () - priv->border.left,
+		     priv->serverGeometry.yMinusBorder () - priv->border.top,
 		     priv->serverGeometry.width () + priv->geometry.border () * 2 +
 		     priv->border.left + priv->border.right,
 		     priv->serverGeometry.height () + priv->geometry.border () * 2 +
@@ -147,8 +143,8 @@
 CompRect
 CompWindow::inputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->serverInput.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->serverInput.top,
+    return CompRect (priv->geometry.xMinusBorder () - priv->serverInput.left,
+		     priv->geometry.yMinusBorder () - priv->serverInput.top,
 		     priv->geometry.width () + priv->geometry.border () * 2 +
 		     priv->serverInput.left + priv->serverInput.right,
 		     priv->geometry.height () +priv->geometry.border () * 2 +
@@ -158,32 +154,32 @@
 CompRect
 CompWindow::serverInputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () - priv->serverInput.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->serverInput.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->serverGeometry.xMinusBorder () - priv->serverInput.left,
+		     priv->serverGeometry.yMinusBorder () - priv->serverInput.top,
+		     priv->serverGeometry.widthIncBorders () +
 		     priv->serverInput.left + priv->serverInput.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->serverGeometry.heightIncBorders () +
 		     priv->serverInput.top + priv->serverInput.bottom);
 }
 
 CompRect
 CompWindow::outputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->serverGeometry.border ()- priv->output.left,
-		     priv->geometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->geometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->geometry.xMinusBorder ()- priv->output.left,
+		     priv->geometry.yMinusBorder () - priv->output.top,
+		     priv->geometry.widthIncBorders () +
 		     priv->output.left + priv->output.right,
-		     priv->geometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->geometry.heightIncBorders () +
 		     priv->output.top + priv->output.bottom);
 }
 
 CompRect
 CompWindow::serverOutputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () -  priv->output.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->serverGeometry.xMinusBorder () -  priv->output.left,
+		     priv->serverGeometry.yMinusBorder () - priv->output.top,
+		     priv->serverGeometry.widthIncBorders () +
 		     priv->output.left + priv->output.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->serverGeometry.heightIncBorders () +
 		     priv->output.top + priv->output.bottom);
 }