From 82ceb7c83716f6e31a7ea14dce2ccd6398df10f0 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 1 May 2002 03:33:06 +0000 Subject: [PATCH] finish mopping up mode_switch_mask field 2002-04-30 Havoc Pennington * src/keybindings.c: finish mopping up mode_switch_mask field * src/display.h (struct _MetaDisplay): remove mode_switch_mask field --- ChangeLog | 7 +++++++ src/display.h | 1 - src/keybindings.c | 8 ++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4be81b46..43223c59b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-04-30 Havoc Pennington + + * 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 * src/window.c (recalc_window_features): don't try to decorate diff --git a/src/display.h b/src/display.h index 26822cdc6..893fea362 100644 --- a/src/display.h +++ b/src/display.h @@ -205,7 +205,6 @@ struct _MetaDisplay unsigned int ignored_modifier_mask; unsigned int num_lock_mask; unsigned int scroll_lock_mask; - unsigned int mode_switch_mask; }; gboolean meta_display_open (const char *name); diff --git a/src/keybindings.c b/src/keybindings.c index 5dd2de42d..9250fb557 100644 --- a/src/keybindings.c +++ b/src/keybindings.c @@ -246,7 +246,6 @@ reload_modmap (MetaDisplay *display) /* Multiple bits may get set in each of these */ display->num_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, * and control @@ -290,15 +289,13 @@ reload_modmap (MetaDisplay *display) ++i; } - display->ignored_modifier_mask = (display->mode_switch_mask | - display->num_lock_mask | + display->ignored_modifier_mask = (display->num_lock_mask | display->scroll_lock_mask); 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->num_lock_mask, - display->mode_switch_mask, display->scroll_lock_mask); } @@ -517,7 +514,6 @@ meta_display_init_keys (MetaDisplay *display) display->ignored_modifier_mask = 0; display->num_lock_mask = 0; display->scroll_lock_mask = 0; - display->mode_switch_mask = 0; display->screen_bindings = NULL; display->n_screen_bindings = 0; display->window_bindings = NULL;