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

[Daniel van Vugt]

Fixed Super key release events sometimes not being sent to plugins
(LP: #963470)

This regression was caused by the latest fix for LP: #806255, which has now
been removed. That was the third different fix attempted for #806255 and all
three have caused different regressions. So #806255 will not be fixed for
now. The only remaining fix (guaranteed to work) for that bug is to eliminate
and rewrite the XkbStateNotify code in compiz-core and several plugins.
However that is a massive change we can't afford to risk right now. So we
need to accept that LP: #806255 won't be fixed for a while.

[Alan Griffiths (alan-griffiths)]

:(

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-03-22 11:52:03 +0000
+++ src/event.cpp	2012-03-24 09:55:22 +0000
@@ -663,8 +663,6 @@
 
     switch (event->type) {
     case ButtonPress:
-	lastKeyCode = 0;
-
 	/* We need to determine if we clicked on a parent frame
 	 * window, if so, pass the appropriate child window as
 	 * "window" and the frame as "event_window"
@@ -700,8 +698,6 @@
 	}
 	break;
     case ButtonRelease:
-	lastKeyCode = 0;
-
 	o[0].value ().set ((int) event->xbutton.window);
 	o[1].value ().set ((int) event->xbutton.window);
 	o[2].value ().set ((int) event->xbutton.state);
@@ -723,8 +719,6 @@
 	}
 	break;
     case KeyPress:
-	lastKeyCode = event->xkey.keycode;
-
 	o[0].value ().set ((int) event->xkey.window);
 	o[1].value ().set ((int) activeWindow);
 	o[2].value ().set ((int) event->xkey.state);
@@ -747,8 +741,6 @@
 	}
 	break;
     case KeyRelease:
-	lastKeyCode = event->xkey.keycode;
-
 	o[0].value ().set ((int) event->xkey.window);
 	o[1].value ().set ((int) activeWindow);
 	o[2].value ().set ((int) event->xkey.state);
@@ -950,28 +942,6 @@
 	    {
 		XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
 
-		/*
-		 * You will reach this point when modifier keys or mouse
-		 * buttons change state (are pressed or released). However the
-		 * XKB extension does not honour active grabs held by other
-		 * clients and will send us these XkbStateNotify events even
-		 * when we shouldn't receive them at all (LP: #806255).
-		 * [http://www.x.org/releases/current/doc/libX11/specs/XKB/xkblib.html]
-		 *
-		 * So we need a sanity check. The sanity check is to only
-		 * accept XkbStateNotify's which were preceded by a matching
-		 * KeyPress or KeyRelease event, or which occurred during a
-		 * compiz active grab. Then we can be sure the keyboard is not
-		 * actively grabbed by another client and that compiz can
-		 * safely respond to this event.
-		 *
-		 * The only cleaner fix for LP: #806255 I can think of would
-		 * be to remove XkbStateNotify support completely from compiz.
-		 * But that would be a huge change, in core and some plugins.
-		 */
-		if (grabsEmpty() && stateEvent->keycode != lastKeyCode)
-		    break;
-
 		o[0].value ().set ((int) activeWindow);
 		o[1].value ().set ((int) activeWindow);
 		o[2].value ().set ((int) stateEvent->mods);
 
=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-03-23 09:33:17 +0000
+++ src/privatescreen.h	2012-03-24 09:55:22 +0000
@@ -989,8 +989,6 @@
 	CompTimer               edgeDelayTimer;
 	CompDelayedEdgeSettings edgeDelaySettings;
 	Window	xdndWindow;
-
-	int lastKeyCode;
 };
 
 class CompManager
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-22 11:52:03 +0000
+++ src/screen.cpp	2012-03-24 09:55:22 +0000
@@ -5124,8 +5124,7 @@
     initialized (false),
     edgeWindow (None),
     edgeDelayTimer (),
-    xdndWindow (None),
-    lastKeyCode (0)
+    xdndWindow (None)
 {
     pingTimer.setCallback (
 	boost::bind (&PrivateScreen::handlePingTimeout, this));