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

Proposed by Daniel van Vugt
Status: Merged
Merged at revision: 3057
Proposed branch: lp:~vanvugt/compiz-core/fix-945816
Merge into: lp:compiz-core
Diff against target: 18 lines (+8/-0)
1 file modified
src/screen.cpp (+8/-0)
To merge this branch: bzr merge lp:~vanvugt/compiz-core/fix-945816
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Review via email: mp+97577@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

Looks sensible and safe. No obvious regressions.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3284 grabUngrabKeys (mask, key.keycode (), false);3284 grabUngrabKeys (mask, key.keycode (), false);
3285 }3285 }
3286 }3286 }
3287
3288 /*
3289 * Removing modifier-only grabs is tricky. Because it also removes grabs
3290 * for modifier+all_other_keys. See XDisplayKeycodes above to find out why.
3291 * So we need to refresh all grabs...
3292 */
3293 if (!(mask & CompNoMask) && key.keycode () == 0)
3294 updatePassiveKeyGrabs ();
3287}3295}
32883296
3289void3297void

Subscribers

People subscribed via source and target branches