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

keybindings: Add keycodes for keysym to a GArray

Browse Source 
We are going to need to call this function more than once to add
all the keycodes to the same GArray. Switch to handle GArrays and
rename the function in order to give a hint that keycodes are going
to be added to the passed GArray.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4050>
This commit is contained in:
Alessandro Bono
2024-09-26 00:01:22 +02:00
committed by Marge Bot
parent b145f659fb
commit 8172ecbf2a
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/keybindings.c
View File

@ -381,21 +381,18 @@ add_keysym_keycodes_from_layout (int keysym,
/* Original code from gdk_x11_keymap_get_entries_for_keyval() in /* Original code from gdk_x11_keymap_get_entries_for_keyval() in
* gdkkeys-x11.c */ * gdkkeys-x11.c */
static void static void
get_keycodes_for_keysym (MetaKeyBindingManager *keys, add_keycodes_for_keysym (MetaKeyBindingManager *keys,
int keysym, int keysym,
MetaResolvedKeyCombo *resolved_combo) GArray *keycodes)
{ {
unsigned int i; unsigned int i;
GArray *keycodes;
keycodes = g_array_new (FALSE, FALSE, sizeof (xkb_keysym_t));
/* Special-case: Fake mutter keysym */ /* Special-case: Fake mutter keysym */
if (keysym == META_KEY_ABOVE_TAB) if (keysym == META_KEY_ABOVE_TAB)
{ {
int keycode = KEY_GRAVE + 8; int keycode = KEY_GRAVE + 8;
g_array_append_val (keycodes, keycode); g_array_append_val (keycodes, keycode);
goto out; return;
} }
for (i = 0; i < G_N_ELEMENTS (keys->active_layouts); i++) for (i = 0; i < G_N_ELEMENTS (keys->active_layouts); i++)
@ -407,12 +404,6 @@ get_keycodes_for_keysym (MetaKeyBindingManager *keys,
add_keysym_keycodes_from_layout (keysym, layout, keycodes); add_keysym_keycodes_from_layout (keysym, layout, keycodes);
} }
out:
resolved_combo->len = keycodes->len;
resolved_combo->keycodes =
(xkb_keycode_t *) g_array_free (keycodes,
keycodes->len == 0 ? TRUE : FALSE);
} }
typedef struct _CalculateLayoutLevelsState typedef struct _CalculateLayoutLevelsState
@ -458,6 +449,7 @@ calculate_n_layout_levels (struct xkb_keymap *keymap,
static void static void
reload_iso_next_group_combos (MetaKeyBindingManager *keys) reload_iso_next_group_combos (MetaKeyBindingManager *keys)
{ {
GArray *keycodes;
const char *iso_next_group_option; const char *iso_next_group_option;
int i; int i;
@ -470,7 +462,12 @@ reload_iso_next_group_combos (MetaKeyBindingManager *keys)
if (iso_next_group_option == NULL) if (iso_next_group_option == NULL)
return; return;
get_keycodes_for_keysym (keys, XKB_KEY_ISO_Next_Group, keys->iso_next_group_combos); keycodes = g_array_new (FALSE, FALSE, sizeof (xkb_keysym_t));
add_keycodes_for_keysym (keys, XKB_KEY_ISO_Next_Group, keycodes);
keys->iso_next_group_combos[0].len = keycodes->len;
keys->iso_next_group_combos[0].keycodes =
(xkb_keycode_t *) g_array_free (keycodes,
keycodes->len == 0 ? TRUE : FALSE);
if (keys->iso_next_group_combos[0].len == 0) if (keys->iso_next_group_combos[0].len == 0)
return; return;
@ -607,20 +604,25 @@ resolve_key_combo (MetaKeyBindingManager *keys,
MetaKeyCombo *combo, MetaKeyCombo *combo,
MetaResolvedKeyCombo *resolved_combo) MetaResolvedKeyCombo *resolved_combo)
{ {
GArray *keycodes;
keycodes = g_array_new (FALSE, FALSE, sizeof (xkb_keysym_t));
resolved_key_combo_reset (resolved_combo); resolved_key_combo_reset (resolved_combo);
if (combo->keysym != 0) if (combo->keysym != 0)
{ {
get_keycodes_for_keysym (keys, combo->keysym, resolved_combo); add_keycodes_for_keysym (keys, combo->keysym, keycodes);
} }
else if (combo->keycode != 0) else if (combo->keycode != 0)
{ {
resolved_combo->keycodes = g_new0 (xkb_keycode_t, 1); g_array_append_val (keycodes, combo->keycode);
resolved_combo->keycodes[0] = combo->keycode;
resolved_combo->len = 1;
} }
resolved_combo->len = keycodes->len;
resolved_combo->keycodes =
(xkb_keycode_t *) g_array_free (keycodes,
keycodes->len == 0 ? TRUE : FALSE);
devirtualize_modifiers (keys, combo->modifiers, &resolved_combo->mask); devirtualize_modifiers (keys, combo->modifiers, &resolved_combo->mask);
} }