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

[Daniel van Vugt]

Fixed: Changing the HUD shortcut disables all Alt-based combinations
(LP: #945816)

More accurately; Changing any hotkey whose default or previous value was
a single modifier key would disable all other combinations with that modifier.
This was a regression caused by lp:compiz-core r3050.

[Alan Griffiths (alan-griffiths)]

Looks sensible and safe. No obvious regressions.

review: Approve

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-12 12:20:09 +0000
+++ src/screen.cpp	2012-03-15 06:20:23 +0000
@@ -3284,6 +3284,14 @@
 		grabUngrabKeys (mask, key.keycode (), false);
 	}
     }
+
+    /*
+     * Removing modifier-only grabs is tricky. Because it also removes grabs
+     * for modifier+all_other_keys. See XDisplayKeycodes above to find out why.
+     * So we need to refresh all grabs...
+     */
+    if (!(mask & CompNoMask) && key.keycode () == 0)
+	updatePassiveKeyGrabs ();
 }
 
 void