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

[Christopher Townsend]

Allow binding of other buttons greater than button 7 for windows other than the desktop.

Allow binding of other buttons greater than button 7 for windows other than the desktop.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

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

3854. By Christopher Townsend on 2014-04-09

Fix Compiz tab/indentation.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2014-04-02 21:45:25 +0000
+++ src/screen.cpp	2014-04-09 15:53:23 +0000
@@ -3438,9 +3438,12 @@
 	    if (ignore & ~modHandler->ignoredModMask ())
 		continue;
 
+	    /* Do not allow binding of the scroll wheel for windows other than the desktop
+	     * unless there is a modifier defined */
 	    if (window &&
 		!(window->type () & CompWindowTypeDesktopMask) &&
 		bind.button > 3 &&
+		bind.button < 8 &&
 		!mods)
 		continue;
 
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2014-04-07 16:18:09 +0000
+++ src/window.cpp	2014-04-09 15:53:23 +0000
@@ -5624,32 +5624,22 @@
 	screen->updatePassiveButtonGrabs(serverFrame);
     else
     {
-	if (priv->type & CompWindowTypeDesktopMask)
-	{
-	    /* Grab all buttons for the desktop window */
-	    XGrabButton (screen->dpy (),
-			 AnyButton,
-			 AnyModifier,
-			 serverFrame, false,
-			 ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
-			 GrabModeSync,
-			 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);
+	/* Grab all buttons */
+	XGrabButton (screen->dpy (),
+		     AnyButton,
+		     AnyModifier,
+		     serverFrame, false,
+		     ButtonPressMask | ButtonReleaseMask | ButtonMotionMask,
+		     GrabModeSync,
+		     GrabModeAsync,
+		     None,
+		     None);
+
+	if (!(priv->type & CompWindowTypeDesktopMask))
+	{
+	    /* Ungrab Buttons 4-7 for scrolling if the window is not the desktop window */
+	    for (int i = 4; i <= 7; i++)
+		XUngrabButton (screen->dpy (), i, AnyModifier, frame);
 	}
     }
 }