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

accel-parse: Remove support for <Release>

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-07 11:06:55 -04:00
parent 616f1a09b1
commit 0dc63f395d
1 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,20 +109,6 @@ is_control (const gchar *string)
(string[8] == '>')); (string[8] == '>'));
} }
static inline gboolean
is_release (const gchar *string)
{
return ((string[0] == '<') &&
(string[1] == 'r' || string[1] == 'R') &&
(string[2] == 'e' || string[2] == 'E') &&
(string[3] == 'l' || string[3] == 'L') &&
(string[4] == 'e' || string[4] == 'E') &&
(string[5] == 'a' || string[5] == 'A') &&
(string[6] == 's' || string[6] == 'S') &&
(string[7] == 'e' || string[7] == 'E') &&
(string[8] == '>'));
}
static inline gboolean static inline gboolean
is_meta (const gchar *string) is_meta (const gchar *string)
{ {
@ -208,13 +194,7 @@ accelerator_parse (const gchar *accelerator,
{ {
if (*accelerator == '<') if (*accelerator == '<')
{ {
if (len >= 9 && is_release (accelerator)) if (len >= 9 && is_primary (accelerator))
{
accelerator += 9;
len -= 9;
mods |= GDK_RELEASE_MASK;
}
else if (len >= 9 && is_primary (accelerator))
{ {
/* Primary is treated the same as Control */ /* Primary is treated the same as Control */
accelerator += 9; accelerator += 9;
@ -363,9 +343,6 @@ meta_parse_accelerator (const char *accel,
if (gdk_sym == None && gdk_code == 0) if (gdk_sym == None && gdk_code == 0)
return FALSE; return FALSE;
if (gdk_mask & GDK_RELEASE_MASK) /* we don't allow this */
return FALSE;
*keysym = gdk_sym; *keysym = gdk_sym;
*keycode = gdk_code; *keycode = gdk_code;
@ -413,9 +390,6 @@ meta_parse_modifier (const char *accel,
if (gdk_sym != None || gdk_code != 0) if (gdk_sym != None || gdk_code != 0)
return FALSE; return FALSE;
if (gdk_mask & GDK_RELEASE_MASK) /* we don't allow this */
return FALSE;
if (gdk_mask & GDK_SHIFT_MASK) if (gdk_mask & GDK_SHIFT_MASK)
*mask |= META_VIRTUAL_SHIFT_MASK; *mask |= META_VIRTUAL_SHIFT_MASK;
if (gdk_mask & GDK_CONTROL_MASK) if (gdk_mask & GDK_CONTROL_MASK)