summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErwann Chenede - <erwann.chenede@sun.com>2002-05-25 16:41:41 +0000
committerErwann Chenede <erwannc@src.gnome.org>2002-05-25 16:41:41 +0000
commitaf845f4de75c7b6b8cc2321d9e74d3a7da535495 (patch)
tree1030ac089fffc2cb06c4038adf540d81f0224bf8
parentd466c615ed067a04155143dd764ce2530c9da4ce (diff)
downloadmetacity-af845f4de75c7b6b8cc2321d9e74d3a7da535495.tar.gz
allow key grabbing for unmodified keys (e.g F1, etc) fix #82630
2002-05-25 Erwann Chenede - <erwann.chenede@sun.com> * src/keybindings.c (rebuild_screen_binding_table, rebuild_window_binding_table, meta_change_keygrab): allow key grabbing for unmodified keys (e.g F1, etc) fix #82630
-rw-r--r--ChangeLog7
-rw-r--r--src/keybindings.c13
2 files changed, 9 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 24314e6f..80a8c73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-25 Erwann Chenede - <erwann.chenede@sun.com>
+
+ * src/keybindings.c (rebuild_screen_binding_table,
+ rebuild_window_binding_table,
+ meta_change_keygrab): allow key grabbing for
+ unmodified keys (e.g F1, etc) fix #82630
+
2002-05-25 Anders Carlsson <andersca@gnu.org>
* src/place.c: (get_vertical_edges), (get_horizontal_edges):
diff --git a/src/keybindings.c b/src/keybindings.c
index 5ae2f271..65d84151 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -358,8 +358,7 @@ rebuild_screen_binding_table (MetaDisplay *display)
dest = 0;
while (src < n_bindings)
{
- if (prefs[src].keysym != None &&
- prefs[src].mask != 0)
+ if (prefs[src].keysym != None)
{
display->screen_bindings[dest].name = prefs[src].name;
display->screen_bindings[dest].keysym = prefs[src].keysym;
@@ -395,8 +394,7 @@ rebuild_window_binding_table (MetaDisplay *display)
dest = 0;
while (src < n_bindings)
{
- if (prefs[src].keysym != None &&
- prefs[src].mask != 0)
+ if (prefs[src].keysym != None)
{
display->window_bindings[dest].name = prefs[src].name;
display->window_bindings[dest].keysym = prefs[src].keysym;
@@ -590,13 +588,6 @@ meta_change_keygrab (MetaDisplay *display,
* X provides no better way to do this.
*/
- if ((modmask & ~(display->ignored_modifier_mask)) == 0)
- {
- meta_topic (META_DEBUG_KEYBINDINGS,
- "Unable to grab/ungrab keybinding because it has no modifiers\n");
- return;
- }
-
meta_topic (META_DEBUG_KEYBINDINGS,
"%s keybinding %s mask 0x%x\n",
grab ? "Grabbing" : "Ungrabbing",