isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-01-27 03:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Merge rebuild_binding_index into reload_combos

Browse Source 
The two are always called at the same time.
This commit is contained in:
Jasper St. Pierre 2015-01-08 12:08:51 -08:00
parent 9d6357f05a
commit a1d8110221
1 changed files with 14 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/core/keybindings.c
View File

@ -507,6 +507,17 @@ devirtualize_modifiers (MetaKeyBindingManager *keys,
*mask |= Mod5Mask; *mask |= Mod5Mask;
} }
static void
index_binding (MetaKeyBindingManager *keys,
MetaKeyBinding *binding)
{
guint32 index_key;
index_key = key_combo_key (&binding->resolved_combo);
g_hash_table_replace (keys->key_bindings_index,
GINT_TO_POINTER (index_key), binding);
}
static void static void
resolve_key_combo (MetaKeyBindingManager *keys, resolve_key_combo (MetaKeyBindingManager *keys,
MetaKeyCombo *combo, MetaKeyCombo *combo,
@ -529,11 +540,14 @@ binding_reload_combos_foreach (gpointer key,
MetaKeyBinding *binding = value; MetaKeyBinding *binding = value;
resolve_key_combo (keys, &binding->combo, &binding->resolved_combo); resolve_key_combo (keys, &binding->combo, &binding->resolved_combo);
index_binding (keys, binding);
} }
static void static void
reload_combos (MetaKeyBindingManager *keys) reload_combos (MetaKeyBindingManager *keys)
{ {
g_hash_table_remove_all (keys->key_bindings_index);
determine_keymap_num_levels (keys); determine_keymap_num_levels (keys);
resolve_key_combo (keys, resolve_key_combo (keys,
@ -545,35 +559,6 @@ reload_combos (MetaKeyBindingManager *keys)
g_hash_table_foreach (keys->key_bindings, binding_reload_combos_foreach, keys); g_hash_table_foreach (keys->key_bindings, binding_reload_combos_foreach, keys);
} }
static void
index_binding (MetaKeyBindingManager *keys,
MetaKeyBinding *binding)
{
guint32 index_key;
index_key = key_combo_key (&binding->resolved_combo);
g_hash_table_replace (keys->key_bindings_index,
GINT_TO_POINTER (index_key), binding);
}
static void
binding_index_foreach (gpointer key,
gpointer value,
gpointer data)
{
MetaKeyBindingManager *keys = data;
MetaKeyBinding *binding = value;
index_binding (keys, binding);
}
static void
rebuild_binding_index (MetaKeyBindingManager *keys)
{
g_hash_table_remove_all (keys->key_bindings_index);
g_hash_table_foreach (keys->key_bindings, binding_index_foreach, keys);
}
static void static void
rebuild_binding_table (MetaKeyBindingManager *keys, rebuild_binding_table (MetaKeyBindingManager *keys,
GList *prefs, GList *prefs,
@ -903,8 +888,6 @@ on_keymap_changed (MetaBackend *backend,
reload_combos (keys); reload_combos (keys);
rebuild_binding_index (keys);
grab_key_bindings (display); grab_key_bindings (display);
} }
@ -1124,7 +1107,6 @@ prefs_changed_callback (MetaPreference pref,
rebuild_key_binding_table (keys); rebuild_key_binding_table (keys);
rebuild_special_bindings (keys); rebuild_special_bindings (keys);
reload_combos (keys); reload_combos (keys);
rebuild_binding_index (keys);
grab_key_bindings (display); grab_key_bindings (display);
break; break;
case META_PREF_MOUSE_BUTTON_MODS: case META_PREF_MOUSE_BUTTON_MODS:
@ -4069,7 +4051,6 @@ meta_display_init_keys (MetaDisplay *display)
rebuild_special_bindings (keys); rebuild_special_bindings (keys);
reload_combos (keys); reload_combos (keys);
rebuild_binding_index (keys);
update_window_grab_modifiers (keys); update_window_grab_modifiers (keys);