Merge lp:~brandontschaefer/compiz/lp.1075207-fix-ubuntu-super-p-patch into lp:compiz/0.9.9

[Brandon Schaefer]

Instead of not grabbing all the keys when IgnoreTap is set, add a patch to only not grab Super+P. Allowing part of this bug to say fix (LP:950160), while fixing bugs such as this (LP:1075207). This is only a patch for unity, otherwise it will not cause any problems with trunk compiz.

[Michael Terry (mterry)]

Do we have existing tests for super+p functionality? Seems like a good thing to make sure doesn't regress, if we don't already have them.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3630
http://jenkins.qa.ubuntu.com/job/compiz-ci/103/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/140/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/492/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/103//rebuild/?

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Hmm I don't think there are any test atm. Though, there doesn't seem to be way to check if a key is grabbed (through X) or not making this test hard to do...as the Super+P is a misinterpretation by BIOS vendors (so it wont be true on all computers)... Though there are AP tests that test some keys are grabbed (Like the regression this branch fixes)

Ill see if I can come up with a test in meantime.

[Sam Spilsbury (smspillaz)]

review: Approve

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-17 07:28:12 +0000
+++ debian/patches/series	2013-02-28 19:13:22 +0000
@@ -1,3 +1,4 @@
+ubuntu_super_p.patch
 ubuntu-config.patch
 ccp_plugin.patch
 ccsm_remove_redundant_sliders.patch

=== added file 'debian/patches/ubuntu_super_p.patch'
--- debian/patches/ubuntu_super_p.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_super_p.patch	2013-02-28 19:13:22 +0000
@@ -0,0 +1,30 @@
+--- a/src/screen.cpp
++++ b/src/screen.cpp
+@@ -3253,12 +3253,22 @@
+ 	     * This is so that we can detect taps on individual modifier
+ 	     * keys, and know to cancel the tap if <modifier>+k is pressed.
+ 	     */
+-	    if (!(currentState & CompAction::StateIgnoreTap))
++            int minCode, maxCode;
++            XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
++
++            if ((currentState & CompAction::StateIgnoreTap))
++            {
++                KeySym sym_p = XStringToKeysym("p");
++                KeyCode code_p = XKeysymToKeycode(screen->dpy(), sym_p);
++
++                for (k = minCode; k <= maxCode; k++)
++                    if (k != code_p)
++                        grabUngrabOneKey (modifiers | ignore, k, grab);
++            }
++            else
+             {
+- 		int minCode, maxCode;
+- 		XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
+- 		for (k = minCode; k <= maxCode; k++)
+- 		    grabUngrabOneKey (modifiers | ignore, k, grab);
++                for (k = minCode; k <= maxCode; k++)
++                    grabUngrabOneKey (modifiers | ignore, k, grab);
+             }
+ 	}
+