Merge lp:~3v1n0/compiz/decor-size-adjustments-disable into lp:compiz/0.9.11

[Marco Trevisan (Treviño)]

Window: disable the size adjustments when decorating/undecorating windows.

Don't apply any size adjustment after setting/unsetting the decoration extents
as they seem to cause more troubles than gains.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3814
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

LGTM. Better to revert this since it causes too many headaches.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-autolanding/21/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-autolanding/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-autolanding/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-autolanding/21/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3861

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

So it seems something (not this MP most likely) has broken the build:

The following tests FAILED:
 1064 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestSetValueOnWrapper (SEGFAULT)
 1065 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetValueOnWrapper (SEGFAULT)
 1066 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestResetKeyOnWrapper (SEGFAULT)
 1067 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestListKeysOnWrapper (SEGFAULT)
 1068 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetSchemaName (SEGFAULT)
 1069 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetPath (SEGFAULT)
 1070 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestConnectToChangedSignal (SEGFAULT)
 1074 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorTest.TestWrapperConstructionWithPath (SEGFAULT)
 1075 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorTest.TestGetGSettingsWrapper (SEGFAULT)

[Sam Spilsbury (smspillaz)]

The problem there is that there's a gsettings path which is invalid -
have a look in the logs for where it should be fixed (easily done).

Note: When testing this fix, please also make sure that guake still
works (that's the application I fixed by putting this one in in the
first place).

On Mon, Jan 13, 2014 at 6:22 PM, Christopher Townsend
<email address hidden> wrote:
> So it seems something (not this MP most likely) has broken the build:
>
> The following tests FAILED:
> 1064 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestSetValueOnWrapper (SEGFAULT)
> 1065 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetValueOnWrapper (SEGFAULT)
> 1066 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestResetKeyOnWrapper (SEGFAULT)
> 1067 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestListKeysOnWrapper (SEGFAULT)
> 1068 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetSchemaName (SEGFAULT)
> 1069 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestGetPath (SEGFAULT)
> 1070 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorAutoInitTest.TestConnectToChangedSignal (SEGFAULT)
> 1074 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorTest.TestWrapperConstructionWithPath (SEGFAULT)
> 1075 - CCSGSettingsWrapperWithMemoryBackendEnvGoodAllocatorTest.TestGetGSettingsWrapper (SEGFAULT)
> --
> https://code.launchpad.net/~3v1n0/compiz/decor-size-adjustments-disable/+merge/201435
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

[Marco Trevisan (Treviño) (3v1n0)]

> Note: When testing this fix, please also make sure that guake still
> works (that's the application I fixed by putting this one in in the
> first place).

Thanks for pointing it out, but it seems that guake is working properly now.

[Sam Spilsbury (smspillaz)]

Awesome, we can drop this hack then :)

On Mon, Jan 13, 2014 at 9:36 PM, Marco Trevisan (Treviño)
<[e-mail]> wrote:
>> Note: When testing this fix, please also make sure that guake still
>> works (that's the application I fixed by putting this one in in the
>> first place).
>
> Thanks for pointing it out, but it seems that guake is working properly now.
> --
> https://code.launchpad.net/~3v1n0/compiz/decor-size-adjustments-disable/+merge/201435
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2013-07-19 04:15:01 +0000
+++ src/privatewindow.h	2014-01-13 15:53:23 +0000
@@ -401,7 +401,6 @@
 	bool shaded;
 	bool hidden;
 	bool grabbed;
-	bool alreadyDecorated;
 
 	unsigned int desktop;
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2013-10-30 20:31:20 +0000
+++ src/window.cpp	2014-01-13 15:53:23 +0000
@@ -6341,7 +6341,6 @@
     shaded (false),
     hidden (false),
     grabbed (false),
-    alreadyDecorated (false),
 
     desktop (0),
 
@@ -6586,20 +6585,6 @@
 	    compiz::window::extents::shift (priv->border,
 					    priv->sizeHints.win_gravity);
 
-	CompSize sizeDelta;
-
-	/* We don't want to change the size of the window the first time we
-	 * decorate it, but we do thereafter */
-	if (priv->alreadyDecorated)
-	{
-	    sizeDelta.setWidth (-((b->left + b->right) -
-				  (priv->border.left + priv->border.right)));
-	    sizeDelta.setHeight (-((b->top + b->bottom) -
-				   (priv->border.top + priv->border.bottom)));
-	}
-	else
-	    priv->alreadyDecorated = true;
-
 	priv->serverInput = *i;
 	priv->border      = *b;
 
@@ -6608,8 +6593,8 @@
 
 	xwc.x = movement.x () + priv->serverGeometry.x ();
 	xwc.y = movement.y () + priv->serverGeometry.y ();
-	xwc.width = sizeDelta.width () + priv->serverGeometry.width ();
-	xwc.height = sizeDelta.height () + priv->serverGeometry.height ();
+	xwc.width = priv->serverGeometry.width ();
+	xwc.height = priv->serverGeometry.height ();
 
 	configureXWindow (CWX | CWY | CWWidth | CWHeight, &xwc);