brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keybindings: Have meta_accelerator_parse take a MetaKeyCombo

Browse Source
This commit is contained in:
Jasper St. Pierre
2015-01-06 18:59:53 -08:00
parent 3beb187cac
commit 13acf9e35d
4 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/core/prefs.c
View File

@ -1672,10 +1672,7 @@ overlay_key_handler (GVariant *value,
*result = NULL; /* ignored */
string_value = g_variant_get_string (value, NULL);
if (string_value && meta_parse_accelerator (string_value,
&combo.keysym,
&combo.keycode,
NULL))
if (string_value && meta_parse_accelerator (string_value, &combo))
;
else
{
@ -1684,6 +1681,8 @@ overlay_key_handler (GVariant *value,
return FALSE;
}
combo.modifiers = 0;
if (overlay_key_combo.keysym != combo.keysym ||
overlay_key_combo.keycode != combo.keycode)
{
@ -1916,10 +1915,6 @@ update_binding (MetaKeyPref *binding,
{
GSList *old_combos, *a, *b;
gboolean changed;
unsigned int keysym;
unsigned int keycode;
MetaVirtualModifier mods;
MetaKeyCombo *combo;
int i;
meta_topic (META_DEBUG_KEYBINDINGS,
@ -1931,31 +1926,25 @@ update_binding (MetaKeyPref *binding,
for (i = 0; strokes && strokes[i]; i++)
{
keysym = 0;
keycode = 0;
mods = 0;
MetaKeyCombo *combo;
if (!meta_parse_accelerator (strokes[i], &keysym, &keycode, &mods))
combo = g_malloc0 (sizeof (MetaKeyCombo));
if (!meta_parse_accelerator (strokes[i], combo))
{
meta_topic (META_DEBUG_KEYBINDINGS,
"Failed to parse new GSettings value\n");
meta_warning ("\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n",
strokes[i], binding->name);
g_free (combo);
/* Value is kept and will thus be removed next time we save the key.
* Changing the key in response to a modification could lead to cyclic calls. */
continue;
}
combo = g_malloc0 (sizeof (MetaKeyCombo));
combo->keysym = keysym;
combo->keycode = keycode;
combo->modifiers = mods;
binding->combos = g_slist_prepend (binding->combos, combo);
meta_topic (META_DEBUG_KEYBINDINGS,
"New keybinding for \"%s\" is keysym = 0x%x keycode = 0x%x mods = 0x%x\n",
binding->name, keysym, keycode, mods);
}
binding->combos = g_slist_reverse (binding->combos);