Merge lp:~unity-team/compiz/trunk.grabs into lp:~unity-team/compiz/trunk

[Sam Spilsbury]

Ungrab the keyboard as soon as key is handled, not after key released (implicitly)

[Chase Douglas (chasedouglas)]

Seems reasonable to me.

review: Approve

[David Barth (dbarth)]

What's the related bug report, and how can one test that the change does
a/ fix the problem
b/ does not create a regression

Can you provide 2 simple test procedures (manual test cases) to verify that?

review: Needs Information

[Sam Spilsbury (smspillaz)]

Added a test case

lp:~smspillaz/+junk/grabtests

HOW TO TEST:

1) Unload the unity plugin (seems to be a bug in cairo that causes a crash with no backtrace here, not sure what's up with that). Unloading the unity plugin DOES NOT affect the results of this test, since it is a test of compiz core NOT unity.
2) Load the "Test Grabs" plugin
3) Launch compiz in a terminal (eg compiz --replace ccp &)
4) Press Control-Alt-t, which should display a message
5) Press Control-Alt-y, which should display a message, releasing Control or Alt will display another, releasing y will NOT
6) Press Control-Alt-i, which should display a message, pressing any other key should also display a message, until Control-Alt-i pressed again
7) Press Control-Alt-o, which should display a message, pressing keys Q W E R T Y should also display a message, any other key should "pass through" to applications, until Control-Alt-o pressed again
8) Launch app/testgrabs, enter "1" if the window displayed, press a, press control-a and it will exit. A message will be displayed in testgrabs and in compiz, saying that you pressed Control, but the app will still get Control-a this time around.

[David Barth (dbarth)]

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-03-27 04:14:46 +0000
+++ src/event.cpp	2011-03-31 17:49:30 +0000
@@ -987,6 +987,7 @@
 
     CompWindow *w = NULL;
     XWindowAttributes wa;
+    bool	      actionEventHandled = false;
 
     switch (event->type) {
     case ButtonPress:
@@ -1015,8 +1016,23 @@
 	if (priv->grabs.empty ())
 	    XAllowEvents (priv->dpy, AsyncPointer, event->xbutton.time);
 
+	actionEventHandled = true;
+    }
+
+    if (priv->grabs.empty ())
+    {
+	switch (event->type)
+	{
+	    case KeyPress:
+		XUngrabKeyboard (priv->dpy, event->xkey.time);
+		break;
+	    default:
+		break;
+	}
+    }
+
+    if (actionEventHandled)
 	return;
-    }
 
     switch (event->type) {
     case SelectionRequest: