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

Stash for sharing

Browse Source
This commit is contained in:
David Boddie
2019-07-14 19:16:34 +02:00
parent e5648a82a3
commit fbdc5f4a93
6 changed files with 335 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
eek/eek-xml-layout.c
View File

@ -249,7 +249,6 @@ struct _GeometryParseData {
gchar *name;
EekOutline outline;
gchar *oref;
gint keycode;
GHashTable *key_oref_hash;
GHashTable *oref_outline_hash;
@ -272,7 +271,6 @@ geometry_parse_data_new (EekKeyboard *keyboard)
g_str_equal,
g_free,
(GDestroyNotify)eek_outline_free);
data->keycode = 1;
return data;
}
@ -398,6 +396,18 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
}
if (g_strcmp0 (element_name, "key") == 0) {
guint keycode;
attribute = get_attribute (attribute_names, attribute_values,
"keycode");
if (attribute == NULL) {
g_set_error (error,
G_MARKUP_ERROR,
G_MARKUP_ERROR_MISSING_ATTRIBUTE,
"no \"keycode\" attribute for \"key\"");
return;
}
keycode = strtol (attribute, NULL, 10);
attribute = get_attribute (attribute_names, attribute_values,
"name");
@ -411,7 +421,7 @@ geometry_start_element_callback (GMarkupParseContext *pcontext,
data->key = eek_section_create_key (data->section,
g_strdup (attribute),
data->keycode++,
keycode,
data->num_columns,
data->num_rows - 1);