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

[Daniel van Vugt]

Don't allow plugins (unity) to interfere with tap detection by blocking
compiz-core from handling key events (LP: #960831)

[Tim Penhey (thumper)]

Looks very sensible to me.

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-19 10:21:02 +0000
+++ src/event.cpp	2012-03-21 04:00:25 +0000
@@ -1060,14 +1060,17 @@
 void
 CompScreenImpl::alwaysHandleEvent (XEvent *event)
 {
+    /*
+     * Critical event handling that cannot be overridden by plugins
+     */
+    
+    if (event->type == ButtonPress || event->type == KeyPress)
+	priv->possibleTap = NULL;
+
     eventHandled = true;  // if we return inside WRAPABLE_HND_FUNCTN
 
     handleEvent (event);
 
-    /*
-     * Critical event handling that cannot be overridden by plugins
-     */
-
     bool keyEvent = (event->type == KeyPress || event->type == KeyRelease);
 
     /* Always either replay the keyboard or consume the key