Merge lp:~vanvugt/compiz-core/fix-806255 into lp:compiz-core

[Daniel van Vugt]

Don't respond to hotkeys if some other window (like a VM or locked
screen saver) already has an active keyboard grab. (LP: #806255)

Also fixed a minor pointer mistake in isBound(), and removed a redundant
call to XFlush.

[Daniel van Vugt (vanvugt)]

The real question is: Why does compiz still receive key events while other apps have the keyboard fully grabbed? I'm not entirely sure, but it only seems to happen with modifier-only hotkeys. As such, it's possibly caused by listening to xkbEvent. So it's possible a better long-term solution would be to rewrite modifier-only key handling without using xkbEvent. Not sure.

[Alan Griffiths (alan-griffiths)]

Looks sane, seems to work.

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-05 09:04:16 +0000
+++ src/event.cpp	2012-03-06 11:13:21 +0000
@@ -128,7 +128,7 @@
 
     *action = &option.value ().action ();
 
-    if (action && !(*action)->active ())
+    if (*action && !(*action)->active ())
 	return false;
 
     return true;
@@ -141,9 +141,7 @@
 {
     bool actionEventHandled = false;
 
-    if (state == CompAction::StateInitKey &&
-        grabs.empty () &&
-        !action->terminate ().empty ())
+    if (state == CompAction::StateInitKey && grabs.empty ())
     {
         possibleTap = action;
         int err = XGrabKeyboard (dpy, grabWindow, True,
@@ -153,6 +151,16 @@
 	    XAllowEvents (dpy, SyncKeyboard, CurrentTime);
             tapGrab = true;
         }
+        else
+        {
+            possibleTap = NULL;
+            /*
+             * Don't trigger any compiz actions if some other app has the
+             * keyboard grabbed (like a VM or locked screensaver). LP: #806255
+             */
+            if (err == AlreadyGrabbed)
+                return false;
+        }
     }
 
     if (action->initiate ().empty () && !action->terminate ().empty ())
@@ -1070,8 +1078,6 @@
 	XUngrabKeyboard (priv->dpy, event->xkey.time);
 	priv->tapGrab = false;
     }
-
-    XFlush (priv->dpy);
 }
 
 void