summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-05-01 03:33:06 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-05-01 03:33:06 +0000
commit82ceb7c83716f6e31a7ea14dce2ccd6398df10f0 (patch)
treed7cfca911cc873897bd287881f855652787fc4ee
parent03481ae2d08f5ad0d69f13bd43863db6f91de599 (diff)
downloadmetacity-82ceb7c83716f6e31a7ea14dce2ccd6398df10f0.tar.gz
metacity-82ceb7c83716f6e31a7ea14dce2ccd6398df10f0.tar.bz2
finish mopping up mode_switch_mask field
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
-rw-r--r--ChangeLog7
-rw-r--r--src/display.h1
-rw-r--r--src/keybindings.c8
3 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d4be81b..43223c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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>
+
* src/window.c (recalc_window_features): don't try to decorate
toolbars.
diff --git a/src/display.h b/src/display.h
index 26822cd..893fea3 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 5dd2de4..9250fb5 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;