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.
This commit is contained in:
Havoc Pennington 2003-05-21 03:45:58 +00:00 committed by Havoc Pennington
parent 1d692936e0
commit 1620fd5408
3 changed files with 15 additions and 4 deletions

View File

@ -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-20 Havoc Pennington <hp@redhat.com>
* NEWS: update

View File

@ -2978,12 +2978,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))
{

View File

@ -925,7 +925,7 @@ meta_change_keygrab (MetaDisplay *display,
unsigned int keycode,
int modmask)
{
int ignored_mask;
unsigned int ignored_mask;
/* Grab keycode/modmask, together with
* all combinations of ignored modifiers.
@ -942,7 +942,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))
{