Merge lp:~muktupavels/compiz/gtk-frame-extents into lp:compiz/0.9.13

[Alberts Muktupāvels]

[p (pino-silvaggio)]

The patch seems to be working for the most part but when any csd application, i.e.: tilix or nautilus is tiled and you refocus the window, the csd window will change size (select another window and then click on the tiled window).

Unmerged revisions

4115. By Alberts Muktupāvels on 2017-04-29

Merge with lp:compiz.

4114. By Alberts Muktupāvels on 2017-04-20

grid: use client frame to adjust window size and position.

4113. By Alberts Muktupāvels on 2017-04-20

resize: remove client frame from resize rectangle

4112. By Alberts Muktupāvels on 2017-04-20

move: remove client frame from move rectangle.

4111. By Alberts Muktupāvels on 2017-04-20

Fix Constrain Y option with CSD windows in move plugin.

4110. By Alberts Muktupāvels on 2017-04-20

Add _GTK_FRAME_EXTENTS to _NET_SUPPORTED.

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2016-09-07 11:10:35 +0000
+++ plugins/grid/src/grid.cpp	2017-04-29 11:57:47 +0000
@@ -377,10 +377,10 @@
 	    desiredRect = constrainSize (cw, desiredSlot);
 	}
 
-	xwc.x = desiredRect.x ();
-	xwc.y = desiredRect.y ();
-	xwc.width  = desiredRect.width ();
-	xwc.height = desiredRect.height ();
+	xwc.x = desiredRect.x () - cw->clientFrame().left;
+	xwc.y = desiredRect.y () - cw->clientFrame().top;
+	xwc.width  = desiredRect.width () + cw->clientFrame().left + cw->clientFrame().right;
+	xwc.height = desiredRect.height () + cw->clientFrame().top + cw->clientFrame().bottom;
 
 	/* Store a copy of xwc since configureXWindow changes it's values */
 	XWindowChanges wc = xwc;

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2017-04-20 08:03:29 +0000
+++ plugins/move/src/move.cpp	2017-04-29 11:57:47 +0000
@@ -386,6 +386,10 @@
 		    int width	   = wWidth + w->border ().left + w->border ().right;
 		    int height	   = w->border ().top ? w->border ().top : 1;
 
+		    x += w->clientFrame ().left;
+		    y += w->clientFrame ().top;
+		    width -= w->clientFrame ().left + w->clientFrame ().right;
+
 		    int status = XRectInRegion (ms->region, x, y,
 						(unsigned int) width,
 						(unsigned int) height);
@@ -405,7 +409,7 @@
 			    if (xStatus != RectangleIn)
 				dx += (dx < 0) ? 1 : -1;
 
-			    x = wX + dx - w->border ().left;
+			    x = wX + dx - w->border ().left + w->clientFrame ().left;
 			}
 
 			while (dy && status != RectangleIn)
@@ -418,7 +422,7 @@
 			    if (status != RectangleIn)
 				dy += (dy < 0) ? 1 : -1;
 
-			    y = wY + dy - w->border ().top;
+			    y = wY + dy - w->border ().top + w->clientFrame ().top;
 			}
 		    }
 		    else
@@ -820,6 +824,11 @@
     int wY      = w->geometry ().y () - w->border ().top;
     int wWidth  = w->geometry ().widthIncBorders () + w->border ().left + w->border ().right;
     int wHeight = w->geometry ().heightIncBorders () + w->border ().top + w->border ().bottom;
+    
+    wX += w->clientFrame ().left;
+    wY += w->clientFrame ().top;
+    wWidth -= w->clientFrame ().left + w->clientFrame ().right;
+    wHeight -= w->clientFrame ().top + w->clientFrame ().bottom;
 
     pBox->x1 = wX + pos_x;
     pBox->y1 = wY + pos_y;

=== modified file 'plugins/resize/src/logic/include/window-interface.h'
--- plugins/resize/src/logic/include/window-interface.h	2014-03-11 18:35:18 +0000
+++ plugins/resize/src/logic/include/window-interface.h	2017-04-29 11:57:47 +0000
@@ -53,6 +53,7 @@
 	virtual const CompWindow::Geometry & serverGeometry () const = 0;
 	virtual const CompWindowExtents & border () const = 0;
 	virtual const CompWindowExtents & output () const = 0;
+	virtual const CompWindowExtents & clientFrame () const = 0;
 	virtual bool constrainNewWindowSize (int width,
 					     int height,
 					     int *newWidth,

=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2016-03-03 14:22:25 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2017-04-29 11:57:47 +0000
@@ -638,11 +638,17 @@
     pBox->x2 = geometry.x + geometry.width +
 	       w->serverGeometry ().border () * 2 + w->border ().right;
 
+    pBox->x1 += w->clientFrame ().left;
+    pBox->y1 += w->clientFrame ().top;
+    pBox->x2 -= w->clientFrame ().right;
+
     if (w->shaded ())
 	pBox->y2 = geometry.y + w->size ().height () + w->border ().bottom;
     else
 	pBox->y2 = geometry.y + geometry.height +
 		   w->serverGeometry ().border () * 2 + w->border ().bottom;
+
+    pBox->y2 -= w->clientFrame ().bottom;
 }
 
 void

=== modified file 'plugins/resize/src/window-impl.h'
--- plugins/resize/src/window-impl.h	2014-03-11 18:35:18 +0000
+++ plugins/resize/src/window-impl.h	2017-04-29 11:57:47 +0000
@@ -113,6 +113,11 @@
 	    return mImpl->output ();
 	}
 
+	virtual const CompWindowExtents & clientFrame () const
+	{
+	    return mImpl->clientFrame ();
+	}
+
 	virtual bool constrainNewWindowSize (int width,
 					     int height,
 					     int *newWidth,

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2016-07-28 13:43:06 +0000
+++ src/screen.cpp	2017-04-29 11:57:47 +0000
@@ -2436,6 +2436,7 @@
 
     atoms.push_back (Atoms::wmUserTime);
     atoms.push_back (Atoms::frameExtents);
+    atoms.push_back (Atoms::frameGtkExtents);
     atoms.push_back (Atoms::frameWindow);
 
     atoms.push_back (Atoms::winState);