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

Fall back to US layout and keymap if needed

Browse Source
This commit is contained in:
David Boddie
2019-07-15 21:03:17 +02:00
parent 4e11d071d9
commit a8371af9c0
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
eekboard/eekboard-context-service.c
View File

@ -87,7 +87,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (EekboardContextService, eekboard_context_service, G_
/*static Display *display = NULL; */ /*static Display *display = NULL; */
gchar * gchar *
get_keymap_from_resource(const gchar *keyboard_type) get_keymap_from_resource(const gchar *keyboard_type, gboolean fallback)
{ {
g_autoptr (GFile) file = NULL; g_autoptr (GFile) file = NULL;
g_autoptr (GFileInfo) info = NULL; g_autoptr (GFileInfo) info = NULL;
@ -98,6 +98,9 @@ get_keymap_from_resource(const gchar *keyboard_type)
g_autofree gchar *path = NULL; g_autofree gchar *path = NULL;
GError *error = NULL; GError *error = NULL;
if (fallback)
g_debug ("falling back to loading a %s keymap", keyboard_type);
path = g_strconcat ("resource:///sm/puri/squeekboard/keyboards/keymaps/", path = g_strconcat ("resource:///sm/puri/squeekboard/keyboards/keymaps/",
keyboard_type, ".xkb", NULL); keyboard_type, ".xkb", NULL);
file = g_file_new_for_uri (path); file = g_file_new_for_uri (path);
@ -124,7 +127,9 @@ get_keymap_from_resource(const gchar *keyboard_type)
return g_utf8_make_valid (contents, -1); return g_utf8_make_valid (contents, -1);
keymap_error: keymap_error:
if (fallback)
g_error ("failed to load keymap from resource: %s", error->message); g_error ("failed to load keymap from resource: %s", error->message);
g_error_free (error); g_error_free (error);
return NULL; return NULL;
} }
@ -192,17 +197,22 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
struct xkb_rule_names rules = { 0 }; struct xkb_rule_names rules = { 0 };
rules.layout = strdup(keyboard_type); rules.layout = strdup(keyboard_type);
*/ */
struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, char *keymap_str = get_keymap_from_resource(keyboard_type, FALSE);
get_keymap_from_resource(keyboard_type), if (!keymap_str)
keymap_str = get_keymap_from_resource("us", TRUE);
struct xkb_keymap *keymap = xkb_keymap_new_from_string(context, keymap_str,
XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS); XKB_KEYMAP_FORMAT_TEXT_V1, XKB_KEYMAP_COMPILE_NO_FLAGS);
free(keymap_str);
xkb_context_unref(context); xkb_context_unref(context);
if (!keymap) { if (!keymap) {
g_error("Bad keymap"); g_error("Bad keymap");
} }
keyboard->keymap = keymap; keyboard->keymap = keymap;
char *keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1); keymap_str = xkb_keymap_get_as_string(keymap, XKB_KEYMAP_FORMAT_TEXT_V1);
keyboard->keymap_len = strlen(keymap_str) + 1; keyboard->keymap_len = strlen(keymap_str) + 1;
g_autofree char *path = strdup("/eek_keymap-XXXXXX"); g_autofree char *path = strdup("/eek_keymap-XXXXXX");