Merge lp:~townsend/compiz/fix-lp1303068 into lp:compiz/0.9.11

[Christopher Townsend]

Fix recent regression where the desktop window would not get focus when clicking the desktop.

Fix recent regression where the desktop window would not get focus when clicking the desktop.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3850
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/54

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

review: Approve (continuous-integration)

[lp:~townsend/compiz/fix-lp1303068]

3851. By Christopher Townsend on 2014-04-07

Fix tab/space formatting.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3851
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/55

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

review: Approve (continuous-integration)

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-04-02 21:26:37 +0000
+++ src/window.cpp	2014-04-07 16:18:48 +0000
@@ -5620,14 +5620,15 @@
 	}
     }
 
-    if (onlyActions || priv->type & CompWindowTypeDesktopMask)
+    if (onlyActions)
 	screen->updatePassiveButtonGrabs(serverFrame);
     else
     {
-	/* Only grab buttons 1-3 */
-	for (int i = 1; i <= 3; i++)
+	if (priv->type & CompWindowTypeDesktopMask)
+	{
+	    /* Grab all buttons for the desktop window */
 	    XGrabButton (screen->dpy (),
-			 i,
+			 AnyButton,
 			 AnyModifier,
 			 serverFrame, false,
 			 ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
@@ -5635,6 +5636,21 @@
 			 GrabModeAsync,
 			 None,
 			 None);
+	}
+	else
+	{
+	    /* Only grab buttons 1-3 */
+	    for (int i = 1; i <= 3; i++)
+		XGrabButton (screen->dpy (),
+			     i,
+			     AnyModifier,
+			     serverFrame, false,
+			     ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
+			     GrabModeSync,
+			     GrabModeAsync,
+			     None,
+			     None);
+	}
     }
 }