From 6454b58cc7b54346b4af2177cca069a53a89d065 Mon Sep 17 00:00:00 2001 From: Roman Moravcik Date: Fri, 30 Oct 2009 09:49:56 +0100 Subject: [PATCH] ukeyboard updated to version 2.0 --- debian/patches/02_ukeyboard_installonly_sk.dpatch | 12 +- debian/slovak-l10n.postinst | 3 +- debian/slovak-l10n.postrm | 2 +- ukeyboard/Makefile | 3 +- ukeyboard/VERSION | 2 +- ukeyboard/cpanel/Makefile | 12 +- ukeyboard/cpanel/about.c | 28 +- ukeyboard/cpanel/about.inc.in | 1 + ukeyboard/cpanel/hw.c | 67 +---- ukeyboard/cpanel/lang.c | 142 +-------- ukeyboard/cpanel/langset.c | 133 +-------- ukeyboard/cpanel/langset.h | 5 - ukeyboard/cpanel/onscreen.c | 103 +------ ukeyboard/cpanel/prefs.c | 65 +--- ukeyboard/cpanel/prefs.h | 2 - ukeyboard/debian/changelog | 9 + ukeyboard/debian/rules | 5 +- ukeyboard/debian/ukeyboard.postinst | 3 +- ukeyboard/debian/ukeyboard.postrm | 2 +- ukeyboard/keyboards-scv/Makefile | 1 - ukeyboard/keyboards-scv/cz-qwerty.def | 80 ----- ukeyboard/keyboards-scv/cz-qwertz.def | 1 - ukeyboard/keyboards/Makefile | 1 - ukeyboard/keyboards/cz-qwerty.def | 332 --------------------- ukeyboard/keyboards/cz-qwertz.def | 332 --------------------- ukeyboard/ukbdcreator/Makefile | 2 +- ukeyboard/ukbdcreator/version.h | 1 - ukeyboard/xkb/ukbdrx44 | 304 ------------------- ukeyboard/xkb/ukbdrx51 | 40 --- ukeyboard/xkb/ukeyboard | 40 +++ 30 files changed, 84 insertions(+), 1649 deletions(-) delete mode 100644 ukeyboard/keyboards-scv/cz-qwerty.def delete mode 120000 ukeyboard/keyboards-scv/cz-qwertz.def delete mode 100644 ukeyboard/keyboards/cz-qwerty.def delete mode 100644 ukeyboard/keyboards/cz-qwertz.def delete mode 100644 ukeyboard/ukbdcreator/version.h delete mode 100644 ukeyboard/xkb/ukbdrx44 delete mode 100644 ukeyboard/xkb/ukbdrx51 create mode 100644 ukeyboard/xkb/ukeyboard diff --git a/debian/patches/02_ukeyboard_installonly_sk.dpatch b/debian/patches/02_ukeyboard_installonly_sk.dpatch index b1fd98c..8291e7e 100755 --- a/debian/patches/02_ukeyboard_installonly_sk.dpatch +++ b/debian/patches/02_ukeyboard_installonly_sk.dpatch @@ -8,13 +8,12 @@ diff -Naur slovak-l10n/ukeyboard/keyboards/Makefile slovak-l10n/ukeyboard/keyboards/Makefile --- slovak-l10n/ukeyboard/keyboards/Makefile 2008-12-30 13:49:12.000000000 +0100 +++ slovak-l10n/ukeyboard/keyboards/Makefile 2009-10-09 14:03:31.000000000 +0200 -@@ -1,17 +1,5 @@ +@@ -1,16 +1,5 @@ layouts = \ - ar-lebanon.vkb \ - be-by.vkb \ - bg-bds.vkb \ - bg-phonetic.vkb \ -- cz-qwerty.vkb cz-qwertz.vkb \ - en-dvorak.vkb \ - eo-qwerty.vkb \ - he-qwerty.vkb \ @@ -30,13 +29,12 @@ diff -Naur slovak-l10n/ukeyboard/keyboards/Makefile slovak-l10n/ukeyboard/keyboa diff -Naur slovak-l10n/ukeyboard/Makefile slovak-l10n/ukeyboard/Makefile --- slovak-l10n/ukeyboard/Makefile 2009-10-09 11:14:35.000000000 +0200 +++ slovak-l10n/ukeyboard/Makefile 2009-10-09 14:03:15.000000000 +0200 -@@ -24,9 +24,6 @@ - install: ukeyboard-prefs keyboards-scv +@@ -25,8 +25,6 @@ $(MAKE) -C cpanel DESTDIR=$(DESTDIR) install $(MAKE) -C keyboards DESTDIR=$(DESTDIR) install -- $(MAKE) -C keyboards-scv DESTDIR=$(DESTDIR) install + $(MAKE) -C keyboards-scv DESTDIR=$(DESTDIR) install - install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps - install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/ install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr - install -m 0644 xkb/ukbdrx44 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ - install -m 0644 xkb/ukbdrx51 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ + install -m 0644 xkb/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ + diff --git a/debian/slovak-l10n.postinst b/debian/slovak-l10n.postinst index a4c8d95..813f837 100755 --- a/debian/slovak-l10n.postinst +++ b/debian/slovak-l10n.postinst @@ -1,8 +1,7 @@ #!/bin/sh if ! grep -q ukeyboard /usr/share/X11/xkb/rules/base; then - sed -i 's/^.*nokiarx44.*$/\0\n ukbdrx44 * = nokia_vndr\/ukbdrx44(%l)/' /usr/share/X11/xkb/rules/base - sed -i 's/^.*nokiarx51.*$/\0\n ukbdrx51 * = nokia_vndr\/ukbdrx51(%l)/' /usr/share/X11/xkb/rules/base + sed -i 's/^.*nokiarx44.*$/\0\n ukeyboard * = nokia_vndr\/ukeyboard(%l)/' /usr/share/X11/xkb/rules/base fi if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop ]; then diff --git a/debian/slovak-l10n.postrm b/debian/slovak-l10n.postrm index d47fe20..53ebd3f 100755 --- a/debian/slovak-l10n.postrm +++ b/debian/slovak-l10n.postrm @@ -1,6 +1,6 @@ #!/bin/sh -sed -ni '/ukbd/!p' /usr/share/X11/xkb/rules/base +sed -ni '/ukeyboard/!p' /usr/share/X11/xkb/rules/base if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed ]; then mv -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed /usr/share/applications/hildon-control-panel/cptextinput.desktop diff --git a/ukeyboard/Makefile b/ukeyboard/Makefile index 54ba2e3..7696a3f 100644 --- a/ukeyboard/Makefile +++ b/ukeyboard/Makefile @@ -28,8 +28,7 @@ install: ukeyboard-prefs keyboards-scv install -d $(DESTDIR)/usr/share/icons/hicolor/26x26/apps install -m 0644 ukeyboard.png $(DESTDIR)/usr/share/icons/hicolor/26x26/apps/ install -d $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr - install -m 0644 xkb/ukbdrx44 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ - install -m 0644 xkb/ukbdrx51 $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ + install -m 0644 xkb/ukeyboard $(DESTDIR)/usr/share/X11/xkb/symbols/nokia_vndr/ clean: $(MAKE) -C cpanel clean diff --git a/ukeyboard/VERSION b/ukeyboard/VERSION index 2e0e38c..cd5ac03 100644 --- a/ukeyboard/VERSION +++ b/ukeyboard/VERSION @@ -1 +1 @@ -1.9 +2.0 diff --git a/ukeyboard/cpanel/Makefile b/ukeyboard/cpanel/Makefile index feb93c4..98895b0 100644 --- a/ukeyboard/cpanel/Makefile +++ b/ukeyboard/cpanel/Makefile @@ -4,22 +4,22 @@ libukeyboard-prefs.so: prefs.o hw.o onscreen.o lang.o langset.o about.o add_cflags = `pkg-config --cflags gtk+-2.0 hildon-1 gconf-2.0 libosso` prefs.o: prefs.c - $(CC) -c -W -Wall $(CFLAGS) `pkg-config --cflags gtk+-2.0 gconf-2.0 hildon-control-panel libosso` -o $@ $< + $(CC) -c -W -Wall `pkg-config --cflags gtk+-2.0 gconf-2.0 hildon-control-panel libosso` -o $@ $< hw.o: hw.c - $(CC) -c -W -Wall $(CFLAGS) $(add_cflags) -o $@ $< + $(CC) -c -W -Wall $(add_cflags) -o $@ $< onscreen.o: onscreen.c - $(CC) -c -W -Wall $(CFLAGS) $(add_cflags) -o $@ $< + $(CC) -c -W -Wall $(add_cflags) -o $@ $< lang.o: lang.c - $(CC) -c -W -Wall $(CFLAGS) $(add_cflags) -o $@ $< + $(CC) -c -W -Wall $(add_cflags) -o $@ $< langset.o: langset.c - $(CC) -c -W -Wall $(CFLAGS) $(add_cflags) -o $@ $< + $(CC) -c -W -Wall $(add_cflags) -o $@ $< about.o: about.c about.inc - $(CC) -c -W -Wall $(CFLAGS) $(add_cflags) -o $@ $< + $(CC) -c -W -Wall $(add_cflags) -o $@ $< about.inc: about.inc.in # for f in ../keyboards/*; do \ diff --git a/ukeyboard/cpanel/about.c b/ukeyboard/cpanel/about.c index d8b21f3..c3c9e9e 100644 --- a/ukeyboard/cpanel/about.c +++ b/ukeyboard/cpanel/about.c @@ -20,53 +20,27 @@ #include #include #include +#include #include #include #include #include "prefs.h" #include "hw.h" -#ifdef HAVE_MAEMO5 -#include -#else - -static gboolean label_focus(GtkWidget *widget, GtkDirectionType arg, gpointer data) -{ - (void)arg; (void)data; - gtk_label_select_region(GTK_LABEL(widget), 0, 0); - return TRUE; -} -#endif - static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) { -#ifdef HAVE_MAEMO5 GtkWidget *scroll; -#else - GtkScrolledWindow *scroll; -#endif GtkWidget *label; (void)client; (void)win; -#ifdef HAVE_MAEMO5 scroll = hildon_pannable_area_new(); -#else - scroll = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL, NULL)); - gtk_scrolled_window_set_policy(scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); -#endif label = gtk_label_new(NULL); gtk_label_set_markup(GTK_LABEL(label), #include "about.inc" ); -#ifdef HAVE_MAEMO5 hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA(scroll), label); -#else - gtk_label_set_selectable(GTK_LABEL(label), TRUE); - g_signal_connect(G_OBJECT(label), "focus", G_CALLBACK(label_focus), NULL); - gtk_scrolled_window_add_with_viewport(scroll, label); -#endif *data = NULL; return GTK_WIDGET(scroll); } diff --git a/ukeyboard/cpanel/about.inc.in b/ukeyboard/cpanel/about.inc.in index cfc3235..bc22ca4 100644 --- a/ukeyboard/cpanel/about.inc.in +++ b/ukeyboard/cpanel/about.inc.in @@ -3,6 +3,7 @@ http://upir.cz/maemo/keyboards\n\ Distributed under GPLv2.\n\ Author: Jiří Benc <jbenc@upir.cz>\n\ + Roman Moravčík <roman.moravcik@gmail.com>\n\ \n\ Contributors:\n\ @@CONTRIB@@ diff --git a/ukeyboard/cpanel/hw.c b/ukeyboard/cpanel/hw.c index 7118c06..15c40d4 100644 --- a/ukeyboard/cpanel/hw.c +++ b/ukeyboard/cpanel/hw.c @@ -21,18 +21,15 @@ #include #include #include +#include #include #include #include #include "prefs.h" #include "hw.h" -#ifdef HAVE_MAEMO5 #define GETTEXT_PACKAGE "osso-applet-textinput" - -#include #include -#endif struct layout { gchar *model; @@ -42,11 +39,7 @@ struct layout { struct data { GList *layouts; -#ifdef HAVE_MAEMO5 HildonTouchSelector *combo; -#else - GtkComboBox *combo; -#endif }; static char *strip(char *s) @@ -132,7 +125,6 @@ static void free_layouts(GList *list) g_list_free(list); } -#ifdef HAVE_MAEMO5 static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) { struct data *d; @@ -155,7 +147,7 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) omodel = get_str(client, "int_kb_model"); olayout = get_str(client, "int_kb_layout"); d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/rx-51", "nokiarx51", NULL); - d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukbdrx51", "ukbdrx51", d->layouts); + d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukeyboard", "ukeyboard", d->layouts); d->combo = HILDON_TOUCH_SELECTOR(hildon_touch_selector_new_text()); @@ -182,57 +174,6 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) return button; } -#else -static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) -{ - struct data *d; - GList *item; - gchar *omodel, *olayout; - struct layout *lay; - unsigned i; - - GtkBox *vbox; - GtkSizeGroup *group; - GtkWidget *align; - - (void)win; - - if (!internal_kbd) { - *data = NULL; - return NULL; - } - - d = g_malloc(sizeof(struct data)); - - omodel = get_str(client, "int_kb_model"); - olayout = get_str(client, "int_kb_layout"); - d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/rx-44", "nokiarx44", NULL); - d->layouts = get_layouts("/usr/share/X11/xkb/symbols/nokia_vndr/ukbdrx44", "ukbdrx44", d->layouts); - - vbox = GTK_BOX(gtk_vbox_new(FALSE, 0)); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - d->combo = GTK_COMBO_BOX(gtk_combo_box_new_text()); - for (item = d->layouts, i = 0; item; item = g_list_next(item), i++) { - lay = item->data; - gtk_combo_box_append_text(d->combo, lay->name); - if (omodel && olayout && !strcmp(lay->model, omodel) && !strcmp(lay->layout, olayout)) - gtk_combo_box_set_active(d->combo, i); - } - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Keyboard layout", - GTK_WIDGET(d->combo), NULL, HILDON_CAPTION_MANDATORY)); - - g_free(olayout); - g_free(omodel); - g_object_unref(G_OBJECT(group)); - - *data = d; - - align = gtk_alignment_new(0, 0, 1, 0); - gtk_container_add(GTK_CONTAINER(align), GTK_WIDGET(vbox)); - return align; -} -#endif static void action(GConfClient *client, void *data) { @@ -242,11 +183,7 @@ static void action(GConfClient *client, void *data) if (!d) return; -#ifdef HAVE_MAEMO5 res = hildon_touch_selector_get_active(d->combo, 0); -#else - res = gtk_combo_box_get_active(d->combo); -#endif if (res >= 0) { lay = g_list_nth_data(d->layouts, res); if (lay) { diff --git a/ukeyboard/cpanel/lang.c b/ukeyboard/cpanel/lang.c index c1364b4..828088f 100644 --- a/ukeyboard/cpanel/lang.c +++ b/ukeyboard/cpanel/lang.c @@ -24,21 +24,17 @@ #include #include #include +#include #include #include #include - -#ifdef HAVE_MAEMO5 -#define GETTEXT_PACKAGE "osso-applet-textinput" - -#include -#include -#endif - #include "prefs.h" #include "lang.h" #include "langset.h" +#define GETTEXT_PACKAGE "osso-applet-textinput" +#include + struct langlink { gchar *src; gchar *dest; @@ -49,7 +45,6 @@ struct data { GtkWidget *win; GList *langs; GList *langlinks; -#ifdef HAVE_MAEMO5 HildonCheckButton *word_compl; HildonCheckButton *auto_cap; HildonCheckButton *sp_after; @@ -57,11 +52,6 @@ struct data { HildonTouchSelector *langsel[2]; HildonTouchSelector *dictsel[2]; HildonCheckButton *dual; -#else - GtkComboBox *langsel[2]; - GtkButton *settings[2]; - GtkToggleButton *dual; -#endif int num_langs; }; @@ -243,7 +233,6 @@ static void free_langlinks(GList *list) g_list_free(list); } -#ifdef HAVE_MAEMO5 static void fill_langsel(HildonTouchSelector *combo, GList *langs, struct lang *deflang, gboolean empty) { GList *item; @@ -262,32 +251,11 @@ static void fill_langsel(HildonTouchSelector *combo, GList *langs, struct lang * hildon_touch_selector_set_active(combo, 0, i); } } -#else -static void fill_langsel(GtkComboBox *combo, GList *langs, struct lang *deflang, gboolean empty) -{ - GList *item; - struct lang *lang; - unsigned i; - - for (item = langs, i = 0; item; item = g_list_next(item), i++) { - lang = item->data; - gtk_combo_box_append_text(combo, lang->desc); - if (lang == deflang) - gtk_combo_box_set_active(combo, i); - } - if (empty) { - gtk_combo_box_append_text(combo, ""); - if (!deflang) - gtk_combo_box_set_active(combo, i); - } -} -#endif static void sensitivity_langsel(struct data *d) { gboolean sens; -#ifdef HAVE_MAEMO5 sens = (hildon_touch_selector_get_active(d->langsel[1], 0) < d->num_langs); gtk_widget_set_sensitive(GTK_WIDGET(d->dual), sens); @@ -295,15 +263,8 @@ static void sensitivity_langsel(struct data *d) gtk_widget_show(GTK_WIDGET(d->sec_dictsel)); else gtk_widget_hide(GTK_WIDGET(d->sec_dictsel)); -#else - sens = (gtk_combo_box_get_active(d->langsel[1]) < d->num_langs); - gtk_widget_set_sensitive(GTK_WIDGET(d->settings[1]), sens); - gtk_widget_set_sensitive(GTK_WIDGET(d->dual), sens); -#endif } - -#ifdef HAVE_MAEMO5 static void verify_langsel(HildonTouchSelector *combo, gint column, struct data *d) { struct lang *lang[2]; @@ -322,36 +283,7 @@ static void verify_langsel(HildonTouchSelector *combo, gint column, struct data } sensitivity_langsel(d); } -#else -static void verify_langsel(GtkComboBox *combo, struct data *d) -{ - struct lang *lang[2]; - int res; - unsigned i; - (void)combo; - for (i = 0; i < 2; i++) { - res = gtk_combo_box_get_active(d->langsel[i]); - lang[i] = (res >= 0) ? g_list_nth_data(d->langs, res) : NULL; - } - if (lang[0] && lang[1] && !strcmp(lang[0]->code, lang[1]->code)) { - hildon_banner_show_information(d->win, "gtk-dialog-error", - "Impossible combination of languages"); - gtk_combo_box_set_active(d->langsel[1], d->num_langs); - } - sensitivity_langsel(d); -} - -static void do_settings(GtkButton *button, struct data *d) -{ - int which; - - which = (button == d->settings[0]) ? 0 : 1; - lang_settings(d->client, d->win, d->langs, gtk_combo_box_get_active(d->langsel[which])); -} -#endif - -#ifdef HAVE_MAEMO5 static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) { struct data *d; @@ -446,61 +378,6 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) return vbox; } -#else -static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) -{ - struct data *d; - gchar *tmp; - GtkBox *vbox; - GtkSizeGroup *group; - GtkWidget *align; - unsigned i; - - d = g_new0(struct data, 1); - d->client = client; - d->win = win; - - d->langs = get_langs("/usr/share/keyboards", &d->langlinks, NULL); - d->langs = get_langs("/usr/share/ukeyboard", NULL, d->langs); - d->num_langs = g_list_length(d->langs); - - vbox = GTK_BOX(gtk_vbox_new(FALSE, 0)); - gtk_box_set_spacing(vbox, 5); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - for (i = 0; i < 2; i++) { - d->langsel[i] = GTK_COMBO_BOX(gtk_combo_box_new_text()); - - tmp = get_lang(client, i); - fill_langsel(d->langsel[i], d->langs, get_def_lang(tmp, d->langs, d->langlinks), i == 1); - if (tmp) - g_free(tmp); - - g_signal_connect(G_OBJECT(d->langsel[i]), "changed", G_CALLBACK(verify_langsel), d); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, i == 0 ? "1st language" : "2nd language", - GTK_WIDGET(d->langsel[i]), NULL, HILDON_CAPTION_MANDATORY)); - - d->settings[i] = GTK_BUTTON(gtk_button_new_with_label("Settings")); - g_signal_connect(G_OBJECT(d->settings[i]), "clicked", G_CALLBACK(do_settings), d); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, NULL, - GTK_WIDGET(d->settings[i]), NULL, HILDON_CAPTION_OPTIONAL)); - } - - d->dual = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(d->dual, get_bool(client, "dual-dictionary")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Use dual dictionaries", - GTK_WIDGET(d->dual), NULL, HILDON_CAPTION_MANDATORY)); - - sensitivity_langsel(d); - - g_object_unref(G_OBJECT(group)); - *data = d; - - align = gtk_alignment_new(0, 0, 1, 0); - gtk_container_add(GTK_CONTAINER(align), GTK_WIDGET(vbox)); - return align; -} -#endif static void action(GConfClient *client, void *data) { @@ -511,13 +388,9 @@ static void action(GConfClient *client, void *data) unsigned i; for (i = 0; i < 2; i++) { -#ifdef HAVE_MAEMO5 struct lang *dict; res = hildon_touch_selector_get_active(d->langsel[i], 0); -#else - res = gtk_combo_box_get_active(d->langsel[i]); -#endif if (res < 0) continue; lang = g_list_nth_data(d->langs, res); @@ -535,7 +408,7 @@ static void action(GConfClient *client, void *data) * that by setting "en_GB" lang code first. */ set_lang(client, i, "en_GB"); set_lang(client, i, lang->code); -#ifdef HAVE_MAEMO5 + set_l_bool(client, lang->code, "auto-capitalisation", hildon_check_button_get_active(d->auto_cap)); set_l_bool(client, lang->code, "word-completion", hildon_check_button_get_active(d->word_compl)); set_l_bool(client, lang->code, "insert-space-after-word", hildon_check_button_get_active(d->sp_after)); @@ -548,15 +421,10 @@ static void action(GConfClient *client, void *data) set_l_str(client, lang->code, "dictionary", dict->code); else set_l_str(client, lang->code, "dictionary", ""); -#endif } else set_lang(client, i, ""); } -#ifdef HAVE_MAEMO5 set_bool(client, "dual-dictionary", hildon_check_button_get_active(d->dual)); -#else - set_bool(client, "dual-dictionary", gtk_toggle_button_get_active(d->dual)); -#endif } static void stop(GConfClient *client, void *data) diff --git a/ukeyboard/cpanel/langset.c b/ukeyboard/cpanel/langset.c index 32c88a3..d001e2b 100644 --- a/ukeyboard/cpanel/langset.c +++ b/ukeyboard/cpanel/langset.c @@ -21,28 +21,20 @@ #include #include #include +#include #include #include #include - -#ifdef HAVE_MAEMO5 -#define GETTEXT_PACKAGE "osso-applet-textinput" - -#include -#include -#endif - #include "prefs.h" #include "lang.h" #include "langset.h" +#define GETTEXT_PACKAGE "osso-applet-textinput" +#include + #define L_CONF_DIR "/apps/osso/inputmethod/hildon-im-languages" -#ifdef HAVE_MAEMO5 gboolean get_l_bool(GConfClient *client, char *lang, char *key) -#else -static gboolean get_l_bool(GConfClient *client, char *lang, char *key) -#endif { char *tmp = g_strjoin("/", L_CONF_DIR, lang, key, NULL); gboolean res; @@ -52,11 +44,7 @@ static gboolean get_l_bool(GConfClient *client, char *lang, char *key) return res; } -#ifdef HAVE_MAEMO5 void set_l_bool(GConfClient *client, char *lang, char *key, gboolean val) -#else -static void set_l_bool(GConfClient *client, char *lang, char *key, gboolean val) -#endif { char *tmp = g_strjoin("/", L_CONF_DIR, lang, key, NULL); @@ -66,11 +54,7 @@ static void set_l_bool(GConfClient *client, char *lang, char *key, gboolean val) g_free(tmp); } -#ifdef HAVE_MAEMO5 gchar *get_l_str(GConfClient *client, char *lang, char *key) -#else -static gchar *get_l_str(GConfClient *client, char *lang, char *key) -#endif { char *tmp = g_strjoin("/", L_CONF_DIR, lang, key, NULL); GConfValue *val; @@ -89,11 +73,7 @@ static gchar *get_l_str(GConfClient *client, char *lang, char *key) return res; } -#ifdef HAVE_MAEMO5 void set_l_str(GConfClient *client, char *lang, char *key, gchar *val) -#else -static void set_l_str(GConfClient *client, char *lang, char *key, gchar *val) -#endif { char *tmp = g_strjoin("/", L_CONF_DIR, lang, key, NULL); @@ -101,7 +81,6 @@ static void set_l_str(GConfClient *client, char *lang, char *key, gchar *val) g_free(tmp); } -#ifdef HAVE_MAEMO5 void fill_dict(HildonTouchSelector *combo, GList *langs, gchar *deflang) { GList *item; @@ -121,107 +100,3 @@ void fill_dict(HildonTouchSelector *combo, GList *langs, gchar *deflang) if (!deflang || !*deflang) hildon_touch_selector_set_active(combo, 0, i); } -#else -static void fill_dict(GtkComboBox *combo, GList *langs, gchar *deflang) -{ - GList *item; - struct lang *lang; - unsigned i; - - for (item = langs, i = 0; item; item = g_list_next(item)) { - lang = item->data; - if (lang->ext) - continue; - gtk_combo_box_append_text(combo, lang->desc); - if (deflang && !strcmp(lang->code, deflang)) - gtk_combo_box_set_active(combo, i); - i++; - } - gtk_combo_box_append_text(combo, "Custom/Empty"); - if (!deflang || !*deflang) - gtk_combo_box_set_active(combo, i); -} - -void lang_settings(GConfClient *client, GtkWidget *win, GList *langs, int n) -{ - GtkDialog *dialog; - GtkBox *vbox; - GtkSizeGroup *group; - GtkToggleButton *auto_cap, *word_compl, *word_pred, *sp_after; - GtkComboBox *dict; - struct lang *lang; - gchar *code, *tmp; - int res; - - if (n < 0) - return; - lang = g_list_nth_data(langs, n); - if (!lang) - return; - code = lang->code; - - dialog = GTK_DIALOG(gtk_dialog_new()); - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(win)); - tmp = g_strconcat("On-screen text input: ", lang->desc, NULL); - gtk_window_set_title(GTK_WINDOW(dialog), tmp); - g_free(tmp); - gtk_dialog_set_has_separator(dialog, FALSE); - gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); - - gtk_dialog_add_action_widget(dialog, gtk_button_new_with_label("OK"), GTK_RESPONSE_ACCEPT); - gtk_dialog_add_action_widget(dialog, gtk_button_new_with_label("Cancel"), GTK_RESPONSE_REJECT); - - vbox = GTK_BOX(gtk_vbox_new(FALSE, 0)); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - auto_cap = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(auto_cap, get_l_bool(client, code, "auto-capitalisation")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Auto-capitalisation", - GTK_WIDGET(auto_cap), NULL, HILDON_CAPTION_MANDATORY)); - - word_compl = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(word_compl, get_l_bool(client, code, "word-completion")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Word completion", - GTK_WIDGET(word_compl), NULL, HILDON_CAPTION_MANDATORY)); - - word_pred = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(word_pred, get_l_bool(client, code, "next-word-prediction")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Next word prediction", - GTK_WIDGET(word_pred), NULL, HILDON_CAPTION_MANDATORY)); - - sp_after = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(sp_after, get_l_bool(client, code, "insert-space-after-word")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Insert space after word", - GTK_WIDGET(sp_after), NULL, HILDON_CAPTION_MANDATORY)); - - dict = GTK_COMBO_BOX(gtk_combo_box_new_text()); - tmp = get_l_str(client, code, "dictionary"); - /* If tmp is NULL (i.e. the gconf key is unset), try to use the same - * dictionary as the keyboard. But don't do this if the keyboard is - * from our package. */ - fill_dict(dict, langs, (tmp || lang->ext) ? tmp : code); - if (tmp) - g_free(tmp); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Dictionary", - GTK_WIDGET(dict), NULL, HILDON_CAPTION_MANDATORY)); - - g_object_unref(G_OBJECT(group)); - - gtk_container_add(GTK_CONTAINER(dialog->vbox), GTK_WIDGET(vbox)); - gtk_widget_show_all(GTK_WIDGET(dialog)); - res = gtk_dialog_run(dialog); - if (res == GTK_RESPONSE_ACCEPT) { - set_l_bool(client, code, "auto-capitalisation", gtk_toggle_button_get_active(auto_cap)); - set_l_bool(client, code, "word-completion", gtk_toggle_button_get_active(word_compl)); - set_l_bool(client, code, "next-word-prediction", gtk_toggle_button_get_active(word_pred)); - set_l_bool(client, code, "insert-space-after-word", gtk_toggle_button_get_active(sp_after)); - res = gtk_combo_box_get_active(dict); - if (res >= 0) { - lang = g_list_nth_data(langs, res); - tmp = (lang && !lang->ext) ? lang->code : ""; - set_l_str(client, code, "dictionary", tmp); - } - } - gtk_widget_destroy(GTK_WIDGET(dialog)); -} -#endif diff --git a/ukeyboard/cpanel/langset.h b/ukeyboard/cpanel/langset.h index 159a992..93b7f29 100644 --- a/ukeyboard/cpanel/langset.h +++ b/ukeyboard/cpanel/langset.h @@ -19,15 +19,10 @@ #ifndef _LANGSET_H #define _LANGSET_H -#ifdef HAVE_MAEMO5 gboolean get_l_bool(GConfClient *client, char *lang, char *key); void set_l_bool(GConfClient *client, char *lang, char *key, gboolean val); gchar *get_l_str(GConfClient *client, char *lang, char *key); void set_l_str(GConfClient *client, char *lang, char *key, gchar *val); - void fill_dict(HildonTouchSelector *combo, GList *langs, gchar *deflang); -#else -void lang_settings(GConfClient *client, GtkWidget *win, GList *langs, int n); -#endif #endif diff --git a/ukeyboard/cpanel/onscreen.c b/ukeyboard/cpanel/onscreen.c index 332a1ea..6e1df6c 100644 --- a/ukeyboard/cpanel/onscreen.c +++ b/ukeyboard/cpanel/onscreen.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -29,51 +30,13 @@ #include "prefs.h" #include "onscreen.h" -#ifdef HAVE_MAEMO5 #define GETTEXT_PACKAGE "osso-applet-textinput" - -#include #include -#endif struct data { -#ifdef HAVE_MAEMO5 HildonCheckButton *use_finger; -#else - GtkToggleButton *stylus_im; - GtkToggleButton *use_finger; - GtkToggleButton *use_finger_sel; - GtkToggleButton *case_corr; - HildonControlbar *hand_speed; -#endif }; -#ifndef HAVE_MAEMO5 -static gint get_hand_speed(GConfClient *client) -{ - /* 150 300 400 600 900 */ - gint res = get_int(client, "handwriting_timeout") / 200 + 1; - if (res > 5) - res = 5; - if (res < 1) - res = 1; - return res; -} - -static void set_hand_speed(GConfClient *client, gint val) -{ - switch (val) { - case 1: val = 150; break; - case 2: val = 300; break; - case 3: val = 400; break; - case 4: val = 600; break; - case 5: val = 900; break; - } - set_int(client, "handwriting_timeout", val); -} -#endif - -#ifdef HAVE_MAEMO5 static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) { struct data *d; @@ -95,76 +58,12 @@ static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) return vbox; } -#else -static GtkWidget *start(GConfClient *client, GtkWidget *win, void **data) -{ - struct data *d; - GtkBox *vbox; - GtkSizeGroup *group; - GtkWidget *align, *caption; - - (void)win; - d = g_new0(struct data, 1); - - vbox = GTK_BOX(gtk_vbox_new(FALSE, 0)); - group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - - if (internal_kbd) { - d->stylus_im = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(d->stylus_im, get_bool(client, "enable-stylus-im")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Enable stylus input methods", - GTK_WIDGET(d->stylus_im), NULL, HILDON_CAPTION_MANDATORY)); - } - - d->use_finger = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(d->use_finger, get_bool(client, "use_finger_kb")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Launch finger keyboard with finger tap", - GTK_WIDGET(d->use_finger), NULL, HILDON_CAPTION_MANDATORY)); - - if (!internal_kbd) { - d->use_finger_sel = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(d->use_finger_sel, get_bool(client, "launch_finger_kb_on_select")); - caption = hildon_caption_new(group, NULL, - GTK_WIDGET(d->use_finger_sel), NULL, HILDON_CAPTION_MANDATORY); - hildon_caption_set_label_markup(HILDON_CAPTION(caption), "Launch finger keyboard with " HWK_BUTTON_SELECT); - gtk_box_pack_start_defaults(vbox, caption); - } - - d->hand_speed = HILDON_CONTROLBAR(hildon_controlbar_new()); - hildon_controlbar_set_range(d->hand_speed, 1, 5); - hildon_controlbar_set_value(d->hand_speed, get_hand_speed(client)); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Handwriting speed", - GTK_WIDGET(d->hand_speed), NULL, HILDON_CAPTION_MANDATORY)); - - d->case_corr = GTK_TOGGLE_BUTTON(gtk_check_button_new()); - gtk_toggle_button_set_active(d->case_corr, get_bool(client, "case_correction")); - gtk_box_pack_start_defaults(vbox, hildon_caption_new(group, "Handwriting case correction", - GTK_WIDGET(d->case_corr), NULL, HILDON_CAPTION_MANDATORY)); - - g_object_unref(G_OBJECT(group)); - *data = d; - - align = gtk_alignment_new(0, 0, 1, 0); - gtk_container_add(GTK_CONTAINER(align), GTK_WIDGET(vbox)); - return align; -} -#endif static void action(GConfClient *client, void *data) { struct data *d = data; -#ifdef HAVE_MAEMO5 set_bool(client, "use_finger_kb", hildon_check_button_get_active(d->use_finger)); -#else - if (d->stylus_im) - set_bool(client, "enable-stylus-im", gtk_toggle_button_get_active(d->stylus_im)); - set_bool(client, "use_finger_kb", gtk_toggle_button_get_active(d->use_finger)); - if (d->use_finger_sel) - set_bool(client, "launch_finger_kb_on_select", gtk_toggle_button_get_active(d->use_finger_sel)); - set_hand_speed(client, hildon_controlbar_get_value(d->hand_speed)); - set_bool(client, "case_correction", gtk_toggle_button_get_active(d->case_corr)); -#endif } void prefs_onscreen_init(struct prefs *prefs) diff --git a/ukeyboard/cpanel/prefs.c b/ukeyboard/cpanel/prefs.c index cb22ae8..d71ec25 100644 --- a/ukeyboard/cpanel/prefs.c +++ b/ukeyboard/cpanel/prefs.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include "prefs.h" @@ -30,12 +31,8 @@ #include "lang.h" #include "about.h" -#ifdef HAVE_MAEMO5 #define GETTEXT_PACKAGE "osso-applet-textinput" - -#include #include -#endif static init_func inits[] = { prefs_hw_init, prefs_onscreen_init, prefs_lang_init, prefs_about_init }; #define PLUGINS (sizeof(inits) / sizeof(init_func)) @@ -116,7 +113,6 @@ static void deinit_conf(GConfClient *client) g_object_unref(G_OBJECT(client)); } -#ifdef HAVE_MAEMO5 osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated) { GConfClient *conf; @@ -149,7 +145,7 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat g_free(title); - gtk_dialog_add_button(GTK_DIALOG(dialog), _HL("ecdg_ti_aboutdialog_title"), GTK_RESPONSE_HELP); + gtk_dialog_add_button(GTK_DIALOG(dialog), "About", GTK_RESPONSE_HELP); gtk_dialog_add_button(GTK_DIALOG(dialog), _HL("wdgt_bd_save"), GTK_RESPONSE_ACCEPT); scroll = hildon_pannable_area_new(); @@ -194,60 +190,3 @@ osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activat deinit_conf(conf); return OSSO_OK; } -#else -osso_return_t execute(osso_context_t *osso, gpointer data, gboolean user_activated) -{ - GConfClient *conf; - GtkDialog *dialog; - GtkWidget *widget, *notebook; - void *plugin_data[PLUGINS]; - unsigned i; - int res; - - (void)osso; (void)user_activated; /* shut up, GCC */ - - conf = init_conf(); - if (!conf) - return OSSO_ERROR; - - for (i = 0; i < PLUGINS; i++) { - inits[i](prefs + i); - } - - dialog = GTK_DIALOG(gtk_dialog_new()); - if (!dialog) { - deinit_conf(conf); - return OSSO_ERROR; - } - gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(data)); - gtk_window_set_title(GTK_WINDOW(dialog), "Text input (ukeyboard)"); - gtk_dialog_set_has_separator(dialog, FALSE); - gtk_window_set_modal(GTK_WINDOW(dialog), TRUE); - - gtk_dialog_add_action_widget(dialog, gtk_button_new_with_label("OK"), GTK_RESPONSE_ACCEPT); - gtk_dialog_add_action_widget(dialog, gtk_button_new_with_label("Cancel"), GTK_RESPONSE_REJECT); - notebook = gtk_notebook_new(); - for (i = 0; i < PLUGINS; i++) { - widget = prefs[i].start(conf, GTK_WIDGET(dialog), &plugin_data[i]); - if (widget) - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), widget, gtk_label_new(prefs[i].name)); - } - - gtk_container_add(GTK_CONTAINER(dialog->vbox), notebook); - gtk_widget_show_all(GTK_WIDGET(dialog)); - res = gtk_dialog_run(dialog); - if (res == GTK_RESPONSE_ACCEPT) { - for (i = 0; i < PLUGINS; i++) - if (prefs[i].action) - prefs[i].action(conf, plugin_data[i]); - } - gtk_widget_destroy(GTK_WIDGET(dialog)); - - for (i = 0; i < PLUGINS; i++) - if (prefs[i].stop) - prefs[i].stop(conf, plugin_data[i]); - - deinit_conf(conf); - return OSSO_OK; -} -#endif diff --git a/ukeyboard/cpanel/prefs.h b/ukeyboard/cpanel/prefs.h index 1fd2e71..8bddb59 100644 --- a/ukeyboard/cpanel/prefs.h +++ b/ukeyboard/cpanel/prefs.h @@ -19,9 +19,7 @@ #ifndef _PREFS_H #define _PREFS_H -#ifdef HAVE_MAEMO5 #define _HL(str) dgettext("hildon-libs",str) -#endif struct prefs { GtkWidget *(*start)(GConfClient *, GtkWidget *, void **); diff --git a/ukeyboard/debian/changelog b/ukeyboard/debian/changelog index fdaf145..d6124c0 100644 --- a/ukeyboard/debian/changelog +++ b/ukeyboard/debian/changelog @@ -1,3 +1,12 @@ +ukeyboard (2.0) unstable; urgency=low + + * Added support for Maemo5 (Fremantle). + * Dropped Czech and Polish keyboard support, because they are officially + supported now. + * OS2008 (Diablo/Chinook) is no longer supported. + + -- Roman Moravcik Wed, 29 Oct 2009 22:08:12 +0100 + ukeyboard (1.9) unstable; urgency=low * Added Greek hw layouts for devices with US keyboard by Porfyras. diff --git a/ukeyboard/debian/rules b/ukeyboard/debian/rules index ce18cac..6948cb4 100755 --- a/ukeyboard/debian/rules +++ b/ukeyboard/debian/rules @@ -24,10 +24,7 @@ build: build-stamp build-stamp: configure-stamp dh_testdir -# for OS2008 -# $(MAKE) -# for Maemo5 - CFLAGS="$(CFLAGS) -DHAVE_MAEMO5" $(MAKE) + $(MAKE) touch build-stamp diff --git a/ukeyboard/debian/ukeyboard.postinst b/ukeyboard/debian/ukeyboard.postinst index 41210b8..4869db5 100755 --- a/ukeyboard/debian/ukeyboard.postinst +++ b/ukeyboard/debian/ukeyboard.postinst @@ -1,7 +1,6 @@ #!/bin/sh if ! grep -q ukeyboard /usr/share/X11/xkb/rules/base; then - sed -i 's/^.*nokiarx44.*$/\0\n ukbdrx44 * = nokia_vndr\/ukbdrx44(%l)/' /usr/share/X11/xkb/rules/base - sed -i 's/^.*nokiarx51.*$/\0\n ukbdrx51 * = nokia_vndr\/ukbdrx51(%l)/' /usr/share/X11/xkb/rules/base + sed -i 's/^.*nokiarx44.*$/\0\n ukeyboard * = nokia_vndr\/ukeyboard(%l)/' /usr/share/X11/xkb/rules/base fi if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop ]; then diff --git a/ukeyboard/debian/ukeyboard.postrm b/ukeyboard/debian/ukeyboard.postrm index 6e1aecf..aae9521 100755 --- a/ukeyboard/debian/ukeyboard.postrm +++ b/ukeyboard/debian/ukeyboard.postrm @@ -1,5 +1,5 @@ #!/bin/sh -sed -ni '/ukbd/!p' /usr/share/X11/xkb/rules/base +sed -ni '/ukeyboard/!p' /usr/share/X11/xkb/rules/base if [ -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed ]; then mv -f /usr/share/applications/hildon-control-panel/cptextinput.desktop.removed /usr/share/applications/hildon-control-panel/cptextinput.desktop diff --git a/ukeyboard/keyboards-scv/Makefile b/ukeyboard/keyboards-scv/Makefile index e566d5f..0fc71ae 100644 --- a/ukeyboard/keyboards-scv/Makefile +++ b/ukeyboard/keyboards-scv/Makefile @@ -1,5 +1,4 @@ layouts = \ - cz-qwerty.vkb cz-qwertz.vkb \ sk-qwerty.vkb sk-qwertz.vkb all: $(layouts) diff --git a/ukeyboard/keyboards-scv/cz-qwerty.def b/ukeyboard/keyboards-scv/cz-qwerty.def deleted file mode 100644 index 8c47ac8..0000000 --- a/ukeyboard/keyboards-scv/cz-qwerty.def +++ /dev/null @@ -1,80 +0,0 @@ -# Czech scv keyboard layout -# Created by Jiri Benc - -header { -name "" -lang "Čeština" -wc "" - -size 0 { width 102 height 58 textpos 41 left 0 top 0 } -} - -kbd_special { -special { - name "" - margin 0 0 0 0 - default_size 0 - row { - key ^ special - key ` special - key $ special - key • special - key ‘ special - key [ special - key ] special - } - row { - tab - key ← special - key → special - key „ special - key “ special - key { special - key } special - } -} -lowercase { - margin 0 0 0 0 - default_size 0 - row { - key ß alpha - key ° special - key ± special - key ½ special - key ’ special - key § special - key £ special - } - row { - key ä alpha - key ë alpha - key ö alpha - key ü alpha - key ” special - key « special - key » special - } -} -uppercase { - margin 0 0 0 0 - default_size 0 - row { - key ß alpha - key ` special - key ± special - key ½ special - key ’ special - key § special - key £ special - } - row { - key Ä alpha - key Ë alpha - key Ö alpha - key Ü alpha - key ” special - key « special - key » special - } -} -} diff --git a/ukeyboard/keyboards-scv/cz-qwertz.def b/ukeyboard/keyboards-scv/cz-qwertz.def deleted file mode 120000 index be89ba6..0000000 --- a/ukeyboard/keyboards-scv/cz-qwertz.def +++ /dev/null @@ -1 +0,0 @@ -cz-qwerty.def \ No newline at end of file diff --git a/ukeyboard/keyboards/Makefile b/ukeyboard/keyboards/Makefile index 2fb0b48..1c29be9 100644 --- a/ukeyboard/keyboards/Makefile +++ b/ukeyboard/keyboards/Makefile @@ -3,7 +3,6 @@ layouts = \ be-by.vkb \ bg-bds.vkb \ bg-phonetic.vkb \ - cz-qwerty.vkb cz-qwertz.vkb \ en-dvorak.vkb \ eo-qwerty.vkb \ he-qwerty.vkb \ diff --git a/ukeyboard/keyboards/cz-qwerty.def b/ukeyboard/keyboards/cz-qwerty.def deleted file mode 100644 index d07ac5c..0000000 --- a/ukeyboard/keyboards/cz-qwerty.def +++ /dev/null @@ -1,332 +0,0 @@ -# title: Czech QWERTY layout -# author: Jiří Benc - -header { -name "Čeština (QWERTY)" -lang "cs_CZ" -wc "cs_CZ" - -size 0 { width 35 height 35 textpos 26 left 0 top 0 } -size 1 { width 50 height 35 textpos 26 left 0 top 0 } -size 2 { width 55 height 35 textpos 26 left 0 top 0 } -size 3 { width 72 height 55 textpos 41 left 0 top 0 } -size 4 { width 143 height 55 textpos 41 left 0 top 0 } -size 5 { width 24 height 35 textpos 26 left 0 top 0 } -} - -kbd_normal { -lowercase { - margin 0 0 0 0 - default_size 0 - row { - key q alpha size 2 - key w alpha tele - key e alpha hexa - key r alpha - key t alpha - key y alpha - key u alpha - key i alpha - key o alpha - key p alpha tele - key @ special size 1 - } - row { - key a alpha hexa - key s alpha - key d alpha hexa - key f alpha hexa - key g alpha - key h alpha - key j alpha - key k alpha - key l alpha - key ů alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - key z alpha size 2 - key x alpha - key c alpha hexa - key v alpha - key b alpha hexa - key n alpha - key m alpha - key , special tele - key . special tele - key / special tele - key ? special tele size 1 - } -} -lowercase_num { - margin 0 0 0 9 - default_size 0 - row { - key 1 num hexa tele - key 2 num hexa tele - key 3 num hexa tele - } - row { - key 4 num hexa tele - key 5 num hexa tele - key 6 num hexa tele - } - row { - key 7 num hexa tele - key 8 num hexa tele - key 9 num hexa tele - } - row { - key - num special tele - key 0 num hexa tele - key = special - } -} -uppercase { - margin 0 0 0 0 - default_size 0 - row { - key Q alpha size 2 - key W alpha tele - key E alpha hexa - key R alpha - key T alpha - key Y alpha - key U alpha - key I alpha - key O alpha - key P alpha tele - key ~ special size 5 - key | special size 5 - } - row { - key A alpha hexa - key S alpha - key D alpha hexa - key F alpha hexa - key G alpha - key H alpha - key J alpha - key K alpha - key L alpha - key Ů alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - key Z alpha size 2 - key X alpha - key C alpha hexa - key V alpha - key B alpha hexa - key N alpha - key M alpha - key ; special - key : special - key " special - key ! special size 1 - } -} -uppercase_num { - margin 0 0 0 9 - default_size 0 - row { - key ' special - key # special tele - key $ special - } - row { - key % special - key < special - key > special - } - row { - key & special - key ( special tele - key ) special tele - } - row { - key _ special - key * special tele - key + special tele - } -} -} - -kbd_thumb { -lowercase { - name "abc" - margin 0 0 0 0 - default_size 3 - row { - key q alpha - key w alpha tele - key e alpha hexa - key r alpha - key t alpha - key y alpha - key u alpha - key i alpha - key o alpha - key p alpha tele - key ů alpha - } - row { - key a alpha hexa - key s alpha - key d alpha hexa - key f alpha hexa - key g alpha - key h alpha - key j alpha - key k alpha - key l alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - white size 4 - key z alpha - key x alpha - key c alpha hexa - key v alpha - key b alpha hexa - key n alpha - key m alpha - slide special { key . key , key ? key ! key @ key ( key ) } - slide special { key : key ; key - key _ key / key < key > } - } -} -uppercase { - name "ABC" - margin 0 0 0 0 - default_size 3 - row { - key Q alpha - key W alpha tele - key E alpha hexa - key R alpha - key T alpha - key Y alpha - key U alpha - key I alpha - key O alpha - key P alpha tele - key Ů alpha - } - row { - key A alpha hexa - key S alpha - key D alpha hexa - key F alpha hexa - key G alpha - key H alpha - key J alpha - key K alpha - key L alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - white size 4 - key Z alpha - key X alpha - key C alpha hexa - key V alpha - key B alpha hexa - key N alpha - key M alpha - slide special { key . key , key ? key ! key @ key ( key ) } - slide special { key : key ; key - key _ key / key < key > } - } -} -special { - name "1!+" - margin 0 0 0 0 - default_size 3 - row { - key 1 num hexa tele - key 2 num hexa tele - key 3 num hexa tele - key " special - key + special - key - special - key = special - key _ special - key & special - key @ special - key ~ special - } - row { - key 4 num hexa tele - key 5 num hexa tele - key 6 num hexa tele - key ' special - key : special - key ; special - key ! special - key ( special - key ) special - key / special - key \ special - } - row { - key 7 num hexa tele - key 8 num hexa tele - key 9 num hexa tele - key 0 num hexa tele - key . special - key , special - key ? special - key „ special - key “ special - key < special - key > special - } -} -special { - name "*§¿" - margin 0 0 0 0 - default_size 3 - row { - key # special - key % special - key € special - key £ special - key $ special - key ^ special - key | special - key [ special - key ] special - key { special - key } special - } - row { - key ¡ special - key ¿ special - key § special - key * special - key · special - key • special - key ° special - key ± special - key ½ special - key « special - key » special - } - row { - key ä alpha - key ë alpha - key ö alpha - key ü alpha - key Ä alpha - key Ë alpha - key Ö alpha - key Ü alpha - key ß alpha - key ™ special - key © special - } -} -} diff --git a/ukeyboard/keyboards/cz-qwertz.def b/ukeyboard/keyboards/cz-qwertz.def deleted file mode 100644 index 82d4fe1..0000000 --- a/ukeyboard/keyboards/cz-qwertz.def +++ /dev/null @@ -1,332 +0,0 @@ -# title: Czech QWERTZ layout -# author: Jiří Benc - -header { -name "Čeština (QWERTZ)" -lang "cs_CZ" -wc "cs_CZ" - -size 0 { width 35 height 35 textpos 26 left 0 top 0 } -size 1 { width 50 height 35 textpos 26 left 0 top 0 } -size 2 { width 55 height 35 textpos 26 left 0 top 0 } -size 3 { width 72 height 55 textpos 41 left 0 top 0 } -size 4 { width 143 height 55 textpos 41 left 0 top 0 } -size 5 { width 24 height 35 textpos 26 left 0 top 0 } -} - -kbd_normal { -lowercase { - margin 0 0 0 0 - default_size 0 - row { - key q alpha size 2 - key w alpha tele - key e alpha hexa - key r alpha - key t alpha - key z alpha - key u alpha - key i alpha - key o alpha - key p alpha tele - key @ special size 1 - } - row { - key a alpha hexa - key s alpha - key d alpha hexa - key f alpha hexa - key g alpha - key h alpha - key j alpha - key k alpha - key l alpha - key ů alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - key y alpha size 2 - key x alpha - key c alpha hexa - key v alpha - key b alpha hexa - key n alpha - key m alpha - key , special tele - key . special tele - key / special tele - key ? special tele size 1 - } -} -lowercase_num { - margin 0 0 0 9 - default_size 0 - row { - key 1 num hexa tele - key 2 num hexa tele - key 3 num hexa tele - } - row { - key 4 num hexa tele - key 5 num hexa tele - key 6 num hexa tele - } - row { - key 7 num hexa tele - key 8 num hexa tele - key 9 num hexa tele - } - row { - key - num special tele - key 0 num hexa tele - key = special - } -} -uppercase { - margin 0 0 0 0 - default_size 0 - row { - key Q alpha size 2 - key W alpha tele - key E alpha hexa - key R alpha - key T alpha - key Z alpha - key U alpha - key I alpha - key O alpha - key P alpha tele - key ~ special size 5 - key | special size 5 - } - row { - key A alpha hexa - key S alpha - key D alpha hexa - key F alpha hexa - key G alpha - key H alpha - key J alpha - key K alpha - key L alpha - key Ů alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - key Y alpha size 2 - key X alpha - key C alpha hexa - key V alpha - key B alpha hexa - key N alpha - key M alpha - key ; special - key : special - key " special - key ! special size 1 - } -} -uppercase_num { - margin 0 0 0 9 - default_size 0 - row { - key ' special - key # special tele - key $ special - } - row { - key % special - key < special - key > special - } - row { - key & special - key ( special tele - key ) special tele - } - row { - key _ special - key * special tele - key + special tele - } -} -} - -kbd_thumb { -lowercase { - name "abc" - margin 0 0 0 0 - default_size 3 - row { - key q alpha - key w alpha tele - key e alpha hexa - key r alpha - key t alpha - key z alpha - key u alpha - key i alpha - key o alpha - key p alpha tele - key ů alpha - } - row { - key a alpha hexa - key s alpha - key d alpha hexa - key f alpha hexa - key g alpha - key h alpha - key j alpha - key k alpha - key l alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - white size 4 - key y alpha - key x alpha - key c alpha hexa - key v alpha - key b alpha hexa - key n alpha - key m alpha - slide special { key . key , key ? key ! key @ key ( key ) } - slide special { key : key ; key - key _ key / key < key > } - } -} -uppercase { - name "ABC" - margin 0 0 0 0 - default_size 3 - row { - key Q alpha - key W alpha tele - key E alpha hexa - key R alpha - key T alpha - key Z alpha - key U alpha - key I alpha - key O alpha - key P alpha tele - key Ů alpha - } - row { - key A alpha hexa - key S alpha - key D alpha hexa - key F alpha hexa - key G alpha - key H alpha - key J alpha - key K alpha - key L alpha - key ´ alpha dead - key ˇ alpha dead - } - row { - white size 4 - key Y alpha - key X alpha - key C alpha hexa - key V alpha - key B alpha hexa - key N alpha - key M alpha - slide special { key . key , key ? key ! key @ key ( key ) } - slide special { key : key ; key - key _ key / key < key > } - } -} -special { - name "1!+" - margin 0 0 0 0 - default_size 3 - row { - key 1 num hexa tele - key 2 num hexa tele - key 3 num hexa tele - key " special - key + special - key - special - key = special - key _ special - key & special - key @ special - key ~ special - } - row { - key 4 num hexa tele - key 5 num hexa tele - key 6 num hexa tele - key ' special - key : special - key ; special - key ! special - key ( special - key ) special - key / special - key \ special - } - row { - key 7 num hexa tele - key 8 num hexa tele - key 9 num hexa tele - key 0 num hexa tele - key . special - key , special - key ? special - key „ special - key “ special - key < special - key > special - } -} -special { - name "*§¿" - margin 0 0 0 0 - default_size 3 - row { - key # special - key % special - key € special - key £ special - key $ special - key ^ special - key | special - key [ special - key ] special - key { special - key } special - } - row { - key ¡ special - key ¿ special - key § special - key * special - key · special - key • special - key ° special - key ± special - key ½ special - key « special - key » special - } - row { - key ä alpha - key ë alpha - key ö alpha - key ü alpha - key Ä alpha - key Ë alpha - key Ö alpha - key Ü alpha - key ß alpha - key ™ special - key © special - } -} -} diff --git a/ukeyboard/ukbdcreator/Makefile b/ukeyboard/ukbdcreator/Makefile index 0554051..50d463e 100644 --- a/ukeyboard/ukbdcreator/Makefile +++ b/ukeyboard/ukbdcreator/Makefile @@ -17,7 +17,7 @@ version.h: ../VERSION echo '#define UKBD_VERSION "'`cat ../VERSION`'"' > version.h clean: - rm -f ukbdcreator *.o core + rm -f ukbdcreator *.o core version.h DESTDIR ?= /usr/local install: diff --git a/ukeyboard/ukbdcreator/version.h b/ukeyboard/ukbdcreator/version.h deleted file mode 100644 index 9f865c2..0000000 --- a/ukeyboard/ukbdcreator/version.h +++ /dev/null @@ -1 +0,0 @@ -#define UKBD_VERSION "1.5" diff --git a/ukeyboard/xkb/ukbdrx44 b/ukeyboard/xkb/ukbdrx44 deleted file mode 100644 index 98735a9..0000000 --- a/ukeyboard/xkb/ukbdrx44 +++ /dev/null @@ -1,304 +0,0 @@ -partial default alphanumeric_keys -xkb_symbols "base" { - include "nokia_vndr/rx-44(base)" - - key { [ BackSpace, BackSpace, Delete, Delete ] }; -}; - -partial alphanumeric_keys -xkb_symbols "cz-qwerty" { - name[Group1] = "Czech QWERTY (DE hw)"; - - include "nokia_vndr/ukbdrx44(base)" - - key { [ a, A, exclam, section ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, percent, percent ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, bracketleft ] }; - key { [ l, L, parenright, bracketright ] }; - key { [ uring, Uring, question, asciicircum ] }; - - key { [ z, Z, EuroSign, dollar ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, asterisk, asterisk ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, braceleft ] }; - key { [ m, M, greater, braceright ] }; - key { [ dead_acute, dead_acute, equal, equal ] }; - key { [ dead_caron, dead_caron, apostrophe, grave ] }; - key { [ minus, underscore, endash, emdash ] }; - - key { [ comma, semicolon, Tab, bar ] }; - key { [ period, colon, period, colon ] }; -}; - -partial alphanumeric_keys -xkb_symbols "cz-qwertz" { - name[Group1] = "Czech QWERTZ (DE hw)"; - - include "nokia_vndr/ukbdrx44(cz-qwerty)" - - key { [ z, Z, 6, 6 ] }; - key { [ y, Y, EuroSign, dollar ] }; -}; - -// author: Michal Prihoda -partial alphanumeric_keys -xkb_symbols "cz-qwerty-us" { - name[Group1] = "Czech QWERTY (US hw)"; - - include "nokia_vndr/ukbdrx44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, backslash, backslash ] }; - key { [ h, H, slash, slash ] }; - key { [ j, J, parenleft, parenleft ] }; - key { [ k, K, parenright, parenright ] }; - key { [ l, L, asterisk, asterisk ] }; - key { [ dead_acute, apostrophe, question, question ] }; - - key { [ z, Z, yen, yen ] }; - key { [ x, X, asciicircum, asciicircum ] }; - key { [ c, C, asciitilde, asciitilde ] }; - key { [ v, V, percent, percent ] }; - key { [ b, B, ampersand, ampersand ] }; - key { [ n, N, dollar, dollar ] }; - key { [ m, M, EuroSign, EuroSign ] }; - key { [ semicolon, colon, sterling, sterling ] }; - key { [ minus, uring, underscore, underscore ] }; - key { [ dead_caron, plus, equal, equal ] }; - - key { [ comma, less, comma, less ] }; - key { [ period, greater, period, greater ] }; -}; - -partial alphanumeric_keys -xkb_symbols "cz-qwertz-us" { - name[Group1] = "Czech QWERTZ (US hw)"; - - include "nokia_vndr/ukbdrx44(cz-qwerty-us)" - - key { [ z, Z, 6, 6 ] }; - key { [ y, Y, yen, yen ] }; -}; - -// author: Roman Moravcik -partial alphanumeric_keys -xkb_symbols "sk-qwerty" { - name[Group1] = "Slovak QWERTY (DE hw)"; - - include "nokia_vndr/ukbdrx44(base)" - - key { [ a, A, exclam, exclam ] }; - key { [ s, S, quotedbl, quotedbl ] }; - key { [ d, D, at, at ] }; - key { [ f, F, numbersign, numbersign ] }; - key { [ g, G, percent, percent ] }; - key { [ h, H, backslash, backslash ] }; - key { [ j, J, slash, slash ] }; - key { [ k, K, parenleft, parenleft ] }; - key { [ l, L, parenright, parenright ] }; - key { [ ocircumflex,adiaeresis, question, question ] }; - - key { [ z, Z, EuroSign, EuroSign ] }; - key { [ x, X, asciitilde, asciitilde ] }; - key { [ c, C, asterisk, asterisk ] }; - key { [ v, V, ampersand, ampersand ] }; - key { [ b, B, plus, plus ] }; - key { [ n, N, less, less ] }; - key { [ m, M, greater, greater ] }; - key { [ dead_acute, dead_acute, equal, equal ] }; - key { [ dead_caron, dead_caron, apostrophe, apostrophe ] }; - key { [ minus, underscore, endash, endash ] }; - - key { [ comma, semicolon, bar, bar ] }; - key { [ period, colon, Tab, Tab ] }; -}; - -partial alphanumeric_keys -xkb_symbols "sk-qwertz" { - name[Group1] = "Slovak QWERTZ (DE hw)"; - - include "nokia_vndr/ukbdrx44(sk-qwerty)" - - key { [ z, Z, 6, 6 ] }; - key { [ y, Y, EuroSign, EuroSign ] }; -}; - - -// author: Marcin Juszkiewicz -partial alphanumeric_keys -xkb_symbols "pl" { - name[Group1] = "Polish (US hw)"; - - include "nokia_vndr/rx-44(us)" - include "nokia_vndr/ukbdrx44(base)" - - key { [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift ] }; - modifier_map Mod3 { ISO_Level5_Shift }; - -// normal Shift Fn Fn+Shift Chr S+Chr Fn+Chr Fn+Shift+Chr - key { type="EIGHT_LEVEL", [ space, space, bar, bar, Tab, Tab, bar, bar ] }; - - key { type="EIGHT_LEVEL", [ e, E, 3, 3, eogonek, Eogonek, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, oacute, Oacute, 9, 9 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, aogonek, Aogonek, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, sacute, Sacute, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, bracketleft, bracketleft, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, bracketright, bracketright, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, asterisk, asterisk, lstroke, Lstroke, asterisk, asterisk ] }; - - key { type="EIGHT_LEVEL", [ z, Z, yen, yen, zabovedot, Zabovedot, yen, yen ] }; - key { type="EIGHT_LEVEL", [ x, X, asciicircum, asciicircum, zacute, Zacute, asciicircum, asciicircum ] }; - key { type="EIGHT_LEVEL", [ c, C, asciitilde, asciitilde, cacute, Cacute, asciitilde, asciitilde ] }; - key { type="EIGHT_LEVEL", [ n, N, dollar, dollar, nacute, Nacute, dollar, dollar ] }; -}; - -// author: Pawel Dys -partial alphanumeric_keys -xkb_symbols "pl-qwertz-de" { - name[Group1] = "Polish QWERTZ (DE hw)"; - - include "nokia_vndr/rx-44(de)" - include "nokia_vndr/ukbdrx44(base)" - - key { [ ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift, ISO_Level5_Shift ] }; - modifier_map Mod3 { ISO_Level5_Shift }; - -// normal Shift Fn Fn+Shift Chr S+Chr Fn+Chr Fn+Shift+Chr - key { type="EIGHT_LEVEL", [ space, space, Tab, Tab, bar, bar, space, space ] }; - - key { type="EIGHT_LEVEL", [ e, E, 3, 3, eogonek, Eogonek, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ z, Z, 6, 6, zabovedot, Zabovedot, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, oacute, Oacute, 9, 9 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, aogonek, Aogonek, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, sacute, Sacute, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ g, G, percent, percent, dollar, dollar, percent, percent ] }; - key { type="EIGHT_LEVEL", [ h, H, backslash, backslash, bracketleft, bracketleft, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ j, J, slash, slash, bracketright, bracketright, bracketright, bracketright ] }; - key { type="EIGHT_LEVEL", [ l, L, parenright, parenright, lstroke, Lstroke, parenright, parenright ] }; - - key { type="EIGHT_LEVEL", [ y, Y, EuroSign, EuroSign, zabovedot, Zabovedot, EuroSign, EuroSign ] }; - key { type="EIGHT_LEVEL", [ x, X, asciitilde, asciitilde, zacute, Zacute, asciitilde, asciitilde ] }; - key { type="EIGHT_LEVEL", [ c, C, asterisk, asterisk, cacute, Cacute, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ n, N, less, less, nacute, Nacute, less, less ] }; - key { type="EIGHT_LEVEL", [ m, M, greater, greater, dead_circumflex, dead_circumflex, greater, greater ] }; - key { type="EIGHT_LEVEL", [ comma, semicolon, comma, semicolon, braceleft, braceleft, comma, semicolon ] }; - key { type="EIGHT_LEVEL", [ period, colon, period, colon, braceright, braceright, period, colon ] }; - - key { type="EIGHT_LEVEL", [ adiaeresis, Adiaeresis, apostrophe, apostrophe, quoteleft, quoteleft, adiaeresis, Adiaeresis ] }; -}; - -partial alphanumeric_keys -xkb_symbols "pl-qwerty-de" { - name[Group1] = "Polish QWERTY (DE hw)"; - - include "nokia_vndr/ukbdrx44(pl-qwertz-de)" - - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, zabovedot, Zabovedot, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ z, Z, EuroSign, EuroSign, zabovedot, Zabovedot, EuroSign, EuroSign ] }; -}; - -// author: Ognian Samokovliyski -partial alphanumeric_keys -xkb_symbols "bg-phonetic" { - name[Group1] = "Bulgarian Phonetic"; - - include "nokia_vndr/ukbdrx44(base)" - - key { [ ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod3 { ISO_Level5_Lock }; - - key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_ya, Cyrillic_YA, 1, 1 ] }; - key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_ve, Cyrillic_VE, 2, 2 ] }; - key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_ie, Cyrillic_IE, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_er, Cyrillic_ER, 4, 4 ] }; - key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_te, Cyrillic_TE, 5, 5 ] }; - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_hardsign, Cyrillic_HARDSIGN, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_u, Cyrillic_U, 7, 7 ] }; - key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_i, Cyrillic_I, 8, 8 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_o, Cyrillic_O, 9, 9 ] }; - key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_pe, Cyrillic_PE, 0, 0 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_a, Cyrillic_A, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_es, Cyrillic_ES, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_de, Cyrillic_DE, at, at ] }; - key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_ef, Cyrillic_EF, numbersign, numbersign ] }; - key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_ghe, Cyrillic_GHE, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_ha, Cyrillic_HA, slash, slash ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_shorti, Cyrillic_SHORTI, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_ka, Cyrillic_KA, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, asterisk, asterisk, Cyrillic_el, Cyrillic_EL, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ apostrophe, question, question, question, Cyrillic_che, Cyrillic_CHE, apostrophe, question ] }; - - key { type="EIGHT_LEVEL", [ z, Z, yen, yen, Cyrillic_ze, Cyrillic_ZE, yen, yen ] }; - key { type="EIGHT_LEVEL", [ x, X, asciicircum, asciicircum, Cyrillic_softsign, Cyrillic_SOFTSIGN, asciicircum, asciicircum ] }; - key { type="EIGHT_LEVEL", [ c, C, asciitilde, asciitilde, Cyrillic_tse, Cyrillic_TSE, asciitilde, asciitilde ] }; - key { type="EIGHT_LEVEL", [ v, V, percent, percent, Cyrillic_zhe, Cyrillic_ZHE, percent, percent ] }; - key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_be, Cyrillic_BE, ampersand, ampersand ] }; - key { type="EIGHT_LEVEL", [ n, N, dollar, dollar, Cyrillic_en, Cyrillic_EN, dollar, dollar ] }; - key { type="EIGHT_LEVEL", [ m, M, EuroSign, EuroSign, Cyrillic_em, Cyrillic_EM, EuroSign, EuroSign ] }; - key { type="EIGHT_LEVEL", [ semicolon, colon, colon, colon, Cyrillic_yu, Cyrillic_YU, minus, minus ] }; - key { type="EIGHT_LEVEL", [ minus, underscore, minus, underscore, Cyrillic_sha, Cyrillic_SHA, minus, underscore ] }; - key { type="EIGHT_LEVEL", [ plus, equal, equal, equal, Cyrillic_shcha, Cyrillic_SHCHA, plus, equal ] }; - key { type="EIGHT_LEVEL", [ comma, less, comma, less, comma, less, comma, less ] }; - key { type="EIGHT_LEVEL", [ period, greater, period, greater, period, greater, period, greater ] }; -}; - - -// author: Porfyras -partial alphanumeric_keys -xkb_symbols "gr" { - name[Group1] = "Greek (US hw)"; - - include "nokia_vndr/ukbdrx44(base)" - - key { [ ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock, ISO_Level5_Lock ] }; - modifier_map Mod3 { ISO_Level5_Lock }; - - key { type="EIGHT_LEVEL", [ space, space, Tab, Tab, space, space, Tab, Tab ] }; - key { type="EIGHT_LEVEL", [ q, Q, 1, 1, bar, bar, 1, 1 ] }; - key { type="EIGHT_LEVEL", [ w, W, 2, 2, Greek_finalsmallsigma, Greek_SIGMA, 2, 2 ] }; - key { type="EIGHT_LEVEL", [ e, E, 3, 3, Greek_epsilon, Greek_EPSILON, 3, 3 ] }; - key { type="EIGHT_LEVEL", [ r, R, 4, 4, Greek_rho, Greek_RHO, 4, 4 ] }; - key { type="EIGHT_LEVEL", [ t, T, 5, 5, Greek_tau, Greek_TAU, 5, 5 ] }; - key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Greek_upsilon, Greek_UPSILON, 6, 6 ] }; - key { type="EIGHT_LEVEL", [ u, U, 7, 7, Greek_theta, Greek_THETA, 7, 7 ] }; - key { type="EIGHT_LEVEL", [ i, I, 8, 8, Greek_iota, Greek_IOTA, 8, 8 ] }; - key { type="EIGHT_LEVEL", [ o, O, 9, 9, Greek_omicron, Greek_OMICRON, 9, 9 ] }; - key { type="EIGHT_LEVEL", [ p, P, 0, 0, Greek_pi, Greek_PI, 0, 0 ] }; - - key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Greek_alpha, Greek_ALPHA, exclam, exclam ] }; - key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Greek_sigma, Greek_SIGMA, quotedbl, quotedbl ] }; - key { type="EIGHT_LEVEL", [ d, D, at, at, Greek_delta, Greek_DELTA, at, at ] }; - key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Greek_phi, Greek_PHI, numbersign, numbersign ] }; - key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Greek_gamma, Greek_GAMMA, backslash, backslash ] }; - key { type="EIGHT_LEVEL", [ h, H, slash, slash, Greek_eta, Greek_ETA, slash, slash ] }; - key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Greek_xi, Greek_XI, parenleft, parenleft ] }; - key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Greek_kappa, Greek_KAPPA, parenright, parenright ] }; - key { type="EIGHT_LEVEL", [ l, L, asterisk, asterisk, Greek_lamda, Greek_LAMDA, asterisk, asterisk ] }; - key { type="EIGHT_LEVEL", [ semicolon, colon, sterling, sterling, semicolon, colon, sterling, sterling ] }; - key { type="EIGHT_LEVEL", [ dead_acute, dead_acute, question, question, dead_acute, dead_diaeresis, question, question ] }; - - key { type="EIGHT_LEVEL", [ z, Z, yen, yen, Greek_zeta, Greek_ZETA, yen, yen ] }; - key { type="EIGHT_LEVEL", [ x, X, asciicircum, asciicircum, Greek_chi, Greek_CHI, asciicircum, asciicircum ] }; - key { type="EIGHT_LEVEL", [ c, C, asciitilde, asciitilde, Greek_psi, Greek_PSI, asciitilde, asciitilde ] }; - key { type="EIGHT_LEVEL", [ v, V, percent, percent, Greek_omega, Greek_OMEGA, percent, percent ] }; - key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Greek_beta, Greek_BETA, ampersand, ampersand ] }; - key { type="EIGHT_LEVEL", [ n, N, dollar, dollar, Greek_nu, Greek_NU, dollar, dollar ] }; - key { type="EIGHT_LEVEL", [ m, M, EuroSign, EuroSign, Greek_mu, Greek_MU, EuroSign, EuroSign ] }; - key { type="EIGHT_LEVEL", [ comma, less, bracketleft, bracketleft, comma, less, bracketleft, bracketleft ] }; - key { type="EIGHT_LEVEL", [ period, greater, bracketright, bracketright, period, greater, bracketright, bracketright ] }; - key { type="EIGHT_LEVEL", [ minus, braceleft, underscore, underscore, minus, braceleft, underscore, underscore ] }; - key { type="EIGHT_LEVEL", [ plus, braceright, equal, equal, plus, braceright, equal, equal ] }; -}; diff --git a/ukeyboard/xkb/ukbdrx51 b/ukeyboard/xkb/ukbdrx51 deleted file mode 100644 index b820c96..0000000 --- a/ukeyboard/xkb/ukbdrx51 +++ /dev/null @@ -1,40 +0,0 @@ -// author: Roman Moravcik -xkb_symbols "sk" { - name[Group1] = "Slovak QWERTZ (CZ HW)"; - - include "nokia_vndr/rx-51(english_base)" - include "nokia_vndr/rx-51(arrows_2btns)" - - // 1. row - key { [ z, Z, 6, 6 ] }; - key { [ dead_acute, dead_acute, sterling, sterling ] }; - - // 2. row - key { [ k, K, semicolon, semicolon ] }; - key { [ l, L, colon, colon ] }; - key { [ ocircumflex, adiaeresis, EuroSign, EuroSign ] }; - key { [ dead_caron, dead_caron, dollar, dollar ] }; - - // 3. row - key { [ y, Y, percent, percent ] }; - key { [ x, X, slash, slash ] }; - key { [ c, C, backslash, backslash ] }; - key { [ v, V, apostrophe, apostrophe ] }; - key { [ b, B, quotedbl, quotedbl ] }; - key { [ n, N, exclam, exclam ] }; - key { [ m, M, question, question ] }; - key { [ period, comma, Tab, bar ] }; -}; - -xkb_symbols "sk_qwerty" { - name[Group1] = "Slovak QWERTY (CZ hw)"; - - include "nokia_vndr/rx-51(sk)" - - // 1. row - key { [ y, Y, 6, 6 ] }; - - // 3. row - key { [ z, Z, percent, percent ] }; -}; - diff --git a/ukeyboard/xkb/ukeyboard b/ukeyboard/xkb/ukeyboard new file mode 100644 index 0000000..b820c96 --- /dev/null +++ b/ukeyboard/xkb/ukeyboard @@ -0,0 +1,40 @@ +// author: Roman Moravcik +xkb_symbols "sk" { + name[Group1] = "Slovak QWERTZ (CZ HW)"; + + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + // 1. row + key { [ z, Z, 6, 6 ] }; + key { [ dead_acute, dead_acute, sterling, sterling ] }; + + // 2. row + key { [ k, K, semicolon, semicolon ] }; + key { [ l, L, colon, colon ] }; + key { [ ocircumflex, adiaeresis, EuroSign, EuroSign ] }; + key { [ dead_caron, dead_caron, dollar, dollar ] }; + + // 3. row + key { [ y, Y, percent, percent ] }; + key { [ x, X, slash, slash ] }; + key { [ c, C, backslash, backslash ] }; + key { [ v, V, apostrophe, apostrophe ] }; + key { [ b, B, quotedbl, quotedbl ] }; + key { [ n, N, exclam, exclam ] }; + key { [ m, M, question, question ] }; + key { [ period, comma, Tab, bar ] }; +}; + +xkb_symbols "sk_qwerty" { + name[Group1] = "Slovak QWERTY (CZ hw)"; + + include "nokia_vndr/rx-51(sk)" + + // 1. row + key { [ y, Y, 6, 6 ] }; + + // 3. row + key { [ z, Z, percent, percent ] }; +}; + -- 1.7.9.5