Merge lp:~vanvugt/compiz-core/tapping-panacea into lp:compiz-core

[Daniel van Vugt]

Reliable tap detection without compromise (!)

Eliminated the timing hack. Instead use individual passive grabs on
<modifier>+each_key to detect whether <modifier> is being tapped, or used
to modify another key.

[Alan Griffiths (alan-griffiths)]

Looks sound, & I trust Didier's testing.

review: Approve

=== modified file 'metadata/core.xml.in'
--- metadata/core.xml.in	2012-03-07 09:31:30 +0000
+++ metadata/core.xml.in	2012-03-09 08:26:32 +0000
@@ -31,13 +31,6 @@
 		<min>0</min>
 		<max>10000</max>
 	    </option>
-	    <option name="tap_time" type="int">
-		<_short>Key Tap Time</_short>
-		<_long>Maximim amount of time (milliseconds) a key may be held down and still be reported as a "tap".</_long>
-		<default>150</default>
-		<min>0</min>
-		<max>10000</max>
-	    </option>
 	    <option name="ping_delay" type="int">
 		<_short>Ping Delay</_short>
 		<_long>Interval between ping messages</_long>

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-08 17:42:06 +0000
+++ src/event.cpp	2012-03-09 08:26:32 +0000
@@ -128,9 +128,6 @@
 
     *action = &option.value ().action ();
 
-    if (*action && !(*action)->active ())
-	return false;
-
     return true;
 }
 
@@ -146,7 +143,6 @@
         if (grabbed)
         {
             possibleTap = action;
-            tapStart = arguments[7].value ().i ();
         }
         else
         {
@@ -184,10 +180,7 @@
 {
     if (action == possibleTap)
     {
-        int releaseTime = arguments[7].value ().i ();
-        int tapDuration = releaseTime - tapStart;
-        if (tapDuration < optionGetTapTime ())
-            state |= CompAction::StateTermTapped;
+        state |= CompAction::StateTermTapped;
         possibleTap = NULL;
     }
 

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-03-08 17:42:06 +0000
+++ src/privatescreen.h	2012-03-09 08:26:32 +0000
@@ -572,9 +572,6 @@
     private:
 	CompOption::Value plugin;
 	bool	          dirtyPluginList;
-
-    protected:
-	Time  tapStart;
 };
 
 class GrabList

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-08 17:42:06 +0000
+++ src/screen.cpp	2012-03-09 08:26:32 +0000
@@ -3143,6 +3143,20 @@
 		    }
 		}
 	    }
+
+	    /*
+	     * keycode == 0, so this is a modifier-only keybinding.
+	     * Until now I have been trying to:
+	     *     grabUngrabOneKey (modifiers | ignore, AnyKey, grab);
+	     * which does not seem to work at all.
+	     * However, binding to each keycode individually does work.
+	     * 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 (dpy, &minCode, &maxCode);
+	    for (k = minCode; k <= maxCode; k++)
+	        grabUngrabOneKey (modifiers | ignore, k, grab);
 	}
 
 	if (CompScreen::checkForError (dpy))
@@ -5042,8 +5056,7 @@
     ScreenUser (screen),
     CoreOptions (false),
     plugin (),
-    dirtyPluginList (true),
-    tapStart (0)
+    dirtyPluginList (true)
 {
 }