s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tidy up keymap generation, add bounds check

Browse Source
This commit is contained in:
David Boddie
2019-07-23 00:17:25 +00:00
parent c475ed6619
commit 1010b916ef
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eek/eek-keyboard.c
View File

@ -850,7 +850,7 @@ eek_keyboard_get_keymap(EekKeyboard *keyboard)
/* Get the symbols for all the levels defined for the key, then /* Get the symbols for all the levels defined for the key, then
pad it out with the first symbol for all levels up to the fourth. */ pad it out with the first symbol for all levels up to the fourth. */
for (i = 0; i < matrix->num_levels; ++i) for (i = 0; (i < matrix->num_levels) && (i < 4); ++i)
syms[i] = eek_symbol_matrix_get_symbol(matrix, 0, i); syms[i] = eek_symbol_matrix_get_symbol(matrix, 0, i);
while (i < 4) { while (i < 4) {
@ -862,14 +862,12 @@ eek_keyboard_get_keymap(EekKeyboard *keyboard)
Generate strings for each of these groups, where an empty group is Generate strings for each of these groups, where an empty group is
treated specially. */ treated specially. */
gchar *groups[2]; gchar *groups[2] = {NULL, NULL};
for (i = 0, j = 0; i < 2; ++i, j += 2) { for (i = 0, j = 0; i < 2; ++i, j += 2) {
if (syms[j] && syms[j + 1]) if (syms[j] && syms[j + 1])
groups[i] = g_strjoin(", ", eek_symbol_get_name(syms[j]), groups[i] = g_strjoin(", ", eek_symbol_get_name(syms[j]),
eek_symbol_get_name(syms[j + 1]), eek_symbol_get_name(syms[j + 1]),
NULL); NULL);
else
groups[i] = "";
} }
/* Append a key definition to the symbols section. */ /* Append a key definition to the symbols section. */