Merge lp:~smspillaz/compiz-core/compiz-core.fix_944631 into lp:compiz-core

[Sam Spilsbury]

== Problem ==

Pressing alt-left-right would trigger alt-tab

== Solution ==

Don't trigger keybindings which aren't active

== Tests ==

None yet.

[Daniel van Vugt (vanvugt)]

I think this is actually bug 943612.

[Daniel van Vugt (vanvugt)]

I will test this on the weekend or Monday.

[Daniel van Vugt (vanvugt)]

Tests OK.

I note however:
1. A tab change on line 31.
2. I'm not convinced that chunk @@ -1050,8 +1055,11 @@ is necessary.
3. I'm fairly sure that chunk @@ -1062,6 +1070,8 @@ is redundant because XFlush is already called as soon as alwaysHandleEvent returns.

But these are not blocking issues.

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-02-22 05:13:00 +0000
+++ src/event.cpp	2012-03-02 08:41:19 +0000
@@ -128,6 +128,9 @@
 
     *action = &option.value ().action ();
 
+    if (action && !(*action)->active ())
+	return false;
+
     return true;
 }
 
@@ -136,16 +139,18 @@
                              CompAction::State   state,
                              CompOption::Vector &arguments)
 {
+    bool actionEventHandled = false;
+
     if (state == CompAction::StateInitKey &&
         grabs.empty () &&
         !action->terminate ().empty ())
     {
         possibleTap = action;
         int err = XGrabKeyboard (dpy, grabWindow, True,
-                                 GrabModeAsync, GrabModeSync, CurrentTime);
+                                 GrabModeAsync, GrabModeSync, arguments[7].value ().i ());
         if (err == GrabSuccess)
         {
-            XAllowEvents (dpy, SyncKeyboard, CurrentTime);
+	    XAllowEvents (dpy, SyncKeyboard, CurrentTime);
             tapGrab = true;
         }
     }
@@ -158,9 +163,9 @@
             action->setState (action->state () | CompAction::StateTermKey);
     }
     else if (action->initiate () (action, state, arguments))
-        return true;
+        actionEventHandled = true;
 
-    return false;
+    return actionEventHandled;
 }
 
 bool
@@ -1050,8 +1055,11 @@
      * Critical event handling that cannot be overridden by plugins
      */
 
-    if (priv->tapGrab &&
-        (event->type == KeyPress || event->type == KeyRelease))
+    bool keyEvent = (event->type == KeyPress || event->type == KeyRelease);
+
+    /* Always either replay the keyboard or consume the key
+     * event on keypresses */
+    if (keyEvent)
     {
 	int mode = priv->eventHandled ? AsyncKeyboard : ReplayKeyboard;
 	XAllowEvents (priv->dpy, mode, event->xkey.time);
@@ -1062,6 +1070,8 @@
 	XUngrabKeyboard (priv->dpy, event->xkey.time);
 	priv->tapGrab = false;
     }
+
+    XFlush (priv->dpy);
 }
 
 void