Merge lp:~brandontschaefer/compiz/disable-tap-detection into lp:compiz/0.9.9

[Brandon Schaefer]

Added a new template that will check tap_detection. If it is false then add
CompAction::StateTapIgnore to the actions state.

If StateTapIgnore is set then in grabUngrabManyKeys ignore grabbing all
modifier+<keys>, because we don't care if the modifier is a tap or not.

This allows for Super+P to work with this unity branch:
https://code.launchpad.net/~brandontschaefer/unity/disable-tap-for-super/+merge/127407

See commit message.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3407
http://jenkins.qa.ubuntu.com/job/compiz-ci/153/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/153/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

We should avoid double negatives because they're confusing to read. So:
            <xsl:when test="./disable_tap_detection/text() = 'true'">
should be:
            <xsl:when test="./enable_tap_detection/text() = 'false'">

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, for consistency and clarity DisableTapDetection should be called something else starting with "State..."

Otherwise, it looks good. And tap detection still works as before.

review: Needs Fixing

[lp:~brandontschaefer/compiz/disable-tap-detection]

3408. By Brandon Schaefer on 2012-10-02

* Renamed things

[Brandon Schaefer (brandontschaefer)]

Alright, renamed some things :) (Hopefully it is descriptive enough!)

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3408
http://jenkins.qa.ubuntu.com/job/compiz-ci/156/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/156/console

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

OK, looks good. And I've retested confirming tap detection still works (when you want it).

review: Approve

[Michael Terry (mterry)]

I commented in the Unity branch about this too, but I'd like to see a regression test for this. I happened to run into Steve Magoun in Lexington, and he mentioned that this bug had regressed more than once.

=== modified file 'include/core/action.h'
--- include/core/action.h	2012-09-07 22:37:20 +0000
+++ include/core/action.h	2012-10-02 16:31:20 +0000
@@ -75,7 +75,8 @@
 	    StateCancel      = 1 << 10,
 	    StateAutoGrab    = 1 << 11,
 	    StateNoEdgeDelay = 1 << 12,
-	    StateTermTapped  = 1 << 13
+	    StateTermTapped  = 1 << 13,
+	    StateIgnoreTap   = 1 << 14
 	} StateEnum;
 
 	/**

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-06-24 09:00:27 +0000
+++ src/privatescreen.h	2012-10-02 16:31:20 +0000
@@ -427,8 +427,12 @@
     void updatePassiveKeyGrabs ();
     void updatePassiveButtonGrabs(Window serverFrame);
 
+    void setCurrentState(CompAction::State state);
+
 private:
     CompScreen  * const screen;
+    CompAction::State currentState;
+
     std::list<ButtonGrab> buttonGrabs;
     std::list<KeyGrab>    keyGrabs;
 };

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-09-18 01:44:23 +0000
+++ src/screen.cpp	2012-10-02 16:31:20 +0000
@@ -3349,10 +3349,13 @@
 	     * This is so that we can detect taps on individual modifier
 	     * keys, and know to cancel the tap if <modifier>+k is pressed.
 	     */
-	    int minCode, maxCode;
-	    XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
-	    for (k = minCode; k <= maxCode; k++)
-	        grabUngrabOneKey (modifiers | ignore, k, grab);
+	    if (!(currentState & CompAction::StateIgnoreTap))
+            {
+ 		int minCode, maxCode;
+ 		XDisplayKeycodes (screen->dpy(), &minCode, &maxCode);
+ 		for (k = minCode; k <= maxCode; k++)
+ 		    grabUngrabOneKey (modifiers | ignore, k, grab);
+            }
 	}
 
 	if (CompScreen::checkForError (screen->dpy()))
@@ -3529,6 +3532,12 @@
     }
 }
 
+void
+cps::GrabManager::setCurrentState (CompAction::State state)
+{
+    currentState = state;
+}
+
 bool
 CompScreenImpl::addAction (CompAction *action)
 {
@@ -3539,6 +3548,8 @@
     if (action->active ())
 	return false;
 
+    grabManager.setCurrentState(action->state());
+
     if (action->type () & CompAction::BindingTypeKey)
     {
 	if (!grabManager.addPassiveKeyGrab (action->key ()))
@@ -3579,6 +3590,8 @@
     if (!action->active ())
 	return;
 
+    grabManager.setCurrentState(action->state());
+
     if (action->type () & CompAction::BindingTypeKey)
 	grabManager.removePassiveKeyGrab (action->key ());
 
@@ -5385,6 +5398,7 @@
 
 cps::GrabManager::GrabManager (CompScreen *screen) :
     screen(screen),
+    currentState(0),
     buttonGrabs (),
     keyGrabs ()
 {

=== modified file 'xslt/bcop.xslt'
--- xslt/bcop.xslt	2012-05-18 06:52:20 +0000
+++ xslt/bcop.xslt	2012-10-02 16:31:20 +0000
@@ -475,6 +475,7 @@
 </xsl:text>
         <xsl:text>    action.setState (state | CompAction::StateInitKey);
 </xsl:text>
+        <xsl:call-template name="initTapDetection"/>
         <xsl:if test="default/text() and default/text() != 'disabled'">
             <xsl:text>    action.keyFromString ("</xsl:text>
             <xsl:value-of select="default/text()"/>
@@ -735,6 +736,15 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template name="initTapDetection">
+        <xsl:choose>
+            <xsl:when test="./tap_detection/text() = 'false'">
+                <xsl:text>    action.setState (action.state() | CompAction::StateIgnoreTap);
+</xsl:text>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
+
     <xsl:template name="initIntRestriction">
         <xsl:param name="value"/>
 	<xsl:value-of select="$value"/>