isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-18 14:14:10 +00:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/keybindings-private.h
View File

@ -61,7 +61,7 @@ struct _MetaKeyCombo
{ {
unsigned int keysym; unsigned int keysym;
unsigned int keycode; unsigned int keycode;
MetaVirtualModifier modifiers; ClutterModifierType modifiers;
}; };
struct _MetaKeyBinding struct _MetaKeyBinding

26
src/core/keybindings.c
View File

@ -152,7 +152,7 @@ meta_key_binding_get_name (MetaKeyBinding *binding)
return binding->name; return binding->name;
} }
MetaVirtualModifier ClutterModifierType
meta_key_binding_get_modifiers (MetaKeyBinding *binding) meta_key_binding_get_modifiers (MetaKeyBinding *binding)
{ {
return binding->combo.modifiers; return binding->combo.modifiers;
@ -540,30 +540,30 @@ reload_iso_next_group_combos (MetaKeyBindingManager *keys)
static void static void
devirtualize_modifiers (MetaKeyBindingManager *keys, devirtualize_modifiers (MetaKeyBindingManager *keys,
MetaVirtualModifier modifiers, ClutterModifierType modifiers,
unsigned int *mask) unsigned int *mask)
{ {
*mask = 0; *mask = 0;
if (modifiers & META_VIRTUAL_SHIFT_MASK) if (modifiers & CLUTTER_SHIFT_MASK)
*mask |= ShiftMask; *mask |= ShiftMask;
if (modifiers & META_VIRTUAL_CONTROL_MASK) if (modifiers & CLUTTER_CONTROL_MASK)
*mask |= ControlMask; *mask |= ControlMask;
if (modifiers & META_VIRTUAL_ALT_MASK) if (modifiers & CLUTTER_MOD1_MASK)
*mask |= Mod1Mask; *mask |= Mod1Mask;
if (modifiers & META_VIRTUAL_META_MASK) if (modifiers & CLUTTER_META_MASK)
*mask |= keys->meta_mask; *mask |= keys->meta_mask;
if (modifiers & META_VIRTUAL_HYPER_MASK) if (modifiers & CLUTTER_HYPER_MASK)
*mask |= keys->hyper_mask; *mask |= keys->hyper_mask;
if (modifiers & META_VIRTUAL_SUPER_MASK) if (modifiers & CLUTTER_SUPER_MASK)
*mask |= keys->super_mask; *mask |= keys->super_mask;
if (modifiers & META_VIRTUAL_MOD2_MASK) if (modifiers & CLUTTER_MOD2_MASK)
*mask |= Mod2Mask; *mask |= Mod2Mask;
if (modifiers & META_VIRTUAL_MOD3_MASK) if (modifiers & CLUTTER_MOD3_MASK)
*mask |= Mod3Mask; *mask |= Mod3Mask;
if (modifiers & META_VIRTUAL_MOD4_MASK) if (modifiers & CLUTTER_MOD4_MASK)
*mask |= Mod4Mask; *mask |= Mod4Mask;
if (modifiers & META_VIRTUAL_MOD5_MASK) if (modifiers & CLUTTER_MOD5_MASK)
*mask |= Mod5Mask; *mask |= Mod5Mask;
} }
@ -1300,7 +1300,7 @@ static void
update_window_grab_modifiers (MetaDisplay *display) update_window_grab_modifiers (MetaDisplay *display)
{ {
MetaKeyBindingManager *keys = &display->key_binding_manager; MetaKeyBindingManager *keys = &display->key_binding_manager;
MetaVirtualModifier virtual_mods; ClutterModifierType virtual_mods;
unsigned int mods; unsigned int mods;
virtual_mods = meta_prefs_get_mouse_button_mods (); virtual_mods = meta_prefs_get_mouse_button_mods ();

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

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

2
src/core/meta-accel-parse.h
View File

@ -39,6 +39,6 @@ typedef struct _MetaKeyCombo MetaKeyCombo;
gboolean meta_parse_accelerator (const char *accel, gboolean meta_parse_accelerator (const char *accel,
MetaKeyCombo *combo); MetaKeyCombo *combo);
gboolean meta_parse_modifier (const char *accel, gboolean meta_parse_modifier (const char *accel,
MetaVirtualModifier *mask); ClutterModifierType *mask);
#endif /* META_ACCEL_PARSE_H */ #endif /* META_ACCEL_PARSE_H */

10
src/core/meta-pad-action-mapper.c
View File

@ -466,17 +466,17 @@ meta_pad_action_mapper_is_button_grabbed (MetaPadActionMapper *mapper,
static void static void
emulate_modifiers (ClutterVirtualInputDevice *device, emulate_modifiers (ClutterVirtualInputDevice *device,
MetaVirtualModifier mods, ClutterModifierType mods,
ClutterKeyState state) ClutterKeyState state)
{ {
guint i; guint i;
struct { struct {
MetaVirtualModifier mod; ClutterModifierType mod;
guint keyval; guint keyval;
} mod_map[] = { } mod_map[] = {
{ META_VIRTUAL_SHIFT_MASK, CLUTTER_KEY_Shift_L }, { CLUTTER_SHIFT_MASK, CLUTTER_KEY_Shift_L },
{ META_VIRTUAL_CONTROL_MASK, CLUTTER_KEY_Control_L }, { CLUTTER_CONTROL_MASK, CLUTTER_KEY_Control_L },
{ META_VIRTUAL_META_MASK, CLUTTER_KEY_Meta_L } { CLUTTER_META_MASK, CLUTTER_KEY_Meta_L }
}; };
for (i = 0; i < G_N_ELEMENTS (mod_map); i++) for (i = 0; i < G_N_ELEMENTS (mod_map); i++)

6
src/core/prefs.c
View File

@ -80,7 +80,7 @@ static GHashTable *settings_schemas;
static gboolean use_system_font = FALSE; static gboolean use_system_font = FALSE;
static PangoFontDescription *titlebar_font = NULL; static PangoFontDescription *titlebar_font = NULL;
static MetaVirtualModifier mouse_button_mods = Mod1Mask; static ClutterModifierType mouse_button_mods = CLUTTER_MOD1_MASK;
static MetaKeyCombo overlay_key_combo = { 0, 0, 0 }; static MetaKeyCombo overlay_key_combo = { 0, 0, 0 };
static MetaKeyCombo locate_pointer_key_combo = { 0, 0, 0 }; static MetaKeyCombo locate_pointer_key_combo = { 0, 0, 0 };
static GDesktopFocusMode focus_mode = G_DESKTOP_FOCUS_MODE_CLICK; static GDesktopFocusMode focus_mode = G_DESKTOP_FOCUS_MODE_CLICK;
@ -1162,7 +1162,7 @@ maybe_give_disable_workarounds_warning (void)
} }
} }
MetaVirtualModifier ClutterModifierType
meta_prefs_get_mouse_button_mods (void) meta_prefs_get_mouse_button_mods (void)
{ {
return mouse_button_mods; return mouse_button_mods;
@ -1278,7 +1278,7 @@ mouse_button_mods_handler (GVariant *value,
gpointer *result, gpointer *result,
gpointer data) gpointer data)
{ {
MetaVirtualModifier mods; ClutterModifierType mods;
const gchar *string_value; const gchar *string_value;
*result = NULL; /* ignored */ *result = NULL; /* ignored */

2
src/meta/keybindings.h
View File

@ -27,7 +27,7 @@ META_EXPORT
const char *meta_key_binding_get_name (MetaKeyBinding *binding); const char *meta_key_binding_get_name (MetaKeyBinding *binding);
META_EXPORT META_EXPORT
MetaVirtualModifier meta_key_binding_get_modifiers (MetaKeyBinding *binding); ClutterModifierType meta_key_binding_get_modifiers (MetaKeyBinding *binding);
META_EXPORT META_EXPORT
guint meta_key_binding_get_mask (MetaKeyBinding *binding); guint meta_key_binding_get_mask (MetaKeyBinding *binding);

2
src/meta/prefs.h
View File

@ -123,7 +123,7 @@ META_EXPORT
const char* meta_preference_to_string (MetaPreference pref); const char* meta_preference_to_string (MetaPreference pref);
META_EXPORT META_EXPORT
MetaVirtualModifier meta_prefs_get_mouse_button_mods (void); ClutterModifierType meta_prefs_get_mouse_button_mods (void);
META_EXPORT META_EXPORT
gint meta_prefs_get_mouse_button_resize (void); gint meta_prefs_get_mouse_button_resize (void);