Merge lp:~unity-team/compiz/trunk.fix-xterms into lp:~unity-team/compiz/trunk

[Sam Spilsbury]

Fixes xterms

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-03-27 04:14:46 +0000
+++ src/window.cpp	2011-04-04 12:19:18 +0000
@@ -1632,9 +1632,9 @@
 	return;
 
     x      = ce->x + priv->input.left;
-    y      = ce->y + priv->input.top;
-    width  = ce->width - priv->input.left - priv->input.right;
-    height = ce->height - priv->input.top - priv->input.bottom;
+    y      = ce->y + priv->input.top - priv->serverGeometry.border ();
+    width  = ce->width - priv->serverGeometry.border () * 2 - priv->input.left - priv->input.right;
+    height = ce->height - priv->serverGeometry.border () * 2 - priv->input.top - priv->input.bottom;
 
     if (priv->syncWait)
     {
@@ -2429,10 +2429,10 @@
     {
 	XWindowChanges wc = *xwc;
 
-	wc.x      -= input.left;
-	wc.y      -= input.top;
-	wc.width  += input.left + input.right;
-	wc.height += input.top + input.bottom;
+	wc.x      -= input.left - serverGeometry.border ();
+	wc.y      -= input.top - serverGeometry.border ();
+	wc.width  += input.left + input.right + serverGeometry.border ();
+	wc.height += input.top + input.bottom + serverGeometry.border ();
 
 	XConfigureWindow (screen->dpy (), frame, valueMask, &wc);
 	valueMask &= ~(CWSibling | CWStackMode);

=== modified file 'src/windowgeometry.cpp'
--- src/windowgeometry.cpp	2011-03-14 16:12:45 +0000
+++ src/windowgeometry.cpp	2011-04-04 12:19:18 +0000
@@ -103,19 +103,22 @@
 int
 CompWindow::width () const
 {
-    return priv->width;
+    return priv->width +
+	    priv->geometry.border ()  * 2;
 }
 
 int
 CompWindow::height () const
 {
-    return priv->height;
+    return priv->height +
+	    priv->geometry.border ()  * 2;;
 }
 
 CompSize
 CompWindow::size () const
 {
-    return CompSize (priv->width, priv->height);
+    return CompSize (priv->width + priv->geometry.border ()  * 2,
+		     priv->height + priv->geometry.border ()  * 2);
 }
 
 int
@@ -164,65 +167,65 @@
 CompRect
 CompWindow::borderRect () const
 {
-    return CompRect (priv->geometry.x () - priv->border.left,
-		     priv->geometry.y () - priv->border.top,
-		     priv->geometry.width () +
+    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 +
 		     priv->border.left + priv->border.right,
-		     priv->geometry.height () +
+		     priv->geometry.height () + priv->geometry.border () * 2 +
 		     priv->border.top + priv->border.bottom);
 }
 
 CompRect
 CompWindow::serverBorderRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->border.left,
-		     priv->serverGeometry.y () - priv->border.top,
-		     priv->serverGeometry.width () +
+    return CompRect (priv->serverGeometry.x () - priv->geometry.border () - priv->border.left,
+		     priv->serverGeometry.y () - priv->geometry.border () - priv->border.top,
+		     priv->serverGeometry.width () + priv->geometry.border () * 2 +
 		     priv->border.left + priv->border.right,
-		     priv->serverGeometry.height () +
+		     priv->serverGeometry.height () + priv->geometry.border () * 2 +
 		     priv->border.top + priv->border.bottom);
 }
 
 CompRect
 CompWindow::inputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->input.left,
-		     priv->geometry.y () - priv->input.top,
-		     priv->geometry.width () +
+    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->input.left,
+		     priv->geometry.y () - priv->geometry.border () - priv->input.top,
+		     priv->geometry.width () + priv->geometry.border () * 2 +
 		     priv->input.left + priv->input.right,
-		     priv->geometry.height () +
+		     priv->geometry.height () +priv->geometry.border () * 2 +
 		     priv->input.top + priv->input.bottom);
 }
 
 CompRect
 CompWindow::serverInputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->input.left,
-		     priv->serverGeometry.y () - priv->input.top,
-		     priv->serverGeometry.width () +
+    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () - priv->input.left,
+		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->input.top,
+		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
 		     priv->input.left + priv->input.right,
-		     priv->serverGeometry.height () +
+		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
 		     priv->input.top + priv->input.bottom);
 }
 
 CompRect
 CompWindow::outputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->output.left,
-		     priv->geometry.y () - priv->output.top,
-		     priv->geometry.width () +
+    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 +
 		     priv->output.left + priv->output.right,
-		     priv->geometry.height () +
+		     priv->geometry.height () + priv->serverGeometry.border () * 2 +
 		     priv->output.top + priv->output.bottom);
 }
 
 CompRect
 CompWindow::serverOutputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->output.left,
-		     priv->serverGeometry.y () - priv->output.top,
-		     priv->serverGeometry.width () +
+    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 +
 		     priv->output.left + priv->output.right,
-		     priv->serverGeometry.height () +
+		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
 		     priv->output.top + priv->output.bottom);
 }