Merge lp:~brandontschaefer/compiz/lp.1075207-raring-super-p-patch into lp:compiz/raring

[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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3631
http://jenkins.qa.ubuntu.com/job/compiz-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/141/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/493/console

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

I had to interrupt the ci job to do some jenkins maintenance and therefore caused the ci failures above. I've restarted the ci job. Sorry for the inconvenience.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3631
http://jenkins.qa.ubuntu.com/job/compiz-ci/105/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/142/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/494/console

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/40/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-arm-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/38/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/40/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/40/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/41/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-arm-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/39/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/41/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/41/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/42/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-arm-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/40/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/42/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

Reapproving to try that armhf build one... last... time...

[Brandon Schaefer (brandontschaefer)]

Thanks, Im going to build on armhf tomorrow as I've seen this fail 3 times plus my other branch of the same thing seems to be failing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-mbs-autolanding/43/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-arm-mbs-autolanding/./build=panda-pbuilder,distribution=raring,flavor=armhf/41/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=amd64/43/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-x86-mbs-autolanding/./build=pbuilder,distribution=raring,flavor=i386/43/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-02-17 07:28:12 +0000
+++ debian/patches/series	2013-03-04 18:37:23 +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-03-04 18:37:23 +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);
+             }
+ 	}
+