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

Pick keyboard file in $(keyboarddir).

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-22 18:23:04 +09:00
parent d25bfd8ba7
commit 4271eb6b3e
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile.am
View File

@ -30,7 +30,8 @@ eekboard_CFLAGS = \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GCONF2_CFLAGS) \ $(GCONF2_CFLAGS) \
$(XKB_CFLAGS) \ $(XKB_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) $(LIBXKLAVIER_CFLAGS) \
-DKEYBOARDDIR=\"$(pkgdatadir)/keyboards\"
eekboard_LDADD = \ eekboard_LDADD = \
$(builddir)/libxklutil.la \ $(builddir)/libxklutil.la \

14
src/client-main.c
View File

@ -58,7 +58,7 @@ static const GOptionEntry options[] = {
N_("Listen keystroke events with AT-SPI")}, N_("Listen keystroke events with AT-SPI")},
#endif /* HAVE_CSPI */ #endif /* HAVE_CSPI */
{"keyboard", 'k', 0, G_OPTION_ARG_STRING, &opt_keyboard, {"keyboard", 'k', 0, G_OPTION_ARG_STRING, &opt_keyboard,
N_("Specify keyboard file")}, N_("Specify keyboard")},
{"model", '\0', 0, G_OPTION_ARG_STRING, &opt_model, {"model", '\0', 0, G_OPTION_ARG_STRING, &opt_model,
N_("Specify model")}, N_("Specify model")},
{"layouts", '\0', 0, G_OPTION_ARG_STRING, &opt_layouts, {"layouts", '\0', 0, G_OPTION_ARG_STRING, &opt_layouts,
@ -208,10 +208,18 @@ main (int argc, char **argv)
} }
if (opt_keyboard) { if (opt_keyboard) {
if (!eekboard_client_load_keyboard_from_file (client, opt_keyboard)) { gchar *file;
g_printerr ("Can't load keyboard\n");
if (g_str_has_suffix (opt_keyboard, ".xml"))
file = g_strdup (opt_keyboard);
else
file = g_strdup_printf ("%s/%s.xml", KEYBOARDDIR, opt_keyboard);
if (!eekboard_client_load_keyboard_from_file (client, file)) {
g_printerr ("Can't load keyboard file %s\n", file);
g_free (file);
exit (1); exit (1);
} }
g_free (file);
} else if (opt_model || opt_layouts || opt_options) { } else if (opt_model || opt_layouts || opt_options) {
if (!eekboard_client_set_xkl_config (client, if (!eekboard_client_set_xkl_config (client,
opt_model, opt_model,