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

accel-parse: Integrate Above_Tab parsing code directly into our copy

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-07 11:03:10 -04:00
parent 242784d3e4
commit 50e69109b6
1 changed files with 6 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/core/meta-accel-parse.c
View File

@ -306,7 +306,12 @@ do_accelerator_parse (const gchar *accelerator,
error = TRUE; error = TRUE;
goto out; goto out;
} }
else else if (strcmp (accelerator, "Above_Tab") == 0)
{
keyval = META_KEY_ABOVE_TAB;
goto out;
}
else
{ {
keyval = gdk_keyval_from_name (accelerator); keyval = gdk_keyval_from_name (accelerator);
if (keyval == GDK_KEY_VoidSymbol) if (keyval == GDK_KEY_VoidSymbol)
@ -337,8 +342,6 @@ accelerator_parse (const char *accel,
guint *keycode, guint *keycode,
GdkModifierType *keymask) GdkModifierType *keymask)
{ {
const char *above_tab;
if (accel[0] == '0' && accel[1] == 'x') if (accel[0] == '0' && accel[1] == 'x')
{ {
*keysym = 0; *keysym = 0;
@ -348,38 +351,6 @@ accelerator_parse (const char *accel,
return; return;
} }
/* The key name 'Above_Tab' is special - it's not an actual keysym name,
* but rather refers to the key above the tab key. In order to use
* the GDK parsing for modifiers in combination with it, we substitute
* it with 'Tab' temporarily before calling gtk_accelerator_parse().
*/
#define is_word_character(c) (g_ascii_isalnum(c) || ((c) == '_'))
#define ABOVE_TAB "Above_Tab"
#define ABOVE_TAB_LEN 9
above_tab = strstr (accel, ABOVE_TAB);
if (above_tab &&
(above_tab == accel || !is_word_character (above_tab[-1])) &&
!is_word_character (above_tab[ABOVE_TAB_LEN]))
{
char *before = g_strndup (accel, above_tab - accel);
char *after = g_strdup (above_tab + ABOVE_TAB_LEN);
char *replaced = g_strconcat (before, "Tab", after, NULL);
do_accelerator_parse (replaced, NULL, keymask);
g_free (before);
g_free (after);
g_free (replaced);
*keysym = META_KEY_ABOVE_TAB;
return;
}
#undef is_word_character
#undef ABOVE_TAB
#undef ABOVE_TAB_LEN
do_accelerator_parse (accel, keysym, keymask); do_accelerator_parse (accel, keysym, keymask);
} }