Merge lp:~brandontschaefer/compiz/fix-950160-6.0 into lp:compiz/0.9.8

[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

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

[Daniel van Vugt (vanvugt)]

FYI, when ready, I will still be hesitant to land this until it's been tested by a few people in raring. The same goes for backporting anything.

Too many times recently we've backported code that contained regressions. Simply because the backport was rushed in before the changes were fully tested in the development series.

Unmerged revisions

3412. By Brandon Schaefer on 2012-11-05

* Adds StateIgnoreTap, so you can set a key to not dectect taps (which makes it not XGrab each key+*)

=== modified file 'include/core/action.h'
--- include/core/action.h	2012-09-07 22:37:20 +0000
+++ include/core/action.h	2012-11-05 17:07:35 +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-11-05 17:07:35 +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-11-05 17:07:35 +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-11-05 17:07:35 +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"/>