diff options
| author | Havoc Pennington <hp@pobox.com> | 2003-05-21 03:45:42 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2003-05-21 03:45:42 +0000 |
| commit | b134b10f31770130baa7e1037bd920cab1b8660b (patch) | |
| tree | 386b216231e8bbb391e19b038b9e850444a2091d | |
| parent | 6602523a123e1a1caa4e65f3abd82cd89a8dddc7 (diff) | |
| download | metacity-b134b10f31770130baa7e1037bd920cab1b8660b.tar.gz | |
the mask display->ignored_modifier_mask wasn't being bound, due to "<"
2003-05-20 Havoc Pennington <hp@pobox.com>
* src/keybindings.c (meta_change_keygrab): the mask
display->ignored_modifier_mask wasn't being bound,
due to "<" instead of "<=" (most people didn't notice
as display->ignored_modifier_mask included Scroll_Lock).
Red Hat bugzilla #91301 reported by Youssef Makki
* src/display.c (meta_change_button_grab): make corresponding
change for button grabs.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | src/display.c | 4 | ||||
| -rw-r--r-- | src/keybindings.c | 4 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,14 @@ +2003-05-20 Havoc Pennington <hp@pobox.com> + + * src/keybindings.c (meta_change_keygrab): the mask + display->ignored_modifier_mask wasn't being bound, + due to "<" instead of "<=" (most people didn't notice + as display->ignored_modifier_mask included Scroll_Lock). + Red Hat bugzilla #91301 reported by Youssef Makki + + * src/display.c (meta_change_button_grab): make corresponding + change for button grabs. + 2003-05-06 Danilo Šegan <dsegan@gmx.net> * configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS. diff --git a/src/display.c b/src/display.c index 91729529..5687f086 100644 --- a/src/display.c +++ b/src/display.c @@ -2958,12 +2958,12 @@ meta_change_button_grab (MetaDisplay *display, int button, int modmask) { - int ignored_mask; + unsigned int ignored_mask; meta_error_trap_push (display); ignored_mask = 0; - while (ignored_mask < (int) display->ignored_modifier_mask) + while (ignored_mask <= display->ignored_modifier_mask) { if (ignored_mask & ~(display->ignored_modifier_mask)) { diff --git a/src/keybindings.c b/src/keybindings.c index 2190091e..beaec749 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -857,7 +857,7 @@ meta_change_keygrab (MetaDisplay *display, int keycode, int modmask) { - int ignored_mask; + unsigned int ignored_mask; /* Grab keycode/modmask, together with * all combinations of ignored modifiers. @@ -874,7 +874,7 @@ meta_change_keygrab (MetaDisplay *display, meta_error_trap_push (display); ignored_mask = 0; - while (ignored_mask < (int) display->ignored_modifier_mask) + while (ignored_mask <= display->ignored_modifier_mask) { if (ignored_mask & ~(display->ignored_modifier_mask)) { |