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

[Daniel van Vugt]

Remove logic to cancel a tap on focus change. It's no longer required since
r3050, and looks like it might be contributing to incorrect tap detection
in some cases with empty workspaces (LP: #953089)

[lp:~vanvugt/compiz-core/fix-953089]

3060. By Daniel van Vugt on 2012-03-19

Update NEWS too

[Alan Griffiths (alan-griffiths)]

Don't see any problems

review: Approve

=== modified file 'NEWS'
--- NEWS	2012-03-16 07:59:22 +0000
+++ NEWS	2012-03-19 08:12:21 +0000
@@ -22,6 +22,8 @@
 	     `priv->initialized' failed.
     946887 - Compiz spends >8% of its time in
              std::list<CompWindow*>::operator=(std::list<CompWindow*>)
+    953089 - Unity 5.6: key bindings (such as Super) don't work on empty
+             workspace or on slow/loaded systems
 
 
 Release 0.9.7.0 ( 2012-03-02 smspillaz <[e-mail]> ) 

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-12 10:35:21 +0000
+++ src/event.cpp	2012-03-19 08:12:21 +0000
@@ -1906,14 +1906,6 @@
 	break;
     case FocusIn:
     {
-	/* When a menu etc gets a grab, it's safe to say we're not tapping
-	   any key right now. e.g. Detecting taps of "Alt" and cancelling
-	   when a menu is opened */
-	if (event->xfocus.mode == NotifyGrab &&
-	    event->xfocus.window != priv->root &&
-	    priv->notGrabWindow (event->xfocus.window))
-	    priv->possibleTap = NULL;
-
 	if (!XGetWindowAttributes (priv->dpy, event->xfocus.window, &wa))
 	    priv->setDefaultWindowAttributes (&wa);