[mutter/bilelmoussaoui/gdk-x11-only: 5/6] core: Replace gtk_accelerator_parse usage
- From: Bilal Elmoussaoui <bilelmoussaoui src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/bilelmoussaoui/gdk-x11-only: 5/6] core: Replace gtk_accelerator_parse usage
- Date: Mon, 9 May 2022 09:49:22 +0000 (UTC)
commit 1c2ccdff75b48c9140718206137506eab61a22ff
Author: Bilal Elmoussaoui <belmouss redhat com>
Date: Mon May 9 11:38:06 2022 +0200
core: Replace gtk_accelerator_parse usage
src/core/meta-pad-action-mapper.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/core/meta-pad-action-mapper.c b/src/core/meta-pad-action-mapper.c
index dc43924b55..4e09708092 100644
--- a/src/core/meta-pad-action-mapper.c
+++ b/src/core/meta-pad-action-mapper.c
@@ -480,13 +480,17 @@ meta_pad_action_mapper_emulate_keybinding (MetaPadActionMapper *mapper,
gboolean is_press)
{
ClutterKeyState state;
- guint key, mods;
+ MetaKeyCombo combo = { 0 };
if (!accel || !*accel)
return;
/* FIXME: This is appalling */
- gtk_accelerator_parse (accel, &key, &mods);
+ if (!meta_parse_accelerator (accel, &combo)) {
+ meta_topic (META_DEBUG_KEYBINDINGS, "Failed to parse accelerator");
+ meta_warning ("\"%s\" is not a valid accelerator", accel);
+ return;
+ }
if (!mapper->virtual_pad_keyboard)
{
@@ -504,13 +508,13 @@ meta_pad_action_mapper_emulate_keybinding (MetaPadActionMapper *mapper,
state = is_press ? CLUTTER_KEY_STATE_PRESSED : CLUTTER_KEY_STATE_RELEASED;
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_get_current_event_time (),
- key, state);
+ combo.keysym, state);
if (!is_press)
- emulate_modifiers (mapper->virtual_pad_keyboard, mods, state);
+ emulate_modifiers (mapper->virtual_pad_keyboard, combo.modifiers, state);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]