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

core: Replace gtk_accelerator_parse usage

Browse Source 
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2407>
This commit is contained in:
Bilal Elmoussaoui 2022-05-09 11:38:06 +02:00
parent c710f14cc5
commit 809eaf6e91
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
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,
ClutterModifierType mods, MetaVirtualModifier mods,
ClutterKeyState state) ClutterKeyState state)
{ {
guint i; guint i;
struct { struct {
ClutterModifierType mod; MetaVirtualModifier mod;
guint keyval; guint keyval;
} mod_map[] = { } mod_map[] = {
{ CLUTTER_SHIFT_MASK, CLUTTER_KEY_Shift_L }, { META_VIRTUAL_SHIFT_MASK, CLUTTER_KEY_Shift_L },
{ CLUTTER_CONTROL_MASK, CLUTTER_KEY_Control_L }, { META_VIRTUAL_CONTROL_MASK, CLUTTER_KEY_Control_L },
{ CLUTTER_MOD1_MASK, CLUTTER_KEY_Meta_L } { META_VIRTUAL_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++)
@ -496,13 +496,16 @@ meta_pad_action_mapper_emulate_keybinding (MetaPadActionMapper *mapper,
gboolean is_press) gboolean is_press)
{ {
ClutterKeyState state; ClutterKeyState state;
guint key, mods; MetaKeyCombo combo = { 0 };
if (!accel || !*accel) if (!accel || !*accel)
return; return;
/* FIXME: This is appalling */ if (!meta_parse_accelerator (accel, &combo))
gtk_accelerator_parse (accel, &key, &mods); {
g_warning ("\"%s\" is not a valid accelerator", accel);
return;
}
if (!mapper->virtual_pad_keyboard) if (!mapper->virtual_pad_keyboard)
{ {
@ -520,13 +523,13 @@ meta_pad_action_mapper_emulate_keybinding (MetaPadActionMapper *mapper,
state = is_press ? CLUTTER_KEY_STATE_PRESSED : CLUTTER_KEY_STATE_RELEASED; state = is_press ? CLUTTER_KEY_STATE_PRESSED : CLUTTER_KEY_STATE_RELEASED;
if (is_press) if (is_press)
emulate_modifiers (mapper->virtual_pad_keyboard, mods, state); emulate_modifiers (mapper->virtual_pad_keyboard, combo.modifiers, state);
clutter_virtual_input_device_notify_keyval (mapper->virtual_pad_keyboard, clutter_virtual_input_device_notify_keyval (mapper->virtual_pad_keyboard,
clutter_get_current_event_time (), clutter_get_current_event_time (),
key, state); combo.keysym, state);
if (!is_press) if (!is_press)
emulate_modifiers (mapper->virtual_pad_keyboard, mods, state); emulate_modifiers (mapper->virtual_pad_keyboard, combo.modifiers, state);
} }
static gboolean static gboolean