Merge lp:~smspillaz/compiz-core/compiz-core.maximization into lp:compiz-core/0.9.5

[Sam Spilsbury]

Tries to work around some of the problems in maximizing windows which must be larger than the available screen size.

The old behaviour was to try and position these windows so that they were never offscreen. That resulted in jumping windows. The new behaviour is to now remove CompWindowActionMaximize*Mask from wmActions if it is not possible to sanely maximize that window (for example, the output is too small). However, if there is another monitor that could accomadate the application specified window size then we will maximize to the closest possible monitor that can do that.

[Tim Penhey (thumper)]

On Sat, 16 Jul 2011 09:29:53 you wrote:
> Sam Spilsbury has proposed merging
> lp:~smspillaz/compiz-core/compiz-core.maximization into lp:compiz-core.

         int distance = 999999;

Please use std::numeric_limits<int>::max rather than the rather mystic
999999.

[Sam Spilsbury (smspillaz)]

On Mon, Jul 18, 2011 at 9:16 AM, Tim Penhey <email address hidden> wrote:
> On Sat, 16 Jul 2011 09:29:53 you wrote:
>> Sam Spilsbury has proposed merging
>> lp:~smspillaz/compiz-core/compiz-core.maximization into lp:compiz-core.
>
>         int        distance = 999999;
>
> Please use  std::numeric_limits<int>::max  rather than the rather mystic
> 999999.

Ah, didn't know that existed. Was looking for something to replace MAXINT

>
> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.maximization/+merge/68135
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.maximization.
>

--
Sam Spilsbury

[lp:~smspillaz/compiz-core/compiz-core.maximization]

2780. By Sam Spilsbury on 2011-07-18

Use std::numeric_limits <int>::max () rather than a constant

[Marco Biscaro (marcobiscaro2112)]

Sam, there is another 999999 (now, in height verification). I think it should be replaced to std::numeric_limits <int>::max (), right?

[Sam Spilsbury (smspillaz)]

Yes

On Tue, Jul 19, 2011 at 9:38 PM, Marco Biscaro
<email address hidden> wrote:
> Sam, there is another 999999 (now, in height verification). I think it should be replaced to std::numeric_limits <int>::max (), right?
> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.maximization/+merge/68135
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.maximization.
>

--
Sam Spilsbury

[Neil J. Patel (njpatel)]

Sam, please update the 999999 to what Tim suggests before merge, but apart from that it looks good.

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-06-24 14:43:00 +0000
+++ src/window.cpp	2011-07-18 06:31:20 +0000
@@ -623,6 +623,32 @@
 		     CompWindowActionMaximizeVertMask |
 		     CompWindowActionFullscreenMask);
 
+    /* Don't allow maximization or fullscreen
+     * of windows which are too big to fit
+     * the screen */
+    bool foundVert = false;
+    bool foundHorz = false;
+
+    foreach (CompOutput &o, screen->outputDevs ())
+    {
+	if (o.width () > (priv->sizeHints.min_width + priv->border.left + priv->border.right))
+	    foundHorz = true;
+	if (o.height () > (priv->sizeHints.min_height + priv->border.top + priv->border.bottom))
+	    foundVert = true;
+    }
+
+    if (!foundHorz)
+    {
+	actions &= ~(CompWindowActionMaximizeHorzMask |
+		     CompWindowActionFullscreenMask);
+    }
+
+    if (!foundVert)
+    {
+	actions &= ~(CompWindowActionMaximizeVertMask |
+		     CompWindowActionFullscreenMask);
+    }
+
     if (!(priv->mwmFunc & MwmFuncAll))
     {
 	if (!(priv->mwmFunc & MwmFuncResize))
@@ -2764,7 +2790,7 @@
     CompRect  workArea;
     int	      mask = 0;
     int	      x, y;
-    int	      output;
+    CompOutput *output;
     CompPoint viewport;
 
     screen->viewportForGeometry (old, viewport);
@@ -2772,8 +2798,80 @@
     x = (viewport.x () - screen->vp ().x ()) * screen->width ();
     y = (viewport.y () - screen->vp ().y ()) * screen->height ();
 
-    output   = screen->outputDeviceForGeometry (old);
-    workArea = screen->getWorkareaForOutput (output);
+    /* Try to select and output device that the window is on first
+     * and make sure if we are fullscreening or maximizing that the
+     * window is actually able to fit on this output ... otherwise
+     * we're going to have to use another output device which sucks
+     * but at least the user will be able to see all of the window */
+    output   = &screen->outputDevs ().at (screen->outputDeviceForGeometry (old));
+
+    if (state & CompWindowStateFullscreenMask ||
+	state & CompWindowStateMaximizedHorzMask)
+    {
+	int width = (mask & CWWidth) ? xwc->width : old.width ();
+	int height = (mask & CWHeight) ? xwc->height : old.height ();
+
+	window->constrainNewWindowSize (width, height, &width, &height);
+
+	if (width > output->width ())
+	{
+	    int        distance = std::numeric_limits <int>::max ();
+	    CompOutput *selected = output;
+	    /* That's no good ... try and find the closest output device to this one
+	     * which has a large enough size */
+	    foreach (CompOutput &o, screen->outputDevs ())
+	    {
+		if (o.workArea ().width () > width)
+		{
+		    int tDistance = sqrt (pow (abs (o.x () - output->x ()), 2) +
+					  pow (abs (o.y () - output->y ()), 2));
+
+		    if (tDistance < distance)
+		    {
+			selected = &o;
+			tDistance = distance;
+		    }
+		}
+	    }
+
+	    output = selected;
+	}
+    }
+
+    if (state & CompWindowStateFullscreenMask ||
+	state & CompWindowStateMaximizedVertMask)
+    {
+	int width = (mask & CWWidth) ? xwc->width : old.width ();
+	int height = (mask & CWHeight) ? xwc->height : old.height ();
+
+	window->constrainNewWindowSize (width, height, &width, &height);
+
+	if (height > output->height ())
+	{
+	    int        distance = 999999;
+	    CompOutput *selected = output;
+	    /* That's no good ... try and find the closest output device to this one
+	     * which has a large enough size */
+	    foreach (CompOutput &o, screen->outputDevs ())
+	    {
+		if (o.workArea ().height () > height)
+		{
+		    int tDistance = sqrt (pow (abs (o.x () - output->x ()), 2) +
+					  pow (abs (o.y () - output->y ()), 2));
+
+		    if (tDistance < distance)
+		    {
+			selected = &o;
+			tDistance = distance;
+		    }
+		}
+	    }
+
+	    output = selected;
+	}
+    }
+
+    workArea = output->workArea ();
 
     if (type & CompWindowTypeFullscreenMask)
     {
@@ -2788,10 +2886,10 @@
 	}
 	else
 	{
-	    xwc->x      = x + screen->outputDevs ()[output].x ();
-	    xwc->y      = y + screen->outputDevs ()[output].y ();
-	    xwc->width  = screen->outputDevs ()[output].width ();
-	    xwc->height = screen->outputDevs ()[output].height ();
+	    xwc->x      = x + output->x ();
+	    xwc->y      = y + output->y ();
+	    xwc->width  = output->width ();
+	    xwc->height = output->height ();
 	}
 
 	xwc->border_width = 0;
@@ -2801,7 +2899,6 @@
     else
     {
 	mask |= restoreGeometry (xwc, CWBorderWidth);
-
 	if (state & CompWindowStateMaximizedVertMask)
 	{
 	    saveGeometry (CWY | CWHeight);
@@ -2888,55 +2985,83 @@
 
 	    if (state & CompWindowStateMaximizedVertMask)
 	    {
-		if (old.y () < y + workArea.y () + input.top)
-		{
-		    xwc->y = y + workArea.y () + input.top;
-		    mask |= CWY;
-		}
-		else
-		{
-		    height = xwc->height + old.border () * 2;
-
-		    max = y + workArea.bottom ();
-		    if (old.y () + (int) old.height () + input.bottom > max)
-		    {
-			xwc->y = max - height - input.bottom;
-			mask |= CWY;
-		    }
-		    else if (old.y () + height + input.bottom > max)
-		    {
-			xwc->y = y + workArea.y () +
-			         (workArea.height () - input.top - height -
-				  input.bottom) / 2 + input.top;
-			mask |= CWY;
-		    }
+		/* If the window is still offscreen, then we need to constrain it
+		 * by the gravity value (so that the corner that the gravity specifies
+		 * is 'anchored' to that edge of the workarea) */
+
+		xwc->y = y + workArea.y () + input.top;
+		mask |= CWY;
+
+		switch (priv->sizeHints.win_gravity)
+		{
+		    case SouthWestGravity:
+		    case SouthEastGravity:
+		    case SouthGravity:
+			/* Shift the window so that the bottom meets the top of the bottom */
+			height = xwc->height + old.border () * 2;
+
+			max = y + workArea.bottom ();
+			if (xwc->y + xwc->height + input.bottom > max)
+			{
+			    xwc->y = max - height - input.bottom;
+			    mask |= CWY;
+			}
+			break;
+		    /* For EastGravity, WestGravity and CenterGravity we default to the top
+		     * of the window since the user should at least be able to close it
+		     * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
+		     * that indicates that the application has requested positioning in that area
+		     */
+		    case EastGravity:
+		    case WestGravity:
+		    case CenterGravity:
+		    case NorthWestGravity:
+		    case NorthEastGravity:
+		    case NorthGravity:
+		    default:
+			/* Shift the window so that the top meets the top of the screen */
+			break;
 		}
 	    }
 
 	    if (state & CompWindowStateMaximizedHorzMask)
 	    {
-		if (old.x () < x + workArea.x () + input.left)
-		{
-		    xwc->x = x + workArea.x () + input.left;
-		    mask |= CWX;
-		}
-		else
-		{
-		    width = xwc->width + old.border () * 2;
-
-		    max = x + workArea.right ();
-		    if (old.x () + (int) old.width () + input.right > max)
-		    {
-			xwc->x = max - width - input.right;
-			mask |= CWX;
-		    }
-		    else if (old.x () + width + input.right > max)
-		    {
-			xwc->x = x + workArea.x () +
-			         (workArea.width () - input.left - width -
-				  input.right) / 2 + input.left;
-			mask |= CWX;
-		    }
+		xwc->x = x + workArea.x () + input.left;
+		mask |= CWX;
+
+		switch (priv->sizeHints.win_gravity)
+		{
+		    case NorthEastGravity:
+		    case SouthEastGravity:
+		    case EastGravity:
+			width = xwc->width + old.border () * 2;
+
+			max = x + workArea.right ();
+			if (old.x () + (int) old.width () + input.right > max)
+			{
+			    xwc->x = max - width - input.right;
+			    mask |= CWX;
+			}
+			else if (old.x () + width + input.right > max)
+			{
+			    xwc->x = x + workArea.x () +
+				     (workArea.width () - input.left - width -
+				      input.right) / 2 + input.left;
+			    mask |= CWX;
+			}
+		    /* For NorthGravity, SouthGravity and CenterGravity we default to the top
+		     * of the window since the user should at least be able to close it
+		     * (but not for SouthGravity, SouthWestGravity and SouthEastGravity since
+		     * that indicates that the application has requested positioning in that area
+		     */
+		    case NorthGravity:
+		    case SouthGravity:
+		    case CenterGravity:
+		    case NorthWestGravity:
+		    case SouthWestGravity:
+		    case WestGravity:
+		    default:
+			break;
 		}
 	    }
 	}