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

core: Replace MetaVirtualModifier

Browse Source 
By making all the types uses ClutterModifierType instead.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2407>
This commit is contained in:
Bilal Elmoussaoui
2022-05-27 16:03:43 +02:00
parent 8b42bc77dc
commit d1d2496c99
8 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,7 @@ accelerator_parse (const gchar *accelerator,
MetaKeyCombo *combo)
{
guint keyval, keycode;
MetaVirtualModifier mods;
ClutterModifierType mods;
gint len;
combo->keysym = 0;
@ -203,40 +203,40 @@ accelerator_parse (const gchar *accelerator,
/* Primary is treated the same as Control */
accelerator += 9;
len -= 9;
mods |= META_VIRTUAL_CONTROL_MASK;
mods |= CLUTTER_CONTROL_MASK;
}
else if (len >= 9 && is_control (accelerator))
{
accelerator += 9;
len -= 9;
mods |= META_VIRTUAL_CONTROL_MASK;
mods |= CLUTTER_CONTROL_MASK;
}
else if (len >= 7 && is_shift (accelerator))
{
accelerator += 7;
len -= 7;
mods |= META_VIRTUAL_SHIFT_MASK;
mods |= CLUTTER_SHIFT_MASK;
}
else if (len >= 6 && is_shft (accelerator))
{
accelerator += 6;
len -= 6;
mods |= META_VIRTUAL_SHIFT_MASK;
mods |= CLUTTER_SHIFT_MASK;
}
else if (len >= 6 && is_ctrl (accelerator))
{
accelerator += 6;
len -= 6;
mods |= META_VIRTUAL_CONTROL_MASK;
mods |= CLUTTER_CONTROL_MASK;
}
else if (len >= 6 && is_modx (accelerator))
{
static const guint mod_vals[] = {
META_VIRTUAL_ALT_MASK,
META_VIRTUAL_MOD2_MASK,
META_VIRTUAL_MOD3_MASK,
META_VIRTUAL_MOD4_MASK,
META_VIRTUAL_MOD5_MASK,
CLUTTER_MOD1_MASK,
CLUTTER_MOD2_MASK,
CLUTTER_MOD3_MASK,
CLUTTER_MOD4_MASK,
CLUTTER_MOD5_MASK,
};
len -= 6;
@ -248,31 +248,31 @@ accelerator_parse (const gchar *accelerator,
{
accelerator += 5;
len -= 5;
mods |= META_VIRTUAL_CONTROL_MASK;
mods |= CLUTTER_CONTROL_MASK;
}
else if (len >= 5 && is_alt (accelerator))
{
accelerator += 5;
len -= 5;
mods |= META_VIRTUAL_ALT_MASK;
mods |= CLUTTER_MOD1_MASK;
}
else if (len >= 6 && is_meta (accelerator))
{
accelerator += 6;
len -= 6;
mods |= META_VIRTUAL_META_MASK;
mods |= CLUTTER_META_MASK;
}
else if (len >= 7 && is_hyper (accelerator))
{
accelerator += 7;
len -= 7;
mods |= META_VIRTUAL_HYPER_MASK;
mods |= CLUTTER_HYPER_MASK;
}
else if (len >= 7 && is_super (accelerator))
{
accelerator += 7;
len -= 7;
mods |= META_VIRTUAL_SUPER_MASK;
mods |= CLUTTER_SUPER_MASK;
}
else
{
@ -294,16 +294,16 @@ accelerator_parse (const gchar *accelerator,
keycode = strtoul (accelerator, NULL, 16);
goto out;
}
else if (strcmp (accelerator, "Above_Tab") == 0)
else if (strcmp (accelerator, "Above_Tab") == 0)
{
keyval = META_KEY_ABOVE_TAB;
goto out;
}
else
{
{
keyval = xkb_keysym_from_name (accelerator, XKB_KEYSYM_CASE_INSENSITIVE);
if (keyval == XKB_KEY_NoSymbol)
{
if (keyval == XKB_KEY_NoSymbol)
{
char *with_xf86 = g_strconcat ("XF86", accelerator, NULL);
keyval = xkb_keysym_from_name (with_xf86, XKB_KEYSYM_CASE_INSENSITIVE);
g_free (with_xf86);
@ -311,14 +311,14 @@ accelerator_parse (const gchar *accelerator,
if (keyval == XKB_KEY_NoSymbol)
return FALSE;
}
}
}
accelerator += len;
len -= len;
}
}
out:
out:
combo->keysym = keyval;
combo->keycode = keycode;
combo->modifiers = mods;
@ -341,7 +341,7 @@ meta_parse_accelerator (const char *accel,
gboolean
meta_parse_modifier (const char *accel,
MetaVirtualModifier *mask)
ClutterModifierType *mask)
{
MetaKeyCombo combo = { 0 };
@ -363,9 +363,9 @@ meta_parse_modifier (const char *accel,
* meta_accelerator_name:
* @accelerator_mods: Accelerator modifier mask.
* @accelerator_key: Accelerator keyval.
*
*
* Convert an accelerator keyval and modifier mask into a string parsable by `meta_parse_accelerator`.
*
*
* Returns: The accelerator name.
*/
char *