isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

keybindings: Simplify our keycode/mask pairs with MetaKeyDevirtCombo

Browse Source
This commit is contained in:
Jasper St. Pierre 2015-01-06 19:11:23 -08:00
parent d12390002a
commit 5bc2bcd109
1 changed files with 70 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
src/core/keybindings.c
View File

@ -164,8 +164,7 @@ meta_key_grab_free (MetaKeyGrab *grab)
} }
static guint32 static guint32
key_binding_key (guint32 keycode, key_combo_key (MetaKeyDevirtCombo *devirt_combo)
guint32 mask)
{ {
/* On X, keycodes are only 8 bits while libxkbcommon supports 32 bit /* On X, keycodes are only 8 bits while libxkbcommon supports 32 bit
keycodes, but since we're using the same XKB keymaps that X uses, keycodes, but since we're using the same XKB keymaps that X uses,
@ -175,8 +174,8 @@ key_binding_key (guint32 keycode,
can use a 32 bit integer to safely concatenate both keycode and can use a 32 bit integer to safely concatenate both keycode and
mask and thus making it easy to use them as an index in a mask and thus making it easy to use them as an index in a
GHashTable. */ GHashTable. */
guint32 key = keycode & 0xffff; guint32 key = devirt_combo->keycode & 0xffff;
return (key << 16) | (mask & 0xffff); return (key << 16) | (devirt_combo->mask & 0xffff);
} }
static void static void
@ -552,7 +551,7 @@ index_binding (MetaKeyBindingManager *keys,
{ {
guint32 index_key; guint32 index_key;
index_key = key_binding_key (binding->devirt_combo.keycode, binding->devirt_combo.mask); index_key = key_combo_key (&binding->devirt_combo);
g_hash_table_replace (keys->key_bindings_index, g_hash_table_replace (keys->key_bindings_index,
GINT_TO_POINTER (index_key), binding); GINT_TO_POINTER (index_key), binding);
} }
@ -701,14 +700,10 @@ grab_key_bindings (MetaDisplay *display)
static MetaKeyBinding * static MetaKeyBinding *
get_keybinding (MetaKeyBindingManager *keys, get_keybinding (MetaKeyBindingManager *keys,
guint32 keycode, MetaKeyDevirtCombo *devirt_combo)
guint32 mask)
{ {
guint32 key; guint32 key;
key = key_combo_key (devirt_combo);
mask = mask & 0xff & ~keys->ignored_modifier_mask;
key = key_binding_key (keycode, mask);
return g_hash_table_lookup (keys->key_bindings_index, GINT_TO_POINTER (key)); return g_hash_table_lookup (keys->key_bindings_index, GINT_TO_POINTER (key));
} }
@ -827,6 +822,46 @@ meta_display_remove_keybinding (MetaDisplay *display,
return TRUE; return TRUE;
} }
static guint
get_keybinding_action (MetaKeyBindingManager *keys,
MetaKeyDevirtCombo *devirt_combo)
{
MetaKeyBinding *binding;
/* This is much more vague than the MetaDisplay::overlay-key signal,
* which is only emitted if the overlay-key is the only key pressed;
* as this method is primarily intended for plugins to allow processing
* of mutter keybindings while holding a grab, the overlay-key-only-pressed
* tracking is left to the plugin here.
*/
if (devirt_combo->keycode == (unsigned int)keys->overlay_key_devirt_combo.keycode)
return META_KEYBINDING_ACTION_OVERLAY_KEY;
binding = get_keybinding (keys, devirt_combo);
if (binding)
{
MetaKeyGrab *grab = g_hash_table_lookup (external_grabs, binding->name);
if (grab)
return grab->action;
else
return (guint) meta_prefs_get_keybinding_action (binding->name);
}
else
{
return META_KEYBINDING_ACTION_NONE;
}
}
static void
devirt_combo_from_event_params (MetaKeyDevirtCombo *devirt_combo,
MetaKeyBindingManager *keys,
unsigned int keycode,
unsigned long mask)
{
devirt_combo->keycode = keycode;
devirt_combo->mask = mask & 0xff & ~keys->ignored_modifier_mask;
}
/** /**
* meta_display_get_keybinding_action: * meta_display_get_keybinding_action:
* @display: A #MetaDisplay * @display: A #MetaDisplay
@ -847,31 +882,9 @@ meta_display_get_keybinding_action (MetaDisplay *display,
unsigned long mask) unsigned long mask)
{ {
MetaKeyBindingManager *keys = &display->key_binding_manager; MetaKeyBindingManager *keys = &display->key_binding_manager;
MetaKeyBinding *binding; MetaKeyDevirtCombo devirt_combo;
devirt_combo_from_event_params (&devirt_combo, keys, keycode, mask);
/* This is much more vague than the MetaDisplay::overlay-key signal, return get_keybinding_action (keys, &devirt_combo);
* which is only emitted if the overlay-key is the only key pressed;
* as this method is primarily intended for plugins to allow processing
* of mutter keybindings while holding a grab, the overlay-key-only-pressed
* tracking is left to the plugin here.
*/
if (keycode == (unsigned int)keys->overlay_key_devirt_combo.keycode)
return META_KEYBINDING_ACTION_OVERLAY_KEY;
binding = get_keybinding (keys, keycode, mask);
if (binding)
{
MetaKeyGrab *grab = g_hash_table_lookup (external_grabs, binding->name);
if (grab)
return grab->action;
else
return (guint) meta_prefs_get_keybinding_action (binding->name);
}
else
{
return META_KEYBINDING_ACTION_NONE;
}
} }
static void static void
@ -1381,9 +1394,8 @@ handle_external_grab (MetaDisplay *display,
MetaKeyBinding *binding, MetaKeyBinding *binding,
gpointer user_data) gpointer user_data)
{ {
guint action = meta_display_get_keybinding_action (display, MetaKeyBindingManager *keys = &display->key_binding_manager;
binding->devirt_combo.keycode, guint action = get_keybinding_action (keys, &binding->devirt_combo);
binding->devirt_combo.mask);
meta_display_accelerator_activate (display, action, event); meta_display_accelerator_activate (display, action, event);
} }
@ -1413,7 +1425,7 @@ meta_display_grab_accelerator (MetaDisplay *display,
if (devirt_combo.keycode == 0) if (devirt_combo.keycode == 0)
return META_KEYBINDING_ACTION_NONE; return META_KEYBINDING_ACTION_NONE;
if (get_keybinding (keys, devirt_combo.keycode, devirt_combo.mask)) if (get_keybinding (keys, &devirt_combo))
return META_KEYBINDING_ACTION_NONE; return META_KEYBINDING_ACTION_NONE;
if (META_IS_BACKEND_X11 (backend)) if (META_IS_BACKEND_X11 (backend))
@ -1447,8 +1459,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
MetaKeyBinding *binding; MetaKeyBinding *binding;
MetaKeyGrab *grab; MetaKeyGrab *grab;
char *key; char *key;
guint mask = 0; MetaKeyDevirtCombo devirt_combo;
guint keycode = 0;
g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE); g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
@ -1457,10 +1468,8 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
if (!grab) if (!grab)
return FALSE; return FALSE;
devirtualize_modifiers (keys, grab->combo.modifiers, &mask); devirtualize_key_combo (keys, &grab->combo, &devirt_combo);
keycode = get_first_keycode_for_keysym (keys, grab->combo.keysym); binding = get_keybinding (keys, &devirt_combo);
binding = get_keybinding (keys, keycode, mask);
if (binding) if (binding)
{ {
guint32 index_key; guint32 index_key;
@ -1468,7 +1477,7 @@ meta_display_ungrab_accelerator (MetaDisplay *display,
if (META_IS_BACKEND_X11 (backend)) if (META_IS_BACKEND_X11 (backend))
meta_change_keygrab (keys, display->screen->xroot, FALSE, &binding->devirt_combo); meta_change_keygrab (keys, display->screen->xroot, FALSE, &binding->devirt_combo);
index_key = key_binding_key (binding->devirt_combo.keycode, binding->devirt_combo.mask); index_key = key_combo_key (&binding->devirt_combo);
g_hash_table_remove (keys->key_bindings_index, GINT_TO_POINTER (index_key)); g_hash_table_remove (keys->key_bindings_index, GINT_TO_POINTER (index_key));
g_hash_table_remove (keys->key_bindings, binding); g_hash_table_remove (keys->key_bindings, binding);
@ -1684,15 +1693,19 @@ process_event (MetaDisplay *display,
ClutterKeyEvent *event) ClutterKeyEvent *event)
{ {
MetaKeyBindingManager *keys = &display->key_binding_manager; MetaKeyBindingManager *keys = &display->key_binding_manager;
MetaKeyDevirtCombo devirt_combo;
MetaKeyBinding *binding; MetaKeyBinding *binding;
/* we used to have release-based bindings but no longer. */ /* we used to have release-based bindings but no longer. */
if (event->type == CLUTTER_KEY_RELEASE) if (event->type == CLUTTER_KEY_RELEASE)
return FALSE; return FALSE;
binding = get_keybinding (keys, devirt_combo_from_event_params (&devirt_combo, keys,
event->hardware_keycode, event->hardware_keycode,
event->modifier_state); event->modifier_state);
binding = get_keybinding (keys, &devirt_combo);
if (!binding || if (!binding ||
(!window && binding->flags & META_KEY_BINDING_PER_WINDOW)) (!window && binding->flags & META_KEY_BINDING_PER_WINDOW))
goto not_found; goto not_found;
@ -1796,7 +1809,7 @@ process_overlay_key (MetaDisplay *display,
clutter_input_device_get_device_id (event->device), clutter_input_device_get_device_id (event->device),
XIAsyncDevice, event->time); XIAsyncDevice, event->time);
binding = get_keybinding (keys, keys->overlay_key_devirt_combo.keycode, 0); binding = get_keybinding (keys, &keys->overlay_key_devirt_combo);
if (binding && if (binding &&
meta_compositor_filter_keybinding (display->compositor, binding)) meta_compositor_filter_keybinding (display->compositor, binding))
return TRUE; return TRUE;
@ -1848,8 +1861,7 @@ process_iso_next_group (MetaDisplay *display,
{ {
MetaKeyBindingManager *keys = &display->key_binding_manager; MetaKeyBindingManager *keys = &display->key_binding_manager;
gboolean activate; gboolean activate;
guint32 keycode; MetaKeyDevirtCombo devirt_combo;
guint32 modifiers;
int i; int i;
if (event->type == CLUTTER_KEY_RELEASE) if (event->type == CLUTTER_KEY_RELEASE)
@ -1857,13 +1869,14 @@ process_iso_next_group (MetaDisplay *display,
activate = FALSE; activate = FALSE;
keycode = event->hardware_keycode; devirt_combo_from_event_params (&devirt_combo, keys,
modifiers = event->modifier_state & 0xff & ~keys->ignored_modifier_mask; event->hardware_keycode,
event->modifier_state);
for (i = 0; i < keys->n_iso_next_group_combos; ++i) for (i = 0; i < keys->n_iso_next_group_combos; ++i)
{ {
if (keycode == keys->iso_next_group_combos[i].keycode && if (devirt_combo.keycode == keys->iso_next_group_combos[i].keycode &&
modifiers == keys->iso_next_group_combos[i].mask) devirt_combo.mask == keys->iso_next_group_combos[i].mask)
{ {
/* If the signal handler returns TRUE the keyboard will /* If the signal handler returns TRUE the keyboard will
remain frozen. It's the signal handler's responsibility remain frozen. It's the signal handler's responsibility