brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish mopping up mode_switch_mask field

Browse Source 
2002-04-30  Havoc Pennington  <hp@pobox.com>

	* src/keybindings.c: finish mopping up mode_switch_mask field

	* src/display.h (struct _MetaDisplay): remove mode_switch_mask
	field
This commit is contained in:
Havoc Pennington 2002-05-01 03:33:06 +00:00 committed by Havoc Pennington
parent 03481ae2d0
commit 82ceb7c837
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-04-30 Havoc Pennington <hp@pobox.com>
* src/keybindings.c: finish mopping up mode_switch_mask field
* src/display.h (struct _MetaDisplay): remove mode_switch_mask
field
2002-04-30 Havoc Pennington <hp@pobox.com> 2002-04-30 Havoc Pennington <hp@pobox.com>
* src/window.c (recalc_window_features): don't try to decorate * src/window.c (recalc_window_features): don't try to decorate

1
src/display.h
View File

@ -205,7 +205,6 @@ struct _MetaDisplay
unsigned int ignored_modifier_mask; unsigned int ignored_modifier_mask;
unsigned int num_lock_mask; unsigned int num_lock_mask;
unsigned int scroll_lock_mask; unsigned int scroll_lock_mask;
unsigned int mode_switch_mask;
}; };
gboolean meta_display_open (const char *name); gboolean meta_display_open (const char *name);

8
src/keybindings.c
View File

@ -246,7 +246,6 @@ reload_modmap (MetaDisplay *display)
/* Multiple bits may get set in each of these */ /* Multiple bits may get set in each of these */
display->num_lock_mask = 0; display->num_lock_mask = 0;
display->scroll_lock_mask = 0; display->scroll_lock_mask = 0;
display->mode_switch_mask = 0;
/* there are 8 modifiers, and the first 3 are shift, shift lock, /* there are 8 modifiers, and the first 3 are shift, shift lock,
* and control * and control
@ -290,15 +289,13 @@ reload_modmap (MetaDisplay *display)
++i; ++i;
} }
display->ignored_modifier_mask = (display->mode_switch_mask | display->ignored_modifier_mask = (display->num_lock_mask |
display->num_lock_mask |
display->scroll_lock_mask); display->scroll_lock_mask);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Ignoring modmask 0x%x num lock 0x%x mode switch 0x%x scroll lock 0x%x\n", "Ignoring modmask 0x%x num lock 0x%x scroll lock 0x%x\n",
display->ignored_modifier_mask, display->ignored_modifier_mask,
display->num_lock_mask, display->num_lock_mask,
display->mode_switch_mask,
display->scroll_lock_mask); display->scroll_lock_mask);
} }
@ -517,7 +514,6 @@ meta_display_init_keys (MetaDisplay *display)
display->ignored_modifier_mask = 0; display->ignored_modifier_mask = 0;
display->num_lock_mask = 0; display->num_lock_mask = 0;
display->scroll_lock_mask = 0; display->scroll_lock_mask = 0;
display->mode_switch_mask = 0;
display->screen_bindings = NULL; display->screen_bindings = NULL;
display->n_screen_bindings = 0; display->n_screen_bindings = 0;
display->window_bindings = NULL; display->window_bindings = NULL;