Merge lp:~townsend/compiz/fix-unfocused-scrolling into lp:compiz/0.9.12

[Christopher Townsend]

Add more button ungrab keymasks, so unfocused Gtk window scrolling will work when NumLock is off and CapsLock is on and any combination thereof.

Add more button ungrab keymasks, so unfocused Gtk window scrolling will work when NumLock is off and CapsLock is on and any combination thereof.

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

That's exactly how I would have done it! ;-)
+1

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-06-06 09:42:26 +0000
+++ src/window.cpp	2014-06-19 13:31:17 +0000
@@ -5652,7 +5652,12 @@
 	{
 	    /* Ungrab Buttons 4 & 5 for vertical scrolling if the window is not the desktop window */
 	    for (int i = Button4; i <= Button5; ++i)
+	    {
+		XUngrabButton (screen->dpy (), i, 0, frame);
+		XUngrabButton (screen->dpy (), i, LockMask, frame);
 		XUngrabButton (screen->dpy (), i, Mod2Mask, frame);
+		XUngrabButton (screen->dpy (), i, LockMask | Mod2Mask, frame);
+	    }
 	}
     }
 }