diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-20 20:25:03 +0000 |
| commit | 6341b97eda007223acfe2f7a64dc2c5718867e0a (patch) | |
| tree | 1793a3e7cda31b9455df3106b60cc01a096b43f7 | |
| parent | 650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff) | |
| parent | f3d88db0960f1c23e55f2529764b096ac92d78d9 (diff) | |
| download | vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2 vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
83 files changed, 3950 insertions, 730 deletions
diff --git a/xorg-server/xkbdata.src/ChangeLog b/xorg-server/xkbdata.src/ChangeLog index cc8d10ad2..53c9b6db1 100644 --- a/xorg-server/xkbdata.src/ChangeLog +++ b/xorg-server/xkbdata.src/ChangeLog @@ -1,3 +1,144 @@ +2009-09-15 Sergey Udaltsov + + * symbols/es: addind dead_tilde, + https://bugs.freedesktop.org/show_bug.cgi?id=23876 + * keycodes/sun, rules/base.m_k.part, rules/base.ml_s.part, + symbols/sun_vndr/us: fixed Sun keyboard model for type6, + https://bugs.freedesktop.org/show_bug.cgi?id=3952 + +2009-09-08 Gaetan Nadon + + * **/.cvsignore: remove cvsignore files. + +2009-09-02 Sergey Udaltsov + + * rules/base.xml.in, symbols/by: restructured Belarussian variants, + https://bugs.freedesktop.org/show_bug.cgi?id=23604 + +2009-08-28 Sergey Udaltsov + + * symbols/no: updated layout, + http://bugs.freedesktop.org/show_bug.cgi?id=23518 + +2009-08-20 Sergey Udaltsov + + * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added + caps:numlock, http://bugs.freedesktop.org/show_bug.cgi?id=23323 + +2009-08-18 Peter Hutterer + + * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added + caps:hyper, http://bugs.freedesktop.org/show_bug.cgi?id=23356 + +2009-08-14 Sergey Udaltsov + + * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added + caps:none option, http://bugs.freedesktop.org/show_bug.cgi?id=23243 + * rules/base.xml.in, symbols/it: added it(us), + http://bugs.freedesktop.org/show_bug.cgi?id=23263 + +2009-08-04 Sergey Udaltsov + + * geometry/Makefile.am, rules/base.lists.part, rules/base.m_g.part, + rules/base.xml.in: added TypeMatrix geometries, + http://bugs.freedesktop.org/show_bug.cgi?id=23136 + +2009-07-19 Sergey Udaltsov + + * symbols/vn: fixed accent typing, + http://bugs.freedesktop.org/show_bug.cgi?id=22847 + +2009-07-18 Sergey Udaltsov + + * symbols/gb: fixed gb(colemak), several mappings added, + http://bugs.freedesktop.org/show_bug.cgi?id=22735 + +2009-07-14 Sergey Udaltsov + + * rules/base.extras.xml.in, rules/extras/variantsMapping.lst, + symbols/extras/us: added us(crd) to extras, + http://bugs.freedesktop.org/show_bug.cgi?id=22635 + +2009-07-09 Sergey Udaltsov + + * rules/base.xml.in, symbols/bg: updated bg variants, + http://bugs.freedesktop.org/show_bug.cgi?id=22666 + +2009-06-27 Sergey Udaltsov + + * symbols/extras/us, rules/base.extras.xml.in, + rules/extras/variantsMapping.lst, symbols/extras/Makefile.am: Added 3 + exotic us variants: ats, intl-unicode, alt-intl-unicode + http://bugs.freedesktop.org/show_bug.cgi?id=22004 + http://bugs.freedesktop.org/show_bug.cgi?id=22446 + +2009-06-22 Sergey Udaltsov + + * .gitignore, configure.in, rules/Makefile.am, + rules/base.extras.xml.in, rules/base.l2_s.part, rules/base.l3_s.part, + rules/base.l4_s.part, rules/base.lists.part, rules/base.ml_s.part, + rules/bin/Makefile.am, rules/compat/ln_s.sh -> rules/bin/ln_s.sh, + rules/compat/lnv_s.sh -> rules/bin/lnv_s.sh, rules/compat/ml1_s.sh -> + rules/bin/ml1_s.sh, rules/compat/ml1v1_s.sh -> rules/bin/ml1v1_s.sh, + rules/compat/ml1v_s.sh -> rules/bin/ml1v_s.sh, rules/compat/ml_s.sh -> + rules/bin/ml_s.sh, rules/compat/mlv_s.sh -> rules/bin/mlv_s.sh, + rules/compat/Makefile.am, rules/compat/layoutsMapping.lst, + rules/compat/variantsMapping.lst, rules/extras/Makefile.am, + rules/extras/layoutsMapping.lst, symbols/extras/Makefile.am, + symbols/extras/rs: serious restructuring of the rules generation + scripts, for compat and extras. Also, adding exotic rs(combiningkeys) + variant, http://bugs.freedesktop.org/show_bug.cgi?id=21047 + +2009-06-20 Sergey Udaltsov + + * symbols/by: missing mappings, + https://bugs.freedesktop.org/show_bug.cgi?id=22386 + * symbols/ca: fixed a couple of mappings in ca(shs) + http://bugs.freedesktop.org/show_bug.cgi?id=22388 + +2009-06-19 Sergey Udaltsov + + * symbols/de: small fix for a numbersign key, + http://bugs.freedesktop.org/show_bug.cgi?id=19934 + +2009-06-15 Sergey Udaltsov + + * symbols/inet: fixing ABNT2-specific mapping for keypad dot key, + http://bugs.freedesktop.org/show_bug.cgi?id=22303 + +2009-06-14 Sergey Udaltsov + + * rules/base.lists.part, rules/base.xml.in, symbols/inet: added + creativedw7000 model, + http://bugs.freedesktop.org/show_bug.cgi?id=22261 + +2009-06-12 Sergey Udaltsov + + * symbols/us: added extra symbols to us(altgr-intl), + http://bugs.freedesktop.org/show_bug.cgi?id=22249 + +2009-06-11 Sergey Udaltsov + + * rules/base.o_s.part, rules/base.xml.in, symbols/capslock: added + caps:super, http://bugs.freedesktop.org/show_bug.cgi?id=22184 + +2009-06-09 Sergey Udaltsov + + * symbols/ng: fixing 'e with dot below' in ng(olpc), + https://bugs.freedesktop.org/show_bug.cgi?id=20010 + * rules/base.ml1_s.part: fixing misspeled variant name, + https://bugs.freedesktop.org/show_bug.cgi?id=15782 + * symbols/tr: lost credits added, + https://bugs.freedesktop.org/show_bug.cgi?id=22079 + * rules/base.xml.in, symbols/ru: added ru(bak), + https://bugs.freedesktop.org/show_bug.cgi?id=22101 + +2009-05-31 Sergey Udaltsov + + * symbols/altwin: setting explicit TWO_LEVEL on sections mapping RALT + , it is often ONE_LEVEL because of LEVEL3. Fixed + http://bugs.freedesktop.org/show_bug.cgi?id=21761 + 2009-05-24 Sergey Udaltsov * symbols/ua: fixed all references, from ua(basic) to ua(legacy), diff --git a/xorg-server/xkbdata.src/compat/Makefile.in b/xorg-server/xkbdata.src/compat/Makefile.in index d644884cd..d037ba232 100644 --- a/xorg-server/xkbdata.src/compat/Makefile.in +++ b/xorg-server/xkbdata.src/compat/Makefile.in @@ -385,7 +385,7 @@ uninstall-am: uninstall-dist_compatDATA uninstall-dist_dirDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/configure b/xorg-server/xkbdata.src/configure index b7d5dcbb1..1fee6dc02 100644 --- a/xorg-server/xkbdata.src/configure +++ b/xorg-server/xkbdata.src/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.6. +# Generated by GNU Autoconf 2.63 for xkeyboard-config 1.6.99. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='xkeyboard-config' PACKAGE_TARNAME='xkeyboard-config' -PACKAGE_VERSION='1.6' -PACKAGE_STRING='xkeyboard-config 1.6' +PACKAGE_VERSION='1.6.99' +PACKAGE_STRING='xkeyboard-config 1.6.99' PACKAGE_BUGREPORT='' ac_unique_file="rules/base.xml.in" @@ -1342,7 +1342,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xkeyboard-config 1.6 to adapt to many kinds of systems. +\`configure' configures xkeyboard-config 1.6.99 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1409,7 +1409,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xkeyboard-config 1.6:";; + short | recursive ) echo "Configuration of xkeyboard-config 1.6.99:";; esac cat <<\_ACEOF @@ -1506,7 +1506,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xkeyboard-config configure 1.6 +xkeyboard-config configure 1.6.99 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1520,7 +1520,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xkeyboard-config $as_me 1.6, which was +It was created by xkeyboard-config $as_me 1.6.99, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2237,7 +2237,7 @@ fi # Define the identity of the package. PACKAGE='xkeyboard-config' - VERSION='1.6' + VERSION='1.6.99' cat >>confdefs.h <<_ACEOF @@ -6526,7 +6526,7 @@ ALL_LINGUAS="af az bg ca crh cs da de el en_GB eo es fi fr hu id it ka ko ky lt -ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/compat/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile types/Makefile xkeyboard-config.spec docs/Makefile" +ac_config_files="$ac_config_files po/Makefile.in Makefile compat/Makefile geometry/Makefile geometry/digital_vndr/Makefile geometry/sgi_vndr/Makefile keycodes/Makefile keycodes/digital_vndr/Makefile keycodes/sgi_vndr/Makefile keymap/Makefile keymap/digital_vndr/Makefile keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile rules/bin/Makefile rules/compat/Makefile rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile symbols/hp_vndr/Makefile symbols/macintosh_vndr/Makefile symbols/nec_vndr/Makefile symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile symbols/extras/Makefile types/Makefile xkeyboard-config.spec docs/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -7029,7 +7029,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xkeyboard-config $as_me 1.6, which was +This file was extended by xkeyboard-config $as_me 1.6.99, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7083,7 +7083,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -xkeyboard-config config.status 1.6 +xkeyboard-config config.status 1.6.99 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -7212,7 +7212,9 @@ do "keymap/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES keymap/sun_vndr/Makefile" ;; "semantics/Makefile") CONFIG_FILES="$CONFIG_FILES semantics/Makefile" ;; "rules/Makefile") CONFIG_FILES="$CONFIG_FILES rules/Makefile" ;; + "rules/bin/Makefile") CONFIG_FILES="$CONFIG_FILES rules/bin/Makefile" ;; "rules/compat/Makefile") CONFIG_FILES="$CONFIG_FILES rules/compat/Makefile" ;; + "rules/extras/Makefile") CONFIG_FILES="$CONFIG_FILES rules/extras/Makefile" ;; "symbols/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/Makefile" ;; "symbols/digital_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/digital_vndr/Makefile" ;; "symbols/fujitsu_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/fujitsu_vndr/Makefile" ;; @@ -7223,6 +7225,7 @@ do "symbols/sony_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sony_vndr/Makefile" ;; "symbols/sun_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/sun_vndr/Makefile" ;; "symbols/xfree68_vndr/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/xfree68_vndr/Makefile" ;; + "symbols/extras/Makefile") CONFIG_FILES="$CONFIG_FILES symbols/extras/Makefile" ;; "types/Makefile") CONFIG_FILES="$CONFIG_FILES types/Makefile" ;; "xkeyboard-config.spec") CONFIG_FILES="$CONFIG_FILES xkeyboard-config.spec" ;; "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; diff --git a/xorg-server/xkbdata.src/configure.in b/xorg-server/xkbdata.src/configure.in index 8dded0c4a..799ccf87f 100644 --- a/xorg-server/xkbdata.src/configure.in +++ b/xorg-server/xkbdata.src/configure.in @@ -1,4 +1,4 @@ -AC_INIT(xkeyboard-config, 1.6) +AC_INIT(xkeyboard-config, 1.6.99) AC_CONFIG_SRCDIR(rules/base.xml.in) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE @@ -66,7 +66,9 @@ keymap/sgi_vndr/Makefile keymap/sun_vndr/Makefile semantics/Makefile rules/Makefile +rules/bin/Makefile rules/compat/Makefile +rules/extras/Makefile symbols/Makefile symbols/digital_vndr/Makefile symbols/fujitsu_vndr/Makefile @@ -77,6 +79,7 @@ symbols/sgi_vndr/Makefile symbols/sony_vndr/Makefile symbols/sun_vndr/Makefile symbols/xfree68_vndr/Makefile +symbols/extras/Makefile types/Makefile xkeyboard-config.spec docs/Makefile diff --git a/xorg-server/xkbdata.src/geometry/Makefile.am b/xorg-server/xkbdata.src/geometry/Makefile.am index 8dccdc288..ff1f8c758 100644 --- a/xorg-server/xkbdata.src/geometry/Makefile.am +++ b/xorg-server/xkbdata.src/geometry/Makefile.am @@ -8,7 +8,7 @@ dell everex fujitsu \ hhk hp keytronic kinesis \ macintosh microsoft nec \ northgate pc sony thinkpad \ -sun winbook README +sun typematrix winbook README dir_data = $(dist_geom_DATA) diff --git a/xorg-server/xkbdata.src/geometry/Makefile.in b/xorg-server/xkbdata.src/geometry/Makefile.in index 5965542c5..ac6a41475 100644 --- a/xorg-server/xkbdata.src/geometry/Makefile.in +++ b/xorg-server/xkbdata.src/geometry/Makefile.in @@ -189,7 +189,7 @@ dell everex fujitsu \ hhk hp keytronic kinesis \ macintosh microsoft nec \ northgate pc sony thinkpad \ -sun winbook README +sun typematrix winbook README dir_data = $(dist_geom_DATA) dist_dir_DATA = $(subdir).dir @@ -542,7 +542,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_geomDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/geometry/geometry.dir b/xorg-server/xkbdata.src/geometry/geometry.dir index b5e627de2..41d54d2b5 100644 --- a/xorg-server/xkbdata.src/geometry/geometry.dir +++ b/xorg-server/xkbdata.src/geometry/geometry.dir @@ -100,6 +100,20 @@ h-p----- -------- hhk(basic) -------- -------- digital_vndr/lk(lk450) -------- -------- digital_vndr/lk(lk401bj) -------- -------- digital_vndr/lk(lk401jj) +-------- -------- typematrix(tm2020) +-------- -------- typematrix(tm2030_shape) +-------- -------- typematrix(tm2030_MiscDiod_dvk) +-------- -------- typematrix(tm2030_MiscDiod_102) +-------- -------- typematrix(tm2030_MiscDiod_106) +-------- -------- typematrix(tm2030_MiscDiod_off) +-------- -------- typematrix(tm2030_MiscDiod_on) +-------- -------- typematrix(tm2030USB_func) +-------- -------- typematrix(tm2030USB_alpha) +-------- -------- typematrix(tm2030USB_ctrl) +-------- -------- typematrix(tm2030PS2) +-------- -------- typematrix(tm2030USB) +-------- -------- typematrix(tm2030USB-102) +-------- -------- typematrix(tm2030USB-106) -d------ -------- chicony(us) -d------ -------- nec(pc98) -d------ -------- amiga(usa1) diff --git a/xorg-server/xkbdata.src/geometry/typematrix b/xorg-server/xkbdata.src/geometry/typematrix new file mode 100644 index 000000000..d86976f8f --- /dev/null +++ b/xorg-server/xkbdata.src/geometry/typematrix @@ -0,0 +1,745 @@ +// -*- indent-tabs-mode: nil -*- + +// Created by Frédéric Boiteux <fboiteux (at) free (dot) fr> +// and Gildas Cotomale <gildas (dot) cotomale (at) gmail (dot) com> + +// Note : the special/multimedia keys (Calc, WWW, Desktop…) have a keycode +// <I[XX]>, found in definition file /usr/share/X11/xkb/keycodes/evdev. +// Fn = <I120>; +// Calc = <I148>; +// WWW = <I158>; +// CycleWindows = <I162>; +// Mail = <I163>; +// PlayPause = <I172>; +// Desktop = <I243>; + + +xkb_geometry "tm2020" { + description = "TypeMatrix EZ-Reach 2020"; + + // Keyboard total size : + width = 308; + height = 152; + // background / foreground colours : + baseColor = "white"; + labelColor = "black"; + + // Key shapes : base key = 16 mm each side + shape "NORM" { cornerRadius=1, { [16, 16] }, { [1, 1], [15, 15] }}; + shape "ALPL" { cornerRadius=1, { [24.25, 16] }, { [1, 1], [23, 15] }}; + shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1, 1], [23, 31.5] }}; + shape "FUNC" { cornerRadius=1, { [16, 12] }, { [2.5, 0], [13.5, 10] }}; + shape "FUNL" { cornerRadius=1, { [24.25, 12] }, { [2.5, 0], [21.5, 10] }}; + shape "SPCE" { cornerRadius=1, { [57, 26] }, { [2.5, 1], [54.5, 24] }}; + shape "DBLA" { cornerRadius=1, { [32.5, 16] }, { [1, 1], [31, 15] }}; + shape "LED" { cornerRadius=2, { [4, 4] }}; + shape "DECO" { cornerRadius=1, { [3, 18] }}; + + // Function keys row + section "Function" { + left = 4; + top = 24; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "FUNC"; + row { + keys { { <ESC>, "FUNL" }, + <FK01>, <FK02>, <FK03>, <FK04>, <FK05> }; + key.color = "grey20"; + keys { { <NMLK>, "FUNL" } }; + }; + row { + left = 150; + key.color = "red"; + keys { { <DELE>, "FUNL" } }; + key.color = "grey10"; + keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, + { <FK12>, "FUNL" } }; + }; + }; + + // Alpha-numeric keys rows + section "Alpha" { + left = 4; + top = 36.5; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "NORM"; + row { + top = 0; + keys { { <TLDE>, "ALPL" }, + <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, + { <BKSP>, "DHAL" } }; + }; + row { + top = 16.5; + keys { { <TAB>, "ALPL" }, + <AD01>, <AD02>, <AD03>, <AD04>, <AD05> }; + }; + row { + top = 33; + keys { { <LFSH>, "DHAL" }, + <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, + { <TAB>, "DHAL" } }; + }; + row { + top = 49.5; + left = 24.5; + keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; + }; + row { + top = 0; + left = 150; + keys { { <BKSP>, "DHAL" }, + <AE06>, <AE07>, <AE08> }; + key.color = "grey20"; + keys { <AE09>, <AE10>, <AE11>, { <AE12>, "ALPL" } }; + }; + row { + top = 16.5; + left = 174.5; + keys { <AD06>, <AD07>, <AD08> }; + key.color = "grey20"; + keys { <AD09>, <AD10>, <AD11>, { <AD12>, "ALPL" } }; + }; + row { + top = 33; + left = 150; + keys { { <RTRN>, "DHAL" }, + <AC06>, <AC07>, <AC08> }; + key.color = "grey20"; + keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "DHAL" } }; + }; + row { + top = 49.5; + left = 174.5; + keys { <AB06>, <AB07>, <AB08> }; + key.color = "grey20"; + keys { <AB09>, <AB10>, <BKSL> }; + }; + }; + + // Control keys rows + section "Control" { + left = 4; + top = 102.5; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "ALPL"; + row { + top = 0; + keys { <LCTL>, <LALT>, <CAPS> }; + keys { { <SPCE>, "SPCE"} }; + }; + row { + top = 16.5; + keys { <I120>, <LWIN>, <MENU> }; + }; + row { + top = 0; + left = 150; + key.shape = "NORM"; + keys { { <SPCE>, "SPCE"}, <RALT> }; + key.color = "grey20"; + keys { <RCTL>, <UP>, <I162>, { <KPEN>, "DHAL" } }; + }; + row { + top = 16.5; + left = 207.5; + key.shape = "NORM"; + key.color = "grey20"; + keys { { <LEFT>, "DBLA" }, <DOWN>, <RGHT> }; + }; + }; + + // Diods + indicator.top = 12; + indicator.onColor = "green"; + indicator.offColor = "grey10"; + indicator.shape = "LED"; + indicator "Num Lock" { left = 252; }; + indicator "Caps Lock" { left = 266; }; + indicator "Misc" { left = 280; }; + text.top= 5; + text.color= "black"; + text "NumLockLabel" { left= 252; text="1"; }; + text "CapsLockLabel" { left= 266; text="A"; }; + text "MiscLabel" { left= 280; text="D"; }; + + text "Logo" { left = 29; top = 10; text="TypeMatrix™"; }; + + // other decorations : drawings + solid "rainure1" { shape = "DECO"; top = 1; left = 110; color = "grey10";}; + solid "rainure2" { shape = "DECO"; top = 1; left = 115; color = "grey10";}; + solid "rainure3" { shape = "DECO"; top = 1; left = 120; color = "grey10";}; + solid "rainure4" { shape = "DECO"; top = 1; left = 125; color = "grey10";}; + solid "rainure5" { shape = "DECO"; top = 1; left = 130; color = "grey10";}; + solid "rainure6" { shape = "DECO"; top = 1; left = 135; color = "grey10";}; + solid "rainure7" { shape = "DECO"; top = 1; left = 140; color = "grey10";}; + solid "rainure8" { shape = "DECO"; top = 1; left = 145; color = "grey10";}; + solid "rainure9" { shape = "DECO"; top = 1; left = 150; color = "grey10";}; + solid "rainure10" { shape = "DECO"; top = 1; left = 155; color = "grey10";}; + solid "rainure11" { shape = "DECO"; top = 1; left = 160; color = "grey10";}; + solid "rainure12" { shape = "DECO"; top = 1; left = 165; color = "grey10";}; + solid "rainure13" { shape = "DECO"; top = 1; left = 170; color = "grey10";}; +}; // geometry tm2020 + + +xkb_geometry "tm2030_shape" { + // Keyboard total size + width = 320; + height = 130; + // background / foreground colours : + baseColor = "white"; + labelColor = "black"; + + // Key shapes : base key = 20 mm each side + shape "NORM" { cornerRadius=1, { [18, 18] }, { [1.5, 1.5], [16.5, 14] } }; + shape "FUNC" { cornerRadius=1, { [18, 12] }, { [2.5, 0], [15.5, 10] } }; + shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5, 0], [15.5, 30] } }; + shape "ALT1" { cornerRadius=1, { [27.5, 18] }, { [2.5, 0], [23.5, 14] } }; + shape "BKSP" { cornerRadius=1, { [18, 30.5] }, { [1.5, 1.5], [16.5, 29] } }; + shape "SPCE" { cornerRadius=1, { [92, 25] }, { [1.5, 1.5], [90.5, 22] } }; + shape "LED" { cornerRadius=2, { [4, 4] } }; + shape "PAN1" { cornerRadius=1, { [27, 126.5] } }; + shape "PAN2" { cornerRadius=1, { [92, 13] } }; + + // other decorations : panels + solid "panneau1" { + shape = "PAN1"; + left = 0; + top = 0; + color = "grey40"; + }; + solid "panneau2" { + shape = "PAN2"; + left = 101.5; + top = 113.5; + color = "grey40"; + }; + + // Diods (Indicators) : they have to be put after panels, either the panels + // overwrites them. + indicator.left = 6; + indicator.onColor = "green"; + indicator.offColor = "grey10"; + indicator.shape = "LED"; + + indicator "Num Lock" { top = 11 ; }; + indicator "Caps Lock" { top = 27.5; }; + indicator "Scroll Lock" { top = 44 ; }; + + text.left = 12; + text.color = "black"; + text "NumLockLabel" { top = 11; text="num"; }; + text "CapsLockLabel" { top = 27.5; text="caps"; }; + text "SrollLockLabel" { top = 44; text="scroll"; }; +}; // geometry tm2030_shape + +xkb_geometry "tm2030_MiscDiod_dvk" { + text "ModeLabel" { left = 12; top = 58; color = "black"; text="Dvorak"; }; +}; // geometry tm2030_MiscDiod_dvk + +xkb_geometry "tm2030_MiscDiod_102" { + text "ModeLabel" { left = 12; top = 58; color = "black"; text="102"; }; +}; // geometry tm2030_MiscDiod_102 + +xkb_geometry "tm2030_MiscDiod_106" { + text "ModeLabel" { left = 12; top = 58; color = "black"; text="106"; }; +}; // geometry tm2030_MiscDiod_106 + +xkb_geometry "tm2030_MiscDiod_off" { + indicator "Misc" { left = 6; top = 60.5; shape = "LED"; + offColor = "grey10"; onColor = "grey10"; }; +}; // geometry tm2030_MiscDiod_off + +xkb_geometry "tm2030_MiscDiod_on" { + indicator "Misc" { left = 6; top = 60.5; shape = "LED"; + offColor = "green"; onColor = "green"; }; +}; // geometry tm2030_MiscDiod_on + + +xkb_geometry "tm2030USB_func" { + // Function keys rows + section "Function" { + left = 27; + top = 1.5; + key.gap = 0.5; + key.color = "grey30"; + key.shape = "FUNC"; + row { + keys { <ESC>, <FK01>, <FK02>, <FK03>, <FK04>, <FK05> }; + }; + row { + left = 129.5; + keys { <FK06>, <FK07>, <FK08>, <FK09>, <FK10>, <FK11>, + <FK12>, <NMLK> }; + }; + }; +}; // geometry tm2030USB_func + + +xkb_geometry "tm2030USB_alpha" { + // Alpha-numeric keys rows + section "Alpha" { + left = 27; + top = 14; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "NORM"; + row { + top = 0; + keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> }; + }; + row { + top = 18.5; + keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> }; + }; + row { + top = 37; + keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> }; + }; + row { + top = 55.5; + left = 18.5; + keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; + }; + + row { + top = 0; + left = 129.5; + keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I148> }; + }; + row { + top = 18.5; + left = 129.5; + keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <I163> }; + }; + row { + top = 37; + left = 129.5; + keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> }; + }; + row { + top = 55.5; + left = 129.5; + keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <BKSL> }; + }; + row { + top = 55.5; + left = 259; + keys { <I158> }; + }; + row { + top = 74; + left = 74; + keys { { <SPCE>, "SPCE" } }; + }; + }; +}; // geometry tm2030USB_alpha + + +xkb_geometry "tm2030USB_ctrl" { + // Control keys rows + section "Control" { + left = 27; + top = 0; + key.gap = 0.5; + key.color = "grey30"; + key.shape = "NORM"; + row { + top = 88; + keys { <LCTL>, <I172>, <MENU>, <I162> }; + }; + row { + top = 106.5; + keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } }; + }; + row { + top = 88; + left = 166.5; + keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> }; + }; + row { + top = 106.5; + left = 166.5; + keys { <RALT>, <LEFT>, <DOWN>, <RGHT> }; + }; + row { + top = 106.5; + left = 259; + keys { <PGDN> }; + }; + row { + top = 1; + left = 111.5; + vertical = true; + keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } }; + }; + }; +}; // geometry tm2030USB_ctrl + + +xkb_geometry "tm2030PS2" { + include "typematrix(tm2030_shape)" + include "typematrix(tm2030_MiscDiod_dvk)" + include "typematrix(tm2030_MiscDiod_off)" + + description = "TypeMatrix EZ-Reach 2030 PS2"; + + // Function keys row + section "Function" { + left = 27; + top = 1.5; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "FUNC"; + row { + key.color = "grey30"; + keys { <ESC> }; + }; + row { + left = 18.5; + keys { <FK01>, <FK02>, <FK03>, <FK04> }; + }; + row { + left = 92.5; + key.color = "grey30"; + keys { <FK05> }; + }; + row { + left = 129.5; + key.color = "grey30"; + keys { <FK06>, <FK07>, <FK08> }; + }; + row { + left = 185; + keys { <FK09>, <FK10>, <FK11>, <FK12> }; + }; + row { + left = 259; + key.color = "grey30"; + keys { <NMLK> }; + }; + }; + + // Alpha-numeric keys rows + section "Alpha" { + left = 27; + top = 14; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "NORM"; + row { + top = 0; + keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> }; + }; + row { + top = 18.5; + keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> }; + }; + row { + top = 37; + keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> }; + }; + row { + top = 55.5; + left = 18.5; + keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; + }; + + row { + top = 0; + left = 129.5; + keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <I120> }; + }; + row { + top = 18.5; + left = 129.5; + keys { <AD06>, <AD07>, <AD08> }; + }; + row { + top = 18.5; + left = 185; + key.color = "grey30"; + keys { <AD09>, <AD10>, <AD11>, <AD12>}; + }; + row { + top = 18.5; + left = 259; + keys { <BKSP> }; + }; + row { + top = 37; + left = 129.5; + keys { <AC06>, <AC07>, <AC08> }; + }; + row { + top = 37; + left = 185; + key.color = "grey30"; + keys { <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, + {<DELE>, key.color="red"} }; + }; + row { + top = 55.5; + left = 129.5; + keys { <AB06>, <AB07>, <AB08> }; + }; + row { + top = 55.5; + left = 185; + key.color = "grey30"; + keys { <AB09>, <AB10>, <BKSL> }; + }; + row { + top = 55.5; + left = 259; + keys { <INS> }; + }; + row { + top = 74; + left = 74; + keys { { <SPCE>, "SPCE" } }; + }; + }; // end section "Alpha" + + // Control keys rows + section "Control" { + left = 27; + top = 0; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "NORM"; + row { + top = 88; + keys { <I120>, <LWIN>, <MENU>, <I162> }; + }; + row { + top = 106.5; + keys { <LCTL>, { <LALT>, "ALT1" }, { <LTSH>, "ALT1" } }; + }; + row { + top = 88; + left = 166.5; + keys { <PGUP> }; + }; + row { + top = 88; + left = 185; + key.color = "grey30"; + keys { <HOME>, <UP>, <END>, { <KPEN>, "LFSH"} }; + }; + row { + top = 88; + left = 259; + keys { <RCTL> }; + }; + row { + top = 106.5; + left = 166.5; + keys { <PGDN> }; + }; + row { + top = 106.5; + left = 185; + key.color = "grey30"; + keys { <LEFT>, <DOWN>, <RGHT> }; + }; + row { + top = 106.5; + left = 259; + keys { <RALT> }; + }; + row { + top = 1; + left = 111.5; + key.color = "grey10"; + vertical = true; + keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } }; + }; + }; // end section "Control" +}; // geometry tm2030PS2 + + +xkb_geometry "tm2030USB" { + include "typematrix(tm2030_shape)" + include "typematrix(tm2030_MiscDiod_102)" + include "typematrix(tm2030_MiscDiod_off)" + + description = "TypeMatrix EZ-Reach 2030 USB"; + + include "typematrix(tm2030USB_func)" + include "typematrix(tm2030USB_alpha)" + include "typematrix(tm2030USB_ctrl)" +}; // geometry tm2030USB + + +// European 102/105 keys mode : +// Same as the standard keyboard, except for one key, Play becomes LSGT +xkb_geometry "tm2030USB-102" { + include "typematrix(tm2030_shape)" + include "typematrix(tm2030_MiscDiod_102)" + include "typematrix(tm2030_MiscDiod_on)" + + description = "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"; + + include "typematrix(tm2030USB_func)" + include "typematrix(tm2030USB_alpha)" + + // Control keys rows + section "Control" { + left = 27; + top = 0; + key.gap = 0.5; + key.color = "grey30"; + key.shape = "NORM"; + row { + top = 88; + keys { <LCTL>, <LSGT>, <MENU>, <I162> }; + }; + row { + top = 106.5; + keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } }; + }; + row { + top = 88; + left = 166.5; + keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> }; + }; + row { + top = 106.5; + left = 166.5; + keys { <RALT>, <LEFT>, <DOWN>, <RGHT> }; + }; + row { + top = 106.5; + left = 259; + keys { <PGDN> }; + }; + row { + top = 1; + left = 111.5; + vertical = true; + keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } }; + }; + }; +}; // geometry tm2030USB-102 + + +// Japan / Korean 106 keys mode : +// Same as the standard keyboard, except for following keys : +// – <TLDE> is replaced by <HZTG> +// – WWW key becomes <HKTG> +// — Calc key becomes <AE13> +// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11> + +// about Controls: +// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist) +// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section +// (see upper). + +xkb_geometry "tm2030USB-106" { + include "typematrix(tm2030_shape)" + include "typematrix(tm2030_MiscDiod_106)" + include "typematrix(tm2030_MiscDiod_on)" + + description = "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"; + + include "typematrix(tm2030USB_func)" + + // Alpha-numeric keys rows + section "Alpha" { + left = 27; + top = 14; + key.gap = 0.5; + key.color = "grey10"; + key.shape = "NORM"; + row { + top = 0; + keys { <HZTG>, <AE01>, <AE02>, <AE03>, <AE04>, <AE05> }; + }; + row { + top = 18.5; + keys { <TAB>, <AD01>, <AD02>, <AD03>, <AD04>, <AD05> }; + }; + row { + top = 37; + keys { { <LFSH>, "LFSH" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05> }; + }; + row { + top = 55.5; + left = 18.5; + keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05> }; + }; + + row { + top = 0; + left = 129.5; + keys { <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>, <AE13> }; + }; + row { + top = 18.5; + left = 129.5; + keys { <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, <BKSL> }; + }; + row { + top = 37; + left = 129.5; + keys { <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, <AC11>, { <RTSH>, "LFSH" }, <CAPS> }; + }; + row { + top = 55.5; + left = 129.5; + keys { <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <AB11> }; + }; + row { + top = 55.5; + left = 259; + keys { <HKTG> }; + }; + row { + top = 74; + left = 74; + keys { { <SPCE>, "SPCE" } }; + }; + }; + + // Control keys rows + section "Control" { + left = 27; + top = 0; + key.gap = 0.5; + key.color = "grey30"; + key.shape = "NORM"; + row { + top = 88; + keys { <LCTL>, <I172>, <MENU>, <I162> }; + }; + row { + top = 106.5; + keys { <I120>, { <LWIN>, "ALT1" }, { <LALT>, "ALT1" } }; + }; + row { + top = 88; + left = 166.5; + keys { <I243>, <HOME>, <UP>, <END>, { <RCTL>, "LFSH"}, <PGUP> }; + }; + row { + top = 106.5; + left = 166.5; + keys { <RALT>, <LEFT>, <DOWN>, <RGHT> }; + }; + row { + top = 106.5; + left = 259; + keys { <PGDN> }; + }; + row { + top = 1; + left = 111.5; + vertical = true; + keys { <DELE>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } }; + }; + }; +}; // geometry tm2030USB-106 diff --git a/xorg-server/xkbdata.src/keycodes/Makefile.in b/xorg-server/xkbdata.src/keycodes/Makefile.in index 1df15c3a1..7cf7b7745 100644 --- a/xorg-server/xkbdata.src/keycodes/Makefile.in +++ b/xorg-server/xkbdata.src/keycodes/Makefile.in @@ -550,7 +550,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_keycodesDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/keycodes/sun b/xorg-server/xkbdata.src/keycodes/sun index cdf8694fc..89d7fe66e 100644 --- a/xorg-server/xkbdata.src/keycodes/sun +++ b/xorg-server/xkbdata.src/keycodes/sun @@ -590,7 +590,7 @@ xkb_keycodes "type6_usb" { xkb_keycodes "type6tuv_usb" { include "sun(type6_usb)" -// <LSGT> = 94; + <LSGT> = 94; // <BKSL> = 51; }; diff --git a/xorg-server/xkbdata.src/keymap/Makefile.in b/xorg-server/xkbdata.src/keymap/Makefile.in index e9ea9ca8e..36378f620 100644 --- a/xorg-server/xkbdata.src/keymap/Makefile.in +++ b/xorg-server/xkbdata.src/keymap/Makefile.in @@ -540,7 +540,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_keymapDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/po/POTFILES.in b/xorg-server/xkbdata.src/po/POTFILES.in index 8b93ba498..901d327d4 100644 --- a/xorg-server/xkbdata.src/po/POTFILES.in +++ b/xorg-server/xkbdata.src/po/POTFILES.in @@ -1 +1,2 @@ rules/base.xml.in +rules/base.extras.xml.in diff --git a/xorg-server/xkbdata.src/po/POTFILES.skip b/xorg-server/xkbdata.src/po/POTFILES.skip index 78ff7e014..67c1092e1 100644 --- a/xorg-server/xkbdata.src/po/POTFILES.skip +++ b/xorg-server/xkbdata.src/po/POTFILES.skip @@ -1 +1,2 @@ rules/evdev.xml.in +rules/evdev.extras.xml.in diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am index 5d6e8b4bf..18b8b1a0e 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.am +++ b/xorg-server/xkbdata.src/rules/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = compat +SUBDIRS = bin compat extras if CREATE_RULES_SYMLINK # extra_rules_file = $(xkb_rules_symlink) @@ -20,126 +20,162 @@ install-data-hook: endif -base_parts_no_compat = base.hdr.part base.lists.part \ +if USE_COMPAT_RULES + +base_parts = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -evdev_parts_no_compat = base.hdr.part base.lists.part \ +evdev_parts = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ -HDR base.l_k.part \ +HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -if USE_COMPAT_RULES +else + base_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ -HDR base.o_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part evdev_parts = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.o_k.part \ +HDR base.l_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -else -base_parts = $(base_parts_no_compat) -evdev_parts = $(base_parts_no_compat) + endif -base_parts_compat_dist = base.o_k.part base.lo_s.part +all_parts_dist = HDR base.hdr.part \ +base.lists.part \ +base.m_k.part \ +base.l1_k.part \ +base.l_k.part \ +base.o_k.part \ +base.ml_g.part \ +base.m_g.part \ +base.mlv_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.m_s.part \ +base.ml_c.part \ +base.ml1_c.part \ +base.m_t.part \ +base.lo_s.part \ +base.l1o_s.part \ +base.l2o_s.part \ +base.l3o_s.part \ +base.l4o_s.part \ +base.o_s.part \ +base.o_c.part \ +base.o_t.part \ +evdev.m_k.part \ +evdev.m_s.part rules_files = base evdev xfree98 @@ -148,30 +184,31 @@ lst_files = base.lst evdev.lst %.lst: %.xml perl $(srcdir)/xml2lst.pl < $< > $@ -base: $(base_parts_no_compat) +base: $(base_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) -evdev: $(evdev_parts_no_compat) +evdev: $(evdev_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) dist_files = xkb.dtd README rules_DATA = $(rules_files) $(lst_files) $(dist_files) -xml_in_files = base.xml.in evdev.xml.in +xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) $(srcdir)/evdev.xml.in: base.xml.in cp $< $@ +$(srcdir)/evdev.extras.xml.in: base.extras.xml.in + cp $< $@ + EXTRA_DIST= $(xml_in_files) xfree98 \ - $(base_parts_no_compat) \ - $(evdev_parts_no_compat) \ - $(base_parts_compat_dist) \ + $(all_parts_dist) \ xml2lst.pl merge.sh $(dist_files) -CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst -MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in index bc498f1d1..583a1ce8f 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.in +++ b/xorg-server/xkbdata.src/rules/Makefile.in @@ -175,60 +175,37 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ -SUBDIRS = compat -base_parts_no_compat = base.hdr.part base.lists.part \ -HDR base.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ -HDR base.m_s.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -evdev_parts_no_compat = base.hdr.part base.lists.part \ -HDR evdev.m_k.part \ -HDR base.l1_k.part \ -HDR base.l_k.part \ -HDR base.ml_g.part \ -HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ -HDR evdev.m_s.part \ -HDR base.ml_c.part \ -HDR base.ml1_c.part \ -HDR base.m_t.part \ -HDR base.l1o_s.part \ -HDR base.l2o_s.part \ -HDR base.l3o_s.part \ -HDR base.l4o_s.part \ -HDR base.o_s.part \ -HDR base.o_c.part \ -HDR base.o_t.part - -@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat) +SUBDIRS = bin compat extras +@USE_COMPAT_RULES_FALSE@base_parts = base.hdr.part base.lists.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_t.part + @USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_k.part \ @@ -237,16 +214,16 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @@ -256,11 +233,40 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_t.part -@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat) +@USE_COMPAT_RULES_FALSE@evdev_parts = base.hdr.part base.lists.part \ +@USE_COMPAT_RULES_FALSE@HDR evdev.m_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \ +@USE_COMPAT_RULES_FALSE@HDR evdev.m_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \ +@USE_COMPAT_RULES_FALSE@HDR \ +@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \ +@USE_COMPAT_RULES_FALSE@HDR base.o_t.part + @USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \ @USE_COMPAT_RULES_TRUE@compat/base.lists.part \ @USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \ @@ -269,16 +275,16 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \ @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ @USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \ @@ -288,25 +294,51 @@ HDR base.o_t.part @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \ -@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ +@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \ @USE_COMPAT_RULES_TRUE@HDR base.o_t.part -base_parts_compat_dist = base.o_k.part base.lo_s.part +all_parts_dist = HDR base.hdr.part \ +base.lists.part \ +base.m_k.part \ +base.l1_k.part \ +base.l_k.part \ +base.o_k.part \ +base.ml_g.part \ +base.m_g.part \ +base.mlv_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.m_s.part \ +base.ml_c.part \ +base.ml1_c.part \ +base.m_t.part \ +base.lo_s.part \ +base.l1o_s.part \ +base.l2o_s.part \ +base.l3o_s.part \ +base.l4o_s.part \ +base.o_s.part \ +base.o_c.part \ +base.o_t.part \ +evdev.m_k.part \ +evdev.m_s.part + rules_files = base evdev xfree98 lst_files = base.lst evdev.lst dist_files = xkb.dtd README rules_DATA = $(rules_files) $(lst_files) $(dist_files) -xml_in_files = base.xml.in evdev.xml.in +xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in xml_DATA = $(xml_in_files:.xml.in=.xml) EXTRA_DIST = $(xml_in_files) xfree98 \ - $(base_parts_no_compat) \ - $(evdev_parts_no_compat) \ - $(base_parts_compat_dist) \ + $(all_parts_dist) \ xml2lst.pl merge.sh $(dist_files) -CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst -MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in +CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml +MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in rulesdir = $(xkb_base)/rules xmldir = $(rulesdir) all: all-recursive @@ -676,15 +708,18 @@ uninstall-am: uninstall-rulesDATA uninstall-xmlDATA %.lst: %.xml perl $(srcdir)/xml2lst.pl < $< > $@ -base: $(base_parts_no_compat) +base: $(base_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts) -evdev: $(evdev_parts_no_compat) +evdev: $(evdev_parts) HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts) $(srcdir)/evdev.xml.in: base.xml.in cp $< $@ +$(srcdir)/evdev.extras.xml.in: base.extras.xml.in + cp $< $@ + @INTLTOOL_XML_NOMERGE_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xorg-server/xkbdata.src/rules/base.extras.xml.in b/xorg-server/xkbdata.src/rules/base.extras.xml.in new file mode 100644 index 000000000..7e32c3140 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/base.extras.xml.in @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd"> +<xkbConfigRegistry> + <modelList/> + <layoutList> + <layout> + <configItem> + <name>apl</name> + <_shortDescription>APL</_shortDescription> + <_description>APL</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList/> + </layout> + <layout> + <configItem> + <name>us</name> + <_shortDescription>USA</_shortDescription> + <_description>USA</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>intl-unicode</name> + <_description>International (AltGr Unicode combining)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>alt-intl-unicode</name> + <_description>International (AltGr Unicode combining, alternative)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>ats</name> + <_description>Atsina</_description> + <!-- No ISO code in ISO639-2, only draft ISO693-3 --> + </configItem> + </variant> + <variant> + <configItem> + <name>crd</name> + <_description>Couer D'alene Salish</_description> + <languageList><iso639Id>crd</iso639Id></languageList> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>rs</name> + <_shortDescription>SRB</_shortDescription> + <_description>Serbia</_description> + <languageList><iso639Id>srp</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>combiningkeys</name> + <_description>Combining accents instead of dead keys</_description> + </configItem> + </variant> + </variantList> + </layout> + </layoutList> + <optionList/> +</xkbConfigRegistry> diff --git a/xorg-server/xkbdata.src/rules/base.lists.part b/xorg-server/xkbdata.src/rules/base.lists.part index d2e8383df..d1927c537 100644 --- a/xorg-server/xkbdata.src/rules/base.lists.part +++ b/xorg-server/xkbdata.src/rules/base.lists.part @@ -14,6 +14,9 @@ // PC geometries - they have special geometry but symbols are mostly pc105 ! $pcgeometries = latitude +// TypeMatrix geometries +! $tmgeometries = tm2020 tm2030PS2 tm2030USB tm2030USB-102 tm2030USB-106 + // Layouts that provide further specializations for the OLPC ! $olpclayouts = af am ara br ca es et it kh kz in mn np ru th tr us @@ -36,6 +39,7 @@ chicony chicony0108 chicony0420 chicony9885 \ compalfl90 \ compaqeak8 compaqik7 compaqik13 compaqik18 \ + creativedw7000 \ cymotionlinux \ dell dellm65 inspiron dellusbmm \ emachines ennyah_dkb1008 evdev \ @@ -90,4 +94,3 @@ ! $evdevkbds = ibm_spacesaver ! $thinkpads = thinkpad thinkpad60 thinkpadz60 - diff --git a/xorg-server/xkbdata.src/rules/base.m_g.part b/xorg-server/xkbdata.src/rules/base.m_g.part index 36525754c..a925bfa8d 100644 --- a/xorg-server/xkbdata.src/rules/base.m_g.part +++ b/xorg-server/xkbdata.src/rules/base.m_g.part @@ -12,6 +12,7 @@ thinkpad = thinkpad(intl) thinkpad60 = thinkpad(60) thinkpadz60 = thinkpad(60) + $tmgeometries = typematrix(%m) winbook = winbook(XP5) pc98 = nec(pc98) $macbooks = macintosh(%m) diff --git a/xorg-server/xkbdata.src/rules/base.m_k.part b/xorg-server/xkbdata.src/rules/base.m_k.part index b6433b2c8..30534f715 100644 --- a/xorg-server/xkbdata.src/rules/base.m_k.part +++ b/xorg-server/xkbdata.src/rules/base.m_k.part @@ -3,6 +3,7 @@ sun4 = sun(type4_euro) sun5 = sun(type5_euro) sun6 = sun(type6_usb) + sun6euro = sun(type6tuv_usb) pc98 = xfree98(pc98) evdev = evdev olpc = evdev diff --git a/xorg-server/xkbdata.src/rules/base.ml1_s.part b/xorg-server/xkbdata.src/rules/base.ml1_s.part index c45b9805e..6a0787d21 100644 --- a/xorg-server/xkbdata.src/rules/base.ml1_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml1_s.part @@ -1,7 +1,7 @@ ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(sun4)+%l[1]%(v[1]) - sun5 * = latin+sun_vndr/us(sun5)+%l[1]%(v[1]) + sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) + sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) diff --git a/xorg-server/xkbdata.src/rules/base.ml_s.part b/xorg-server/xkbdata.src/rules/base.ml_s.part index 7e9b2d63e..c5fed0bed 100644 --- a/xorg-server/xkbdata.src/rules/base.ml_s.part +++ b/xorg-server/xkbdata.src/rules/base.ml_s.part @@ -10,6 +10,9 @@ sun6 us = sun_vndr/us(type6) sun6 en_US = sun_vndr/us(type6)+iso9995-3(basic) sun6 * = sun_vndr/us(type6)+%l%(v) + sun6euro us = sun_vndr/us(type6) + sun6euro en_US = sun_vndr/us(type6)+iso9995-3(basic) + sun6euro * = sun_vndr/us(type6)+%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) diff --git a/xorg-server/xkbdata.src/rules/base.o_s.part b/xorg-server/xkbdata.src/rules/base.o_s.part index d3078bfc5..f9290dae7 100644 --- a/xorg-server/xkbdata.src/rules/base.o_s.part +++ b/xorg-server/xkbdata.src/rules/base.o_s.part @@ -49,10 +49,14 @@ lv3:rwin_switch = +level3(rwin_switch) lv3:enter_switch = +level3(enter_switch) caps:capslock = +capslock(capslock) + caps:numlock = +capslock(numlock) caps:shiftlock = +capslock(shiftlock) caps:swapescape = +capslock(swapescape) caps:escape = +capslock(escape) caps:backspace = +capslock(backspace) + caps:super = +capslock(super) + caps:hyper = +capslock(hyper) + caps:none = +capslock(none) ctrl:nocaps = +ctrl(nocaps) ctrl:swapcaps = +ctrl(swapcaps) ctrl:ctrl_ac = +ctrl(ctrl_ac) diff --git a/xorg-server/xkbdata.src/rules/base.xml.in b/xorg-server/xkbdata.src/rules/base.xml.in index 996cde84f..f43e651bb 100644 --- a/xorg-server/xkbdata.src/rules/base.xml.in +++ b/xorg-server/xkbdata.src/rules/base.xml.in @@ -981,6 +981,41 @@ </model> <model> <configItem> + <name>tm2020</name> + <description>TypeMatrix EZ-Reach 2020</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030PS2</name> + <description>TypeMatrix EZ-Reach 2030 PS2</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB</name> + <description>TypeMatrix EZ-Reach 2030 USB</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-102</name> + <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-106</name> + <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <_description>Yahoo! Internet Keyboard</_description> <vendor>Yahoo!</vendor> @@ -1154,6 +1189,13 @@ <vendor>Compal Electronics Inc.</vendor> </configItem> </model> + <model> + <configItem> + <name>creativedw7000</name> + <_description>Creative Desktop Wireless 7000</_description> + <vendor>Creative</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1455,8 +1497,8 @@ <variantList> <variant> <configItem> - <name>winkeys</name> - <_description>Winkeys</_description> + <name>legacy</name> + <_description>Legacy</_description> </configItem> </variant> <variant> @@ -1615,6 +1657,13 @@ </variant> <variant> <configItem> + <name>tam_keyboard_with_numerals</name> + <description>Tamil Keyboard with Numerals</description> + <languageList><iso639Id>tam</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>tam_TAB</name> <_description>Tamil TAB Typewriter</_description> <languageList><iso639Id>tam</iso639Id></languageList> @@ -1764,7 +1813,7 @@ <variant> <configItem> <name>phonetic</name> - <_description>Traditional Phonetic</_description> + <_description>Traditional phonetic</_description> </configItem> </variant> </variantList> @@ -1772,7 +1821,7 @@ <variant> <configItem> <name>bas_phonetic</name> - <_description>Standard Phonetic</_description> + <_description>New phonetic</_description> </configItem> </variant> </variantList> @@ -2119,20 +2168,8 @@ <variantList> <variant> <configItem> - <name>pro</name> - <_description>Pro</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>keypad</name> - <_description>Keypad</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>pro_keypad</name> - <_description>Pro Keypad</_description> + <name>pes_keypad</name> + <_description>Persian, with Persian Keypad</_description> </configItem> </variant> <variant> @@ -2797,6 +2834,12 @@ </variant> <variant> <configItem> + <name>us</name> + <_description>US keyboard with Italian letters</_description> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <_description>Georgian</_description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -3431,6 +3474,13 @@ <_description>DOS</_description> </configItem> </variant> + <variant> + <configItem> + <name>bak</name> + <_description>Bashkirian</_description> + <languageList><iso639Id>bak</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -4750,6 +4800,12 @@ </option> <option> <configItem> + <name>caps:numlock</name> + <_description>Make CapsLock an additional NumLock</_description> + </configItem> + </option> + <option> + <configItem> <name>caps:swapescape</name> <_description>Swap ESC and CapsLock</_description> </configItem> @@ -4768,10 +4824,28 @@ </option> <option> <configItem> + <name>caps:super</name> + <_description>Make CapsLock an additional Super</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:hyper</name> + <_description>Make CapsLock an additional Hyper</_description> + </configItem> + </option> + <option> + <configItem> <name>caps:shiftlock</name> <_description>CapsLock toggles Shift so all keys are affected</_description> </configItem> </option> + <option> + <configItem> + <name>caps:none</name> + <_description>CapsLock is disabled</_description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) --> diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.am b/xorg-server/xkbdata.src/rules/bin/Makefile.am new file mode 100644 index 000000000..b9785b107 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/Makefile.am @@ -0,0 +1,10 @@ +transform_scripts= \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +EXTRA_DIST=$(transform_scripts) diff --git a/xorg-server/xkbdata.src/rules/bin/Makefile.in b/xorg-server/xkbdata.src/rules/bin/Makefile.in new file mode 100644 index 000000000..097cf8013 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/Makefile.in @@ -0,0 +1,326 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = rules/bin +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xkb_base = @xkb_base@ +xkb_rules_symlink = @xkb_rules_symlink@ +transform_scripts = \ +ln_s.sh \ +lnv_s.sh \ +ml_s.sh \ +mlv_s.sh \ +ml1_s.sh \ +ml1v_s.sh \ +ml1v1_s.sh + +EXTRA_DIST = $(transform_scripts) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/bin/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu rules/bin/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/bin/ln_s.sh b/xorg-server/xkbdata.src/rules/bin/ln_s.sh new file mode 100644 index 000000000..78e557d8f --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ln_s.sh @@ -0,0 +1,10 @@ +@echo off +set variant=%1 + +set OUTFILE=base.l%variant%_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ if (index($2, """(""") == 0) { printf """ %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2; } else { printf """ %%s = +%%s:%variant%\n""", $1, $2; }}" < layoutsMapping.lst >> %OUTFILE% + +gawk "{ printf """ %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/lnv_s.sh b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh new file mode 100644 index 000000000..6bbf285e7 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/lnv_s.sh @@ -0,0 +1,8 @@ +@echo off +set variant=%1 + +set OUTFILE=base.l%variant%v%variant%_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ printf """ %%s %%s = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh new file mode 100644 index 000000000..b09459a5d --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1_s.sh @@ -0,0 +1,9 @@ +@echo off + +set OUTFILE=base.ml1_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ if (index($2, """(""") == 0) { printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2; } else { printf """ * %%s = pc+%%s\n""", $1, $2; }}" < layoutsMapping.lst >> %OUTFILE% + +gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh new file mode 100644 index 000000000..4d492e02b --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1v1_s.sh @@ -0,0 +1,7 @@ +@echo off + +set OUTFILE=base.ml1v1_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh new file mode 100644 index 000000000..cec1334c0 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml1v_s.sh @@ -0,0 +1,7 @@ +@echo off + +set OUTFILE=base.ml1v_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/ml_s.sh b/xorg-server/xkbdata.src/rules/bin/ml_s.sh new file mode 100644 index 000000000..b7f0d9c46 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/ml_s.sh @@ -0,0 +1,9 @@ +@echo off + +set OUTFILE=base.ml_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ printf """ * %%s = pc+%%s\n""", $1, $2; }" < layoutsMapping.lst >> %OUTFILE% + +gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/bin/mlv_s.sh b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh new file mode 100644 index 000000000..573cb930f --- /dev/null +++ b/xorg-server/xkbdata.src/rules/bin/mlv_s.sh @@ -0,0 +1,7 @@ +@echo off + +set OUTFILE=base.mlv_s.part + +if exist %OUTFILE% del %OUTFILE% + +gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" < variantsMapping.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am index 20bf3d9a1..755be6d07 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.am +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am @@ -1,17 +1,10 @@ -transform_files=layoutRename.lst variantRename.lst - -transform_scripts= \ -ln_s.sh \ -lnv_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh +transform_files=layoutsMapping.lst variantsMapping.lst dist_parts=base.o_s.part +scripts_dir=$(srcdir)/../bin + scripts= \ base.l2_s.part \ base.l3_s.part \ @@ -35,36 +28,36 @@ noinst_SCRIPTS= endif -base.l2_s.part: ln_s.sh $(transform_files) - sh $< 2 +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3_s.part: ln_s.sh $(transform_files) - sh $< 3 +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4_s.part: ln_s.sh $(transform_files) - sh $< 4 +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.l2v2_s.part: lnv_s.sh $(transform_files) - sh $< 2 +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3v3_s.part: lnv_s.sh $(transform_files) - sh $< 3 +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4v4_s.part: lnv_s.sh $(transform_files) - sh $< 4 +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.ml_s.part: ml_s.sh $(transform_files) - sh $< +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1_s.part: ml1_s.sh $(transform_files) - sh $< +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) -base.mlv_s.part: mlv_s.sh $(transform_files) - sh $< +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1v1_s.part: ml1v1_s.sh $(transform_files) - sh $< +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) -EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts) +EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts) CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in index 1488a728d..f78214247 100644 --- a/xorg-server/xkbdata.src/rules/compat/Makefile.in +++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in @@ -154,17 +154,9 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ -transform_files = layoutRename.lst variantRename.lst -transform_scripts = \ -ln_s.sh \ -lnv_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh - +transform_files = layoutsMapping.lst variantsMapping.lst dist_parts = base.o_s.part +scripts_dir = $(srcdir)/../bin scripts = \ base.l2_s.part \ base.l3_s.part \ @@ -180,7 +172,7 @@ base.ml_s.part @USE_COMPAT_RULES_FALSE@noinst_SCRIPTS = @USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(scripts) $(dist_parts) -EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts) +EXTRA_DIST = base.lists.part $(transform_files) $(dist_parts) CLEANFILES = $(scripts) all: all-am @@ -343,35 +335,35 @@ uninstall-am: mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am -base.l2_s.part: ln_s.sh $(transform_files) - sh $< 2 +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3_s.part: ln_s.sh $(transform_files) - sh $< 3 +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4_s.part: ln_s.sh $(transform_files) - sh $< 4 +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.l2v2_s.part: lnv_s.sh $(transform_files) - sh $< 2 +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) -base.l3v3_s.part: lnv_s.sh $(transform_files) - sh $< 3 +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) -base.l4v4_s.part: lnv_s.sh $(transform_files) - sh $< 4 +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) -base.ml_s.part: ml_s.sh $(transform_files) - sh $< +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1_s.part: ml1_s.sh $(transform_files) - sh $< +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) -base.mlv_s.part: mlv_s.sh $(transform_files) - sh $< +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) -base.ml1v1_s.part: ml1v1_s.sh $(transform_files) - sh $< +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst index cecda6d8a..cecda6d8a 100644 --- a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst +++ b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh deleted file mode 100644 index 6fc8f4713..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh +++ /dev/null @@ -1,10 +0,0 @@ -@echo off -set variant=%1 - -set OUTFILE=base.l%variant%_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ if (index($2, """(""") == 0) { printf """ %%s = +%%s%%%%(v[%variant%]):%variant%\n""", $1, $2;} else { printf """ %%s = +%%s:%variant%\n""", $1, $2; } }" layoutRename.lst >> %OUTFILE% - -gawk "{ printf """ %%s(%%s) = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh deleted file mode 100644 index a2b828803..000000000 --- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -set variant=%1 - -set OUTFILE=base.l%variant%v%variant%_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ %%s %%s = +%%s(%%s):%variant%\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/makefile b/xorg-server/xkbdata.src/rules/compat/makefile index 1abfe775f..4a1a7b832 100644 --- a/xorg-server/xkbdata.src/rules/compat/makefile +++ b/xorg-server/xkbdata.src/rules/compat/makefile @@ -1,14 +1,6 @@ +TRANSFORM_FILES=layoutsMapping.lst variantsMapping.lst -TRANSFORM_FILES=layoutRename.lst variantRename.lst - -TRANSFORM_SCRIPTS= \ -ln_s.sh \ -lnv_s.sh \ -ml_s.sh \ -mlv_s.sh \ -ml1_s.sh \ -ml1v_s.sh \ -ml1v1_s.sh +scripts_dir=..\bin SCRIPTS= \ base.l2_s.part \ @@ -25,7 +17,7 @@ base.ml_s.part SH=cmd /c -%.bat: %.sh +%.bat: $(scripts_dir)\%.sh copy $< $@ base.l2_s.part: ln_s.bat $(TRANSFORM_FILES) diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh deleted file mode 100644 index dedccdb45..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -set OUTFILE=base.ml1_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{if (index($2, """(""") == 0) { printf """ * %%s = pc+%%s%%%%(v[1])\n""", $1, $2;} else { printf """ * %%s = pc+%%s\n""", $1, $2;}}" layoutRename.lst >> %OUTFILE% - -gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh deleted file mode 100644 index 26de0ea38..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -set OUTFILE=base.ml1v1_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh deleted file mode 100644 index afd7d7b19..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -set OUTFILE=base.ml1v_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh deleted file mode 100644 index c0b945a26..000000000 --- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh +++ /dev/null @@ -1,9 +0,0 @@ -@echo off - -set OUTFILE=base.ml_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s = pc+%%s\n""", $1, $2; }" layoutRename.lst >> %OUTFILE% - -gawk "{ printf """ * %%s(%%s) = pc+%%s(%%s)\n""", $1, $2, $3, $4;}" variantRename.lst >> %OUTFILE% diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh deleted file mode 100644 index 4dbe7acb3..000000000 --- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh +++ /dev/null @@ -1,8 +0,0 @@ -@echo off - -set OUTFILE=base.mlv_s.part - -if exist %OUTFILE% del %OUTFILE% - -gawk "{ printf """ * %%s %%s = pc+%%s(%%s)\n""", $1, $2, $3, $4; }" variantRename.lst >> %OUTFILE% - diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst index f85a2d0a8..be2a2bc40 100644 --- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst +++ b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst @@ -40,6 +40,7 @@ syr basic sy syc syr phonetic sy syc_phonetic tam INSCRIPT in tam tam UNI in tam_unicode +tam NUMERAL-KEYBOARD in tam_keyboard_with_numerals tam TAB in tam_TAB tam TSCII in tam_TSCII tel basic in tel diff --git a/xorg-server/xkbdata.src/rules/evdev.extras.xml.in b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in new file mode 100644 index 000000000..7e32c3140 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/evdev.extras.xml.in @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd"> +<xkbConfigRegistry> + <modelList/> + <layoutList> + <layout> + <configItem> + <name>apl</name> + <_shortDescription>APL</_shortDescription> + <_description>APL</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList/> + </layout> + <layout> + <configItem> + <name>us</name> + <_shortDescription>USA</_shortDescription> + <_description>USA</_description> + <languageList><iso639Id>eng</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>intl-unicode</name> + <_description>International (AltGr Unicode combining)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>alt-intl-unicode</name> + <_description>International (AltGr Unicode combining, alternative)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>ats</name> + <_description>Atsina</_description> + <!-- No ISO code in ISO639-2, only draft ISO693-3 --> + </configItem> + </variant> + <variant> + <configItem> + <name>crd</name> + <_description>Couer D'alene Salish</_description> + <languageList><iso639Id>crd</iso639Id></languageList> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>rs</name> + <_shortDescription>SRB</_shortDescription> + <_description>Serbia</_description> + <languageList><iso639Id>srp</iso639Id></languageList> + </configItem> + <variantList> + <variant> + <configItem> + <name>combiningkeys</name> + <_description>Combining accents instead of dead keys</_description> + </configItem> + </variant> + </variantList> + </layout> + </layoutList> + <optionList/> +</xkbConfigRegistry> diff --git a/xorg-server/xkbdata.src/rules/evdev.xml.in b/xorg-server/xkbdata.src/rules/evdev.xml.in index 996cde84f..f43e651bb 100644 --- a/xorg-server/xkbdata.src/rules/evdev.xml.in +++ b/xorg-server/xkbdata.src/rules/evdev.xml.in @@ -981,6 +981,41 @@ </model> <model> <configItem> + <name>tm2020</name> + <description>TypeMatrix EZ-Reach 2020</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030PS2</name> + <description>TypeMatrix EZ-Reach 2030 PS2</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB</name> + <description>TypeMatrix EZ-Reach 2030 USB</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-102</name> + <description>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> + <name>tm2030USB-106</name> + <description>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</description> + <vendor>TypeMatrix</vendor> + </configItem> + </model> + <model> + <configItem> <name>yahoo</name> <_description>Yahoo! Internet Keyboard</_description> <vendor>Yahoo!</vendor> @@ -1154,6 +1189,13 @@ <vendor>Compal Electronics Inc.</vendor> </configItem> </model> + <model> + <configItem> + <name>creativedw7000</name> + <_description>Creative Desktop Wireless 7000</_description> + <vendor>Creative</vendor> + </configItem> + </model> </modelList> <layoutList> <layout> @@ -1455,8 +1497,8 @@ <variantList> <variant> <configItem> - <name>winkeys</name> - <_description>Winkeys</_description> + <name>legacy</name> + <_description>Legacy</_description> </configItem> </variant> <variant> @@ -1615,6 +1657,13 @@ </variant> <variant> <configItem> + <name>tam_keyboard_with_numerals</name> + <description>Tamil Keyboard with Numerals</description> + <languageList><iso639Id>tam</iso639Id></languageList> + </configItem> + </variant> + <variant> + <configItem> <name>tam_TAB</name> <_description>Tamil TAB Typewriter</_description> <languageList><iso639Id>tam</iso639Id></languageList> @@ -1764,7 +1813,7 @@ <variant> <configItem> <name>phonetic</name> - <_description>Traditional Phonetic</_description> + <_description>Traditional phonetic</_description> </configItem> </variant> </variantList> @@ -1772,7 +1821,7 @@ <variant> <configItem> <name>bas_phonetic</name> - <_description>Standard Phonetic</_description> + <_description>New phonetic</_description> </configItem> </variant> </variantList> @@ -2119,20 +2168,8 @@ <variantList> <variant> <configItem> - <name>pro</name> - <_description>Pro</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>keypad</name> - <_description>Keypad</_description> - </configItem> - </variant> - <variant> - <configItem> - <name>pro_keypad</name> - <_description>Pro Keypad</_description> + <name>pes_keypad</name> + <_description>Persian, with Persian Keypad</_description> </configItem> </variant> <variant> @@ -2797,6 +2834,12 @@ </variant> <variant> <configItem> + <name>us</name> + <_description>US keyboard with Italian letters</_description> + </configItem> + </variant> + <variant> + <configItem> <name>geo</name> <_description>Georgian</_description> <languageList><iso639Id>geo</iso639Id></languageList> @@ -3431,6 +3474,13 @@ <_description>DOS</_description> </configItem> </variant> + <variant> + <configItem> + <name>bak</name> + <_description>Bashkirian</_description> + <languageList><iso639Id>bak</iso639Id></languageList> + </configItem> + </variant> </variantList> </layout> <layout> @@ -4750,6 +4800,12 @@ </option> <option> <configItem> + <name>caps:numlock</name> + <_description>Make CapsLock an additional NumLock</_description> + </configItem> + </option> + <option> + <configItem> <name>caps:swapescape</name> <_description>Swap ESC and CapsLock</_description> </configItem> @@ -4768,10 +4824,28 @@ </option> <option> <configItem> + <name>caps:super</name> + <_description>Make CapsLock an additional Super</_description> + </configItem> + </option> + <option> + <configItem> + <name>caps:hyper</name> + <_description>Make CapsLock an additional Hyper</_description> + </configItem> + </option> + <option> + <configItem> <name>caps:shiftlock</name> <_description>CapsLock toggles Shift so all keys are affected</_description> </configItem> </option> + <option> + <configItem> + <name>caps:none</name> + <_description>CapsLock is disabled</_description> + </configItem> + </option> </group> <group allowMultipleSelection="false"> <!-- Using special PC keys (Win, Menu) to work as standard X keys (Super, Hyper, etc.) --> diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.am b/xorg-server/xkbdata.src/rules/extras/Makefile.am new file mode 100644 index 000000000..ad71f2e76 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/Makefile.am @@ -0,0 +1,52 @@ +transform_files=layoutsMapping.lst variantsMapping.lst + +scripts_dir=$(srcdir)/../bin + +scripts= \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +noinst_SCRIPTS=$(scripts) + +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) + +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) + +EXTRA_DIST=$(transform_files) + +CLEANFILES=$(scripts) diff --git a/xorg-server/xkbdata.src/rules/extras/Makefile.in b/xorg-server/xkbdata.src/rules/extras/Makefile.in new file mode 100644 index 000000000..3d3b1e53a --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/Makefile.in @@ -0,0 +1,367 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = rules/extras +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SCRIPTS = $(noinst_SCRIPTS) +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xkb_base = @xkb_base@ +xkb_rules_symlink = @xkb_rules_symlink@ +transform_files = layoutsMapping.lst variantsMapping.lst +scripts_dir = $(srcdir)/../bin +scripts = \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +noinst_SCRIPTS = $(scripts) +EXTRA_DIST = $(transform_files) +CLEANFILES = $(scripts) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu rules/extras/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu rules/extras/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(SCRIPTS) +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am + + +base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 2 $(srcdir) + +base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 3 $(srcdir) + +base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files) + sh $< 4 $(srcdir) + +base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files) + sh $< $(srcdir) + +base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files) + sh $< $(srcdir) + +base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files) + sh $< $(srcdir) +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst new file mode 100644 index 000000000..d75b4f44d --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/layoutsMapping.lst @@ -0,0 +1 @@ +apl extras/apl diff --git a/xorg-server/xkbdata.src/rules/extras/makefile b/xorg-server/xkbdata.src/rules/extras/makefile new file mode 100644 index 000000000..f5753f674 --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/makefile @@ -0,0 +1,53 @@ +TRANSFORM_FILES=layoutsMapping.lst variantsMapping.lst + +scripts_dir=..\bin + +SCRIPTS= \ +base.l2_s.part \ +base.l3_s.part \ +base.l4_s.part \ +base.l2v2_s.part \ +base.l3v3_s.part \ +base.l4v4_s.part \ +base.ml_s.part \ +base.ml1_s.part \ +base.mlv_s.part \ +base.ml1v1_s.part \ +base.ml_s.part + +SH=cmd /c + +%.bat: $(scripts_dir)\%.sh + copy $< $@ + +base.l2_s.part: ln_s.bat $(TRANSFORM_FILES) + $(SH) $< 2 + +base.l3_s.part: ln_s.bat $(TRANSFORM_FILES) + $(SH) $< 3 + +base.l4_s.part: ln_s.bat $(TRANSFORM_FILES) + $(SH) $< 4 + +base.l2v2_s.part: lnv_s.bat $(TRANSFORM_FILES) + $(SH) $< 2 + +base.l3v3_s.part: lnv_s.bat $(TRANSFORM_FILES) + $(SH) $< 3 + +base.l4v4_s.part: lnv_s.bat $(TRANSFORM_FILES) + $(SH) $< 4 + +base.ml_s.part: ml_s.bat $(TRANSFORM_FILES) + $(SH) $< + +base.ml1_s.part: ml1_s.bat $(TRANSFORM_FILES) + $(SH) $< + +base.mlv_s.part: mlv_s.bat $(TRANSFORM_FILES) + $(SH) $< + +base.ml1v1_s.part: ml1v1_s.bat $(TRANSFORM_FILES) + $(SH) $< + +all=$(SCRIPTS) diff --git a/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst new file mode 100644 index 000000000..c49f70e0c --- /dev/null +++ b/xorg-server/xkbdata.src/rules/extras/variantsMapping.lst @@ -0,0 +1,4 @@ +rs combiningkeys extras/rs combiningkeys +us alt-intl-unicode extras/us alt-intl-unicode +us crd extras/us crd +us intl-unicode extras/us intl-unicode diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile index 1bd5e839b..65cd8378e 100644 --- a/xorg-server/xkbdata.src/rules/makefile +++ b/xorg-server/xkbdata.src/rules/makefile @@ -3,120 +3,129 @@ $(error Please do not specify MAKESERVER=1) endif load_makefile compat\makefile DEBUG=$(DEBUG) +load_makefile extras\makefile DEBUG=$(DEBUG) DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \ +compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ +HDR base.o_k.part \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR base.mlv_s.part \ -HDR base.ml_s.part \ -HDR base.ml1_s.part \ -HDR \ -HDR base.l2_s.part \ -HDR base.l3_s.part \ -HDR base.l4_s.part \ -HDR HDR HDR \ +HDR compat/base.mlv_s.part extras/base.mlv_s.part base.mlv_s.part \ +HDR compat/base.ml_s.part extras/base.ml_s.part base.ml_s.part \ +HDR compat/base.ml1_s.part extras/base.ml1_s.part base.ml1_s.part \ +HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \ +HDR compat/base.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ +HDR base.lo_s.part \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part BASE_PARTS = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR base.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ -HDR base.o_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part EVDEV_PARTS = base.hdr.part base.lists.part \ -compat/base.lists.part \ HDR evdev.m_k.part \ HDR base.l1_k.part \ HDR base.l_k.part \ -HDR base.o_k.part \ +HDR \ HDR base.ml_g.part \ HDR base.m_g.part \ -HDR compat/base.mlv_s.part base.mlv_s.part \ -HDR compat/base.ml_s.part base.ml_s.part \ -HDR compat/base.ml1_s.part base.ml1_s.part \ -HDR compat/base.ml1v1_s.part \ -HDR compat/base.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.part \ +HDR extras/base.mlv_s.part base.mlv_s.part \ +HDR extras/base.ml_s.part base.ml_s.part \ +HDR extras/base.ml1_s.part base.ml1_s.part \ +HDR extras/base.ml1v1_s.part \ +HDR extras/base.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ HDR base.l1o_s.part \ HDR base.l2o_s.part \ HDR base.l3o_s.part \ HDR base.l4o_s.part \ -HDR compat/base.o_s.part base.o_s.part \ +HDR base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part @@ -144,7 +153,7 @@ $(DESTDIR)\xorg%: $(DESTDIR)\base% rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES) -XML_IN_FILES = base.xml.in evdev.xml.in +XML_IN_FILES = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in xml_DATA = $(XML_IN_FILES:%.xml.in=%.xml) $(DESTDIR)\%.xml: %.xml.in diff --git a/xorg-server/xkbdata.src/semantics/Makefile.in b/xorg-server/xkbdata.src/semantics/Makefile.in index e410713f8..c44b79cfe 100644 --- a/xorg-server/xkbdata.src/semantics/Makefile.in +++ b/xorg-server/xkbdata.src/semantics/Makefile.in @@ -380,7 +380,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_semanticsDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am index d033a159c..472a39922 100644 --- a/xorg-server/xkbdata.src/symbols/Makefile.am +++ b/xorg-server/xkbdata.src/symbols/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras symbolsdir = $(xkb_base)/symbols dist_symbols_DATA = \ diff --git a/xorg-server/xkbdata.src/symbols/Makefile.in b/xorg-server/xkbdata.src/symbols/Makefile.in index 67faac258..45c080daf 100644 --- a/xorg-server/xkbdata.src/symbols/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/Makefile.in @@ -181,7 +181,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ -SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras symbolsdir = $(xkb_base)/symbols dist_symbols_DATA = \ ad af al \ @@ -567,7 +567,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_symbolsDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin index 64e8a3577..d0154f2f3 100644 --- a/xorg-server/xkbdata.src/symbols/altwin +++ b/xorg-server/xkbdata.src/symbols/altwin @@ -5,7 +5,8 @@ partial modifier_keys xkb_symbols "meta_alt" { key <LALT> { [ Alt_L, Meta_L ] }; - key <RALT> { [ Alt_R, Meta_R ] }; + key <RALT> { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Alt_R, Meta_R ] }; modifier_map Mod1 { Alt_L, Alt_R, Meta_L, Meta_R }; // modifier_map Mod4 {}; }; @@ -22,7 +23,8 @@ xkb_symbols "ctrl_win" { partial modifier_keys xkb_symbols "ctrl_alt_win" { key <LALT> { [ Control_L, Control_L ] }; - key <RALT> { [ Control_R, Control_R ] }; + key <RALT> { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Control_R, Control_R ] }; key <LWIN> { [ Alt_L, Meta_L ] }; key <RWIN> { [ Alt_R, Meta_R ] }; modifier_map Control { <RALT>, <LALT> }; @@ -33,7 +35,8 @@ xkb_symbols "ctrl_alt_win" { partial modifier_keys xkb_symbols "meta_win" { key <LALT> { [ Alt_L, Alt_L ] }; - key <RALT> { [ Alt_R, Alt_R ] }; + key <RALT> { type[Group1] = "TWO_LEVEL", + symbols[Group1] = [ Alt_R, Alt_R ] }; key <LWIN> { [ Meta_L ] }; key <RWIN> { [ Meta_R ] }; modifier_map Mod1 { Alt_L, Alt_R }; diff --git a/xorg-server/xkbdata.src/symbols/bg b/xorg-server/xkbdata.src/symbols/bg index 4e4ca079f..d10204e8e 100644 --- a/xorg-server/xkbdata.src/symbols/bg +++ b/xorg-server/xkbdata.src/symbols/bg @@ -1,212 +1,362 @@ ////////////////////////////////////////////////////////////////////////// -// Copyright (C) 1999, 2000, 2005 by Anton Zinoviev <anton@lml.bas.bg> +// Copyright (C) 1999, 2000, 2007, 2009 by Anton Zinoviev <anton@lml.bas.bg> // // This software may be used, modified, copied, distributed, and sold, -// in both source and binary form provided that the above copyright -// and these terms are retained. Under no circumstances is the author -// responsible for the proper functioning of this software, nor does -// the author assume any responsibility for damages incurred with its -// use. +// both in source and binary form provided that the above copyright +// notice and these terms are retained. The name of the author may not +// be used to endorse or promote products derived from this software +// without prior permission. THIS SOFTWARE IS PROVIDES "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED. IN NO EVENT +// SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT +// OF THE USE OF THIS SOFTWARE. // ////////////////////////////////////////////////////////////////////////// -// Version 1.9-BAN +// Version 2.0 +// The following variants are defined in this file: + +// "bds" - the BDS keyboard layout compliant with the proposed +// Bulgarian state standard BDS 5237:2006 + +// "phonetic" - Bulgarian phonetic layout with traditional position of +// the letters. + +// "bas_phonetic" - the phonetic keyboard layout compliant with the +// proposed Bulgarian state standard BDS 5237:2006 + +// "latin" - an extended variant of the QWERTY layout with symbols +// Bulgarian users will type while the keyboard is in Latin mode. + +// The reasons behind the layout of the symbols in levels 3 and 4 are +// explained in http://arxiv.org/abs/0905.0484 (in Bulgarian). + +// Two notes for the maintainers of xkeyboard-config: + +// 1. Please do not use key names such as <LatQ> for the Bulgarian +// phonetic layouts. The placement of the symbols must stay always +// the same regardless of which one of the alias sets in +// xkb/keycodes/aliases is used. + +// 2. The layouts should not include level3(ralt_switch). + +////////////////////////////////////////////////////////////////////////// + +// Describes Bulgarian keyboard "BDS" modified according to the +// the new state standard BDS 5237:2006 and extended with symbols in +// levels 3 and 4. partial default alphanumeric_keys xkb_symbols "bds" { + name[Group1]= "Bulgaria"; -key.type[Group1] = "TWO_LEVEL"; - key <TLDE> { [ parenleft, parenright ] }; + key <TLDE> { [ parenleft, parenright, + bracketleft, bracketright ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, question ] }; - key <AE03> { [ 3, plus ] }; + key <AE03> { [ 3, plus, + dagger, dagger ] }; key <AE04> { [ 4, quotedbl ] }; - key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, equal ] }; - key <AE07> { [ 7, colon ] }; - key <AE08> { [ 8, slash ] }; - key <AE09> { [ 9, emdash ] }; + key <AE05> { [ 5, percent, + U2329, U232A ] }; + key <AE06> { [ 6, equal, + emdash, emdash ] }; + key <AE07> { [ 7, colon, + ellipsis, ellipsis ] }; + key <AE08> { [ 8, slash, + U0300, U0301 ] }; + key <AE09> { [ 9, endash ] }; key <AE10> { [ 0, numerosign ] }; - key <AE11> { [ minus, dollar ] }; + key <AE11> { [ minus, dollar, + U2011, EuroSign ] }; key <AE12> { [ period, EuroSign ] }; - key <AD01> { [ comma, Cyrillic_yeru ] }; -key.type[Group1] = "ALPHABETIC"; + + key <AD01> { [ comma, Cyrillic_yeru, + rightsinglequotemark, leftsinglequotemark ] }; key <AD02> { [ Cyrillic_u, Cyrillic_U ] }; - key <AD03> { [ Cyrillic_ie, Cyrillic_IE ] }; - key <AD04> { [ Cyrillic_i, Cyrillic_I ] }; + key <AD03> { [ Cyrillic_ie, Cyrillic_IE, + Cyrillic_e, Cyrillic_E ] }; + key <AD04> { [ Cyrillic_i, Cyrillic_I, + U045D, U040D ] }; key <AD05> { [ Cyrillic_sha, Cyrillic_SHA ] }; key <AD06> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - key <AD07> { [ Cyrillic_ka, Cyrillic_KA ] }; - key <AD08> { [ Cyrillic_es, Cyrillic_ES ] }; + key <AD07> { [ Cyrillic_ka, Cyrillic_KA, + copyright, copyright ] }; + key <AD08> { [ Cyrillic_es, Cyrillic_ES, + copyright, copyright ] }; key <AD09> { [ Cyrillic_de, Cyrillic_DE ] }; key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; key <AD11> { [ Cyrillic_tse, Cyrillic_TSE ] }; -key.type[Group1] = "TWO_LEVEL"; key <AD12> { [ semicolon, section ] }; -key.type[Group1] = "ALPHABETIC"; - key <AC01> { [ Cyrillic_softsign, U045D ] }; - key <AC02> { [ Cyrillic_ya, Cyrillic_YA ] }; + + key <AC01> { [ Cyrillic_softsign, U045D, + Cyrillic_yeru, Cyrillic_YERU ] }; + key <AC02> { [ Cyrillic_ya, Cyrillic_YA, + U0463, U0462 ] }; key <AC03> { [ Cyrillic_a, Cyrillic_A ] }; key <AC04> { [ Cyrillic_o, Cyrillic_O ] }; key <AC05> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; key <AC06> { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key <AC07> { [ Cyrillic_te, Cyrillic_TE ] }; + key <AC07> { [ Cyrillic_te, Cyrillic_TE, + trademark, trademark ] }; key <AC08> { [ Cyrillic_en, Cyrillic_EN ] }; key <AC09> { [ Cyrillic_ve, Cyrillic_VE ] }; key <AC10> { [ Cyrillic_em, Cyrillic_EM ] }; key <AC11> { [ Cyrillic_che, Cyrillic_CHE ] }; + key <BKSL> { [ doublelowquotemark, leftdoublequotemark, + guillemotleft, guillemotright ] }; + + key <LSGT> { [ U045D, U040D ] }; key <AB01> { [ Cyrillic_yu, Cyrillic_YU ] }; - key <AB02> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key <AB03> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key <AB02> { [ Cyrillic_shorti, Cyrillic_SHORTI, + U046D, U046C ] }; + key <AB03> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, + U046B, U046A ] }; key <AB04> { [ Cyrillic_e, Cyrillic_E ] }; key <AB05> { [ Cyrillic_ef, Cyrillic_EF ] }; key <AB06> { [ Cyrillic_ha, Cyrillic_HA ] }; key <AB07> { [ Cyrillic_pe, Cyrillic_PE ] }; - key <AB08> { [ Cyrillic_er, Cyrillic_ER ] }; + key <AB08> { [ Cyrillic_er, Cyrillic_ER, + registered, registered ] }; key <AB09> { [ Cyrillic_el, Cyrillic_EL ] }; key <AB10> { [ Cyrillic_be, Cyrillic_BE ] }; - -key.type[Group1] = "TWO_LEVEL"; - key <BKSL> { [ doublelowquotemark,leftdoublequotemark ] }; - key <LSGT> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - // End alphanumeric section - + key <SPCE> { [ space, space, + nobreakspace, nobreakspace ] }; + + key <KPDL> { type[Group1] = "KEYPAD", [ KP_Delete, KP_Separator ] }; - }; +// This is improved variant of the traditional Bulgarian phonetic +// keyboard. Some unnecessary symbols in levels 1 and 2 are replaced +// by more useful (the same way as in "bas_phonetic") and additional +// symbols in levels 3 and 4 are added. partial alphanumeric_keys xkb_symbols "phonetic" { - - name[Group1]= "Bulgaria - Traditional Phonetic"; + name[Group1]= "Bulgaria - Traditional phonetic"; key <TLDE> { [ Cyrillic_che, Cyrillic_CHE ] }; key <AE01> { [ 1, exclam ] }; key <AE02> { [ 2, at ] }; - key <AE03> { [ 3, numbersign ] }; - key <AE04> { [ 4, dollar ] }; + key <AE03> { [ 3, numerosign ] }; + key <AE04> { [ 4, dollar, + EuroSign, EuroSign ] }; key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, asciicircum ] }; - key <AE07> { [ 7, ampersand ] }; + key <AE06> { [ 6, EuroSign ] }; + key <AE07> { [ 7, section ] }; key <AE08> { [ 8, asterisk ] }; - key <AE09> { [ 9, parenleft ] }; - key <AE10> { [ 0, parenright ] }; - key <AE11> { [ minus, underscore ] }; - key <AE12> { [ equal, plus ] }; - - key <LatQ> { [ Cyrillic_ya, Cyrillic_YA ] }; - key <LatW> { [ Cyrillic_ve, Cyrillic_VE ] }; - key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] }; - key <LatR> { [ Cyrillic_er, Cyrillic_ER ] }; - key <LatT> { [ Cyrillic_te, Cyrillic_TE ] }; - key <LatY> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - key <LatU> { [ Cyrillic_u, Cyrillic_U ] }; - key <LatI> { [ Cyrillic_i, Cyrillic_I ] }; - key <LatO> { [ Cyrillic_o, Cyrillic_O ] }; - key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] }; + key <AE09> { [ 9, parenleft, + bracketleft, U2329 ] }; + key <AE10> { [ 0, parenright, + bracketright, U232A ] }; + key <AE11> { [ minus, endash, + U2011, U2011 ] }; + key <AE12> { [ equal, plus, + emdash, dagger ] }; + + key <AD01> { [ Cyrillic_ya, Cyrillic_YA, + U0463, U0462 ] }; + key <AD02> { [ Cyrillic_ve, Cyrillic_VE ] }; + key <AD03> { [ Cyrillic_ie, Cyrillic_IE, + Cyrillic_e, Cyrillic_E ] }; + key <AD04> { [ Cyrillic_er, Cyrillic_ER, + registered, registered ] }; + key <AD05> { [ Cyrillic_te, Cyrillic_TE, + trademark, trademark ] }; + key <AD06> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, + U046B, U046A ] }; + key <AD07> { [ Cyrillic_u, Cyrillic_U ] }; + key <AD08> { [ Cyrillic_i, Cyrillic_I, + U045D, U040D ] }; + key <AD09> { [ Cyrillic_o, Cyrillic_O ] }; + key <AD10> { [ Cyrillic_pe, Cyrillic_PE ] }; key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] }; key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - - key <LatA> { [ Cyrillic_a, Cyrillic_A ] }; - key <LatS> { [ Cyrillic_es, Cyrillic_ES ] }; - key <LatD> { [ Cyrillic_de, Cyrillic_DE ] }; - key <LatF> { [ Cyrillic_ef, Cyrillic_EF ] }; - key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] }; - key <LatJ> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key <LatK> { [ Cyrillic_ka, Cyrillic_KA ] }; - key <LatL> { [ Cyrillic_el, Cyrillic_EL ] }; - key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ quoteright, quotedbl ] }; + + + key <AC01> { [ Cyrillic_a, Cyrillic_A ] }; + key <AC02> { [ Cyrillic_es, Cyrillic_ES, + copyright, copyright ] }; + key <AC03> { [ Cyrillic_de, Cyrillic_DE ] }; + key <AC04> { [ Cyrillic_ef, Cyrillic_EF ] }; + key <AC05> { [ Cyrillic_ghe, Cyrillic_GHE ] }; + key <AC06> { [ Cyrillic_ha, Cyrillic_HA ] }; + key <AC07> { [ Cyrillic_shorti, Cyrillic_SHORTI, + U046D, U046C ] }; + key <AC08> { [ Cyrillic_ka, Cyrillic_KA ] }; + key <AC09> { [ Cyrillic_el, Cyrillic_EL ] }; + key <AC10> { [ semicolon, colon, + ellipsis, ellipsis ] }; + key <AC11> { [ apostrophe, quotedbl, + rightsinglequotemark, leftsinglequotemark ] }; key <BKSL> { [ Cyrillic_yu, Cyrillic_YU ] }; + + + key <LSGT> { [ U045D, U040D ] }; + key <AB01> { [ Cyrillic_ze, Cyrillic_ZE ] }; + key <AB02> { [ Cyrillic_softsign, U045D, + Cyrillic_yeru, Cyrillic_YERU ] }; + key <AB03> { [ Cyrillic_tse, Cyrillic_TSE, + copyright, copyright ] }; + key <AB04> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key <AB05> { [ Cyrillic_be, Cyrillic_BE ] }; + key <AB06> { [ Cyrillic_en, Cyrillic_EN ] }; + key <AB07> { [ Cyrillic_em, Cyrillic_EM ] }; + key <AB08> { [ comma, doublelowquotemark, + guillemotleft, guillemotleft ] }; + key <AB09> { [ period, leftdoublequotemark, + guillemotright, guillemotright ] }; + key <AB10> { [ slash, question, + U0300, U0301 ] }; + + + key <SPCE> { [ space, space, + nobreakspace, nobreakspace ] }; - key <LatZ> { [ Cyrillic_ze, Cyrillic_ZE ] }; - key <LatX> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] }; - key <LatV> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key <LatB> { [ Cyrillic_be, Cyrillic_BE ] }; - key <LatN> { [ Cyrillic_en, Cyrillic_EN ] }; - key <LatM> { [ Cyrillic_em, Cyrillic_EM ] }; - key <AB08> { [ comma, less ] }; - key <AB09> { [ period, greater ] }; - key <AB10> { [ slash, question ] }; - // End alphanumeric section + key <KPDL> { type[Group1] = "KEYPAD", + [ KP_Delete, KP_Separator ] }; }; -partial alphanumeric_keys +// This is the Bulgarian phonetic keyboard acording to the proposed +// state standard BDS 5237:2006 with additional symbols in +// levels 3 and 4. +partial alphanumeric_keys xkb_symbols "bas_phonetic" { - name[Group1]= "Bulgaria - Standard Phonetic"; - -key.type[Group1] = "ALPHABETIC"; - key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] }; -key.type[Group1] = "TWO_LEVEL"; - key <AE01> { [ 1, exclam ] }; - key <AE02> { [ 2, at ] }; - key <AE03> { [ 3, numerosign ] }; - key <AE04> { [ 4, dollar ] }; - key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, EuroSign ] }; - key <AE07> { [ 7, section ] }; - key <AE08> { [ 8, asterisk ] }; - key <AE09> { [ 9, parenleft ] }; - key <AE10> { [ 0, parenright ] }; - key <AE11> { [ minus, emdash ] }; - key <AE12> { [ equal, plus ] }; - -key.type[Group1] = "ALPHABETIC"; - key <LatQ> { [ Cyrillic_che, Cyrillic_CHE ] }; - key <LatW> { [ Cyrillic_sha, Cyrillic_SHA ] }; - key <LatE> { [ Cyrillic_ie, Cyrillic_IE ] }; - key <LatR> { [ Cyrillic_er, Cyrillic_ER ] }; - key <LatT> { [ Cyrillic_te, Cyrillic_TE ] }; - key <LatY> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; - key <LatU> { [ Cyrillic_u, Cyrillic_U ] }; - key <LatI> { [ Cyrillic_i, Cyrillic_I ] }; - key <LatO> { [ Cyrillic_o, Cyrillic_O ] }; - key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] }; - key <AD11> { [ Cyrillic_ya, Cyrillic_YA ] }; - key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; - - key <LatA> { [ Cyrillic_a, Cyrillic_A ] }; - key <LatS> { [ Cyrillic_es, Cyrillic_ES ] }; - key <LatD> { [ Cyrillic_de, Cyrillic_DE ] }; - key <LatF> { [ Cyrillic_ef, Cyrillic_EF ] }; - key <LatG> { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key <LatH> { [ Cyrillic_ha, Cyrillic_HA ] }; - key <LatJ> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key <LatK> { [ Cyrillic_ka, Cyrillic_KA ] }; - key <LatL> { [ Cyrillic_el, Cyrillic_EL ] }; -key.type[Group1] = "TWO_LEVEL"; - key <AC10> { [ semicolon, colon ] }; - key <AC11> { [ apostrophe, quotedbl ] }; -key.type[Group1] = "ALPHABETIC"; - key <BKSL> { [ Cyrillic_softsign, U045D ] }; - - key <LatZ> { [ Cyrillic_ze, Cyrillic_ZE ] }; - key <LatX> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key <LatC> { [ Cyrillic_tse, Cyrillic_TSE ] }; - key <LatV> { [ Cyrillic_ve, Cyrillic_VE ] }; - key <LatB> { [ Cyrillic_be, Cyrillic_BE ] }; - key <LatN> { [ Cyrillic_en, Cyrillic_EN ] }; - key <LatM> { [ Cyrillic_em, Cyrillic_EM ] }; -key.type[Group1] = "TWO_LEVEL"; - key <AB08> { [ comma, doublelowquotemark ] }; - key <AB09> { [ period, leftdoublequotemark ] }; - key <AB10> { [ slash, question ] }; - - key <LSGT> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN ] }; - - // End alphanumeric section + include "bg(phonetic)" + name[Group1]= "Bulgaria - New phonetic"; + + key <TLDE> { [ Cyrillic_yu, Cyrillic_YU ] }; + key <AD01> { [ Cyrillic_che, Cyrillic_CHE ] }; + key <AD02> { [ Cyrillic_sha, Cyrillic_SHA ] }; + key <AD11> { [ Cyrillic_ya, Cyrillic_YA, + U0463, U0462 ] }; + key <BKSL> { [ Cyrillic_softsign, U045D, + Cyrillic_yeru, Cyrillic_YERU ] }; + key <AB02> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; + key <AB04> { [ Cyrillic_ve, Cyrillic_VE ] }; +}; + + +// This is extended variant of the standard Latin QWERTY layout with +// additional symbols in levels 3 and 4. +partial hidden alphanumeric_keys +xkb_symbols "latin" { + + key <TLDE> { [ grave, asciitilde, + U2248, U2245 ] }; + key <AE01> { [ 1, exclam, + notsign, notsign ] }; + key <AE02> { [ 2, at, + twosuperior, enfilledcircbullet ] }; + key <AE03> { [ 3, numbersign, + threesuperior, notequal ] }; + key <AE04> { [ 4, dollar, + EuroSign, sterling ] }; + key <AE05> { [ 5, percent, + U2030, U2030 ] }; + key <AE06> { [ 6, asciicircum, + logicaland, logicalor ] }; + key <AE07> { [ 7, ampersand, + section, section ] }; + key <AE08> { [ 8, asterisk, + infinity, multiply ] }; + key <AE09> { [ 9, parenleft, + U2202, nabla ] }; + key <AE10> { [ 0, parenright, + U2300, U2300 ] }; + key <AE11> { [ minus, underscore, + U2011, endash ] }; + key <AE12> { [ equal, plus, + emdash, plusminus ] }; + + + key <AD01> { [ q, Q, + Greek_THETA, Greek_theta ] }; + key <AD02> { [ w, W, + Greek_OMEGA, Greek_omega ] }; + key <AD03> { [ e, E, + U2203, Greek_epsilon ] }; + key <AD04> { [ r, R, + registered, Greek_rho ] }; + key <AD05> { [ t, T, + trademark, Greek_tau ] }; + key <AD06> { [ y, Y, + yen, Greek_upsilon ] }; + key <AD07> { [ u, U, + intersection, union ] }; + key <AD08> { [ i, I, + integral, Greek_iota ] }; + key <AD09> { [ o, O, + degree, U222E ] }; + key <AD10> { [ p, P, + Greek_PI, Greek_pi ] }; + key <AD11> { [ bracketleft, braceleft, + U2286, includedin ] }; + key <AD12> { [ bracketright, braceright, + U2208, U2209 ] }; + + + key <AC01> { [ a, A, + U2200, Greek_alpha ] }; + key <AC02> { [ s, S, + Greek_SIGMA, Greek_sigma ] }; + key <AC03> { [ d, D, + Greek_DELTA, Greek_delta ] }; + key <AC04> { [ f, F, + Greek_PHI, Greek_phi ] }; + key <AC05> { [ g, G, + Greek_GAMMA, Greek_gamma ] }; + key <AC06> { [ h, H, + U2225, Greek_eta ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K, + U03F0, Greek_kappa ] }; + key <AC09> { [ l, L, + Greek_LAMBDA, Greek_lambda ] }; + key <AC10> { [ semicolon, colon, + division, division ] }; + key <AC11> { [ apostrophe, quotedbl, + leftdoublequotemark, rightdoublequotemark ] }; + key <BKSL> { [ backslash, bar, + identical, downtack ] }; + + + key <LSGT> { [ less, greater, + U2266, U2267 ] }; + key <AB01> { [ z, Z, + U2220, Greek_zeta ] }; + key <AB02> { [ x, X, + Greek_XI, Greek_xi ] }; + key <AB03> { [ c, C, + copyright, Greek_chi ] }; + key <AB04> { [ v, V, + Greek_PSI, Greek_psi ] }; + key <AB05> { [ b, B, + U03D1, Greek_beta ] }; + key <AB06> { [ n, N, + U207F, Greek_nu ] }; + key <AB07> { [ m, M, + Greek_mu, Greek_mu ] }; + key <AB08> { [ comma, less, + U2266, U21D4 ] }; + key <AB09> { [ period, greater, + U2267, U21D2 ] }; + key <AB10> { [ slash, question, + leftsinglequotemark, rightsinglequotemark ] }; + + + key <SPCE> { [ space, space, + nobreakspace, nobreakspace ] }; + key <KPDL> { type[Group1] = "KEYPAD", - [ KP_Delete, KP_Separator ] }; + [ KP_Delete, KP_Decimal ] }; }; diff --git a/xorg-server/xkbdata.src/symbols/by b/xorg-server/xkbdata.src/symbols/by index b3194133b..4409e52dd 100644 --- a/xorg-server/xkbdata.src/symbols/by +++ b/xorg-server/xkbdata.src/symbols/by @@ -3,74 +3,33 @@ // based on // belarusian standard keyboard // Alexander Mikhailian <mikhailian@altern.org> +// Reworked to use winkeys by default and russian keymap as base by Paul Lubetsky <vegeek@gmail.com> +// Added third level with russian symbols +// See freedesktop.org bug #23604 partial default alphanumeric_keys xkb_symbols "basic" { + include "ru(winkeys)" + name[Group1]= "Belarus"; - name[Group1]= "Belarus"; - - key <TLDE> { [ Cyrillic_io, Cyrillic_IO ] }; - key <LSGT> { [ bar, brokenbar ] }; - - key <AE02> { [ 2, quotedbl ] }; - key <AE04> { [ 4, semicolon ] }; - key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, colon ] }; - key <AE07> { [ 7, question ] }; - - key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI ] }; - key <AD02> { [ Cyrillic_tse, Cyrillic_TSE ] }; - key <AD03> { [ Cyrillic_u, Cyrillic_U ] }; - key <AD04> { [ Cyrillic_ka, Cyrillic_KA ] }; - key <AD05> { [ Cyrillic_ie, Cyrillic_IE ] }; - key <AD06> { [ Cyrillic_en, Cyrillic_EN ] }; - key <AB07> { [Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; - key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE ] }; - key <AD08> { [ Cyrillic_sha, Cyrillic_SHA ] }; - key <AD09> { [ Byelorussian_shortu, Byelorussian_SHORTU ]}; - key <AD10> { [ Cyrillic_ze, Cyrillic_ZE ] }; - key <AD11> { [ Cyrillic_ha, Cyrillic_HA ] }; - key <AD12> { [ apostrophe, apostrophe ] }; - - key <AC01> { [ Cyrillic_ef, Cyrillic_EF ] }; - key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU ] }; - key <AC03> { [ Cyrillic_ve, Cyrillic_VE ] }; - key <AC04> { [ Cyrillic_a, Cyrillic_A ] }; - key <AC05> { [ Cyrillic_pe, Cyrillic_PE ] }; - key <AC06> { [ Cyrillic_er, Cyrillic_ER ] }; - key <AC07> { [ Cyrillic_o, Cyrillic_O ] }; - key <AC08> { [ Cyrillic_el, Cyrillic_EL ] }; - key <AC09> { [ Cyrillic_de, Cyrillic_DE ] }; - key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE ] }; - key <AC11> { [ Cyrillic_e, Cyrillic_E ] }; - - key <AB01> { [ Cyrillic_ya, Cyrillic_YA ] }; - key <AB02> { [ Cyrillic_che, Cyrillic_CHE ] }; - key <AB03> { [ Cyrillic_es, Cyrillic_ES ] }; - key <AB04> { [ Cyrillic_em, Cyrillic_EM ] }; - key <AB05> { [ Ukrainian_i, Ukrainian_I ] }; - key <AB06> { [ Cyrillic_te, Cyrillic_TE ] }; - key <AB08> { [ Cyrillic_be, Cyrillic_BE ] }; - key <AB09> { [ Cyrillic_yu, Cyrillic_YU ] }; - key <AB10> { [ period, comma ] }; - - key <BKSL> { [ slash, bar ] }; - - // End alphanumeric section + key <AD09> { [ Byelorussian_shortu, Byelorussian_SHORTU ] }; + key <AD12> { [ apostrophe, apostrophe ] }; + key <AB05> { [ Ukrainian_i, Ukrainian_I ] }; }; partial alphanumeric_keys -xkb_symbols "winkeys" { - include "by(basic)" - name[Group1]= "Belarus - Winkeys"; - key <AE04> { [ 4, semicolon ] }; - key <AE03> { [ 3, numbersign ] }; - key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, colon ] }; - key <AE07> { [ 7, question ] }; - key <AE08> { [ 8, asterisk ] }; - key <AB10> { [ period, comma ] }; - key <BKSL> { [ slash, bar ] }; +xkb_symbols "legacy" { + include "by(basic)" + name[Group1]= "Belarus - Legacy"; + + key <AE03> { [ 3, numbersign ] }; + key <AE04> { [ 4, asterisk ] }; + key <AE05> { [ 5, colon ] }; + key <AE06> { [ 6, comma ] }; + key <AE07> { [ 7, period ] }; + key <AE08> { [ 8, semicolon ] }; + key <AB10> { [ slash, question ] }; + key <BKSL> { [ backslash, bar ] }; }; // based on a keyboard map from an 'xkb/symbols/iso3335-3' file @@ -79,18 +38,19 @@ xkb_symbols "winkeys" { partial alphanumeric_keys xkb_symbols "latin" { - - include "latin" - name[Group1]= "Belarus - Latin"; - key <AD02> { [ w, W, scaron, Scaron ] }; - key <AD07> { [ u, U, ubreve, Ubreve ] }; - key <AC02> { [ s, S, sacute, Sacute ] }; - key <AC09> { [ l, L, lstroke, Lstroke ] }; - key <AB01> { [ z, Z, zacute, Zacute ] }; - key <AB02> { [ x, X, zcaron, Zcaron ] }; - key <AB03> { [ c, C, cacute, Cacute ] }; - key <AB04> { [ v, V, ccaron, Ccaron ] }; - key <AB06> { [ n, N, nacute, Nacute ] }; - - include "level3(ralt_switch)" + include "latin" + name[Group1]= "Belarus - Latin"; + + key <AD02> { [ w, W, scaron, Scaron ] }; + key <AD07> { [ u, U, ubreve, Ubreve ] }; + key <AC02> { [ s, S, sacute, Sacute ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AB01> { [ z, Z, zacute, Zacute ] }; + key <AB02> { [ x, X, zcaron, Zcaron ] }; + key <AB03> { [ c, C, cacute, Cacute ] }; + key <AB04> { [ v, V, ccaron, Ccaron ] }; + key <AB06> { [ n, N, nacute, Nacute ] }; + + include "level3(ralt_switch)" }; + diff --git a/xorg-server/xkbdata.src/symbols/ca b/xorg-server/xkbdata.src/symbols/ca index 818a8ff7b..63f9e48e6 100644 --- a/xorg-server/xkbdata.src/symbols/ca +++ b/xorg-server/xkbdata.src/symbols/ca @@ -467,7 +467,12 @@ xkb_symbols "shs" { //q, l, t, s, m, g, k, p, w, y, r //XCompose key is used for the other accute and grave. - key <AB08> { [ comma, less, U0313 ] }; + key <AB08> { [ comma, less, U0313 ] }; + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AD03> { [ e, E, eacute, Eacute ] }; + key <AD07> { [ u, U, uacute, Uacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; include "level3(ralt_switch)" include "compose(rctrl)" diff --git a/xorg-server/xkbdata.src/symbols/capslock b/xorg-server/xkbdata.src/symbols/capslock index 58599c6e6..415e4db1d 100644 --- a/xorg-server/xkbdata.src/symbols/capslock +++ b/xorg-server/xkbdata.src/symbols/capslock @@ -41,3 +41,25 @@ xkb_symbols "backspace" { key <CAPS> { [ BackSpace ] }; }; +partial hidden modifier_keys +xkb_symbols "super" { + key <CAPS> { [ Super_L ] }; + modifier_map Mod4 { <CAPS> }; +}; + +partial hidden modifier_keys +xkb_symbols "hyper" { + key <CAPS> { [ Hyper_L ] }; + modifier_map Mod4 { <CAPS> }; +}; + +partial hidden modifier_keys +xkb_symbols "none" { + key <CAPS> { [ VoidSymbol ] }; +}; + +partial hidden modifier_keys +xkb_symbols "numlock" { + key <CAPS> { [ Num_Lock ] }; +}; + diff --git a/xorg-server/xkbdata.src/symbols/de b/xorg-server/xkbdata.src/symbols/de index 25f883ee7..b23aaf6c0 100644 --- a/xorg-server/xkbdata.src/symbols/de +++ b/xorg-server/xkbdata.src/symbols/de @@ -38,7 +38,7 @@ xkb_symbols "basic" { key <AC11> { [adiaeresis, Adiaeresis, dead_circumflex, dead_caron ] }; key <TLDE> { [dead_circumflex, degree, U2032, U2033 ] }; - key <BKSL> { [numbersign, apostrophe, dead_grave, dead_breve ] }; + key <BKSL> { [numbersign, apostrophe, rightsinglequotemark, dead_breve ] }; key <AB01> { [ y, Y, guillemotright, U203A ] }; key <AB02> { [ x, X, guillemotleft, U2039 ] }; key <AB04> { [ v, V, doublelowquotemark, singlelowquotemark ] }; diff --git a/xorg-server/xkbdata.src/symbols/es b/xorg-server/xkbdata.src/symbols/es index 96ccc6fed..42b0e8cb1 100644 --- a/xorg-server/xkbdata.src/symbols/es +++ b/xorg-server/xkbdata.src/symbols/es @@ -17,7 +17,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, dollar, asciitilde, dollar ] }; key <AE06> { [ 6, ampersand, notsign, fiveeighths ] }; key <AE11> { [apostrophe, question, backslash, questiondown ] }; - key <AE12> { [exclamdown, questiondown, asciitilde, asciitilde ] }; + key <AE12> { [exclamdown, questiondown, dead_tilde, asciitilde ] }; key <AD11> { [dead_grave, dead_circumflex, bracketleft, dead_abovering ] }; key <AD12> { [ plus, asterisk, bracketright, dead_macron ] }; diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.am b/xorg-server/xkbdata.src/symbols/extras/Makefile.am new file mode 100644 index 000000000..6140b9456 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.am @@ -0,0 +1,4 @@ +symbolsdir = $(xkb_base)/symbols/extras +dist_symbols_DATA = apl \ + rs \ + us diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.in b/xorg-server/xkbdata.src/symbols/extras/Makefile.in new file mode 100644 index 000000000..e00e6e91e --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.in @@ -0,0 +1,354 @@ +# Makefile.in generated by automake 1.10.2 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = symbols/extras +DIST_COMMON = $(dist_symbols_DATA) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(symbolsdir)" +dist_symbolsDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_symbols_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CATALOGS = @CATALOGS@ +CATOBJEXT = @CATOBJEXT@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DATADIRNAME = @DATADIRNAME@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GMOFILES = @GMOFILES@ +GMSGFMT = @GMSGFMT@ +GREP = @GREP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INSTOBJEXT = @INSTOBJEXT@ +INTLLIBS = @INTLLIBS@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +MSGFMT = @MSGFMT@ +MSGFMT_OPTS = @MSGFMT_OPTS@ +MSGMERGE = @MSGMERGE@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +POFILES = @POFILES@ +POSUB = @POSUB@ +PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ +PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XKBCOMP = @XKBCOMP@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_CC = @ac_ct_CC@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +xkb_base = @xkb_base@ +xkb_rules_symlink = @xkb_rules_symlink@ +symbolsdir = $(xkb_base)/symbols/extras +dist_symbols_DATA = apl \ + rs \ + us + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/extras/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu symbols/extras/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-dist_symbolsDATA: $(dist_symbols_DATA) + @$(NORMAL_INSTALL) + test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)" + @list='$(dist_symbols_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_symbolsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(symbolsdir)/$$f'"; \ + $(dist_symbolsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(symbolsdir)/$$f"; \ + done + +uninstall-dist_symbolsDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_symbols_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(symbolsdir)/$$f'"; \ + rm -f "$(DESTDIR)$(symbolsdir)/$$f"; \ + done +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(DATA) +installdirs: + for dir in "$(DESTDIR)$(symbolsdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-dist_symbolsDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_symbolsDATA + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_symbolsDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_symbolsDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/xorg-server/xkbdata.src/symbols/extras/apl b/xorg-server/xkbdata.src/symbols/extras/apl new file mode 100644 index 000000000..512277a75 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/extras/apl @@ -0,0 +1,296 @@ +// APL Keyboard Layouts + +// This file supports: +// - The Sharp APL for Unix (SAX) layout +// - The IBM APL2 layout +// - The Manugistics APL*PLUS II (Version 5.1, 1993) keyboard layout + +// Unicode APL table: http://aplwiki.com/UnicodeAplTable +// ...and another: http://publibfp.boulder.ibm.com/epubs/pdf/h2110611.pdf (appendix A) +// Generic Unicode stuff: http://www.fileformat.info/info/unicode/category/index.htm + +// Tim Nelson (this file's creator) says: + +// This file doesn't deal with all the combining stuff -- I'm not an APL programmer, +// and am not quite sure what's needed here. However, it may be possible to get this +// working with dead keys and the like. Patches gratefully accepted. + +// Some of the shift-key assignments may differ from the APL tradition. If +// that's not considered acceptable, it should be possible to remap the +// shift keys. I have striven, however, to ensure that the use of shift keys +// in these maps is at least self-consistent. + +// I'm assuming that this will be used with another keyboard layout (ie. for +// your language), with a special shift key to use these maps. + +partial alphanumeric_keys modifier_keys +xkb_symbols "common" { + name[Group1]= "APL"; + + key <AE01> { [ diaeresis ] }; + key <AE02> { [ U00AF ] }; // ¯ -- Macron + key <AE03> { [ less ] }; + key <AE04> { [ U2264 ] }; // ≤ -- Less-than Or Equal To + key <AE05> { [ equal ] }; + key <AE06> { [ U2265 ] }; // ≥ -- Greater-than Or Equal To + key <AE07> { [ greater ] }; + key <AE08> { [ U2260 ] }; // ≠ -- Not Equal To + key <AE09> { [ U2228 ] }; // ∨ -- Logical Or + key <AE10> { [ U2227 ] }; // ∧ -- Logical And + + // Q + key <AD01> { [ question ] }; + // W + key <AD02> { [ U2375 ] }; // ⍵ -- APL Functional Symbol Omega + // E + key <AD03> { [ U220A ] }; // ∊ -- Small Element Of + // R + key <AD04> { [ U2374 ] }; // ⍴ -- APL Functional Symbol Rho + // T + key <AD05> { [ asciitilde ] }; + // Y + key <AD06> { [ U2191 ] }; // ↑ -- Upwards Arrow + // U + key <AD07> { [ U2193 ] }; // ↓ -- Downwards Arrow + // I + key <AD08> { [ U2373 ] }; // ⍳ -- APL Functional Symbol Iota + // O + key <AD09> { [ U25CB ] }; // ○ -- White Circle + // P + key <AD10> { [ U22C6 ] }; // ⋆ -- Should this be a plain asterisk, or the star operator??? + // [ + key <AD11> { [ U2190 ] }; // ← -- Leftwards Arrow + + // A + key <AC01> { [ U237A ] }; // ⍺ -- APL Functional Symbol Alpha + // S + key <AC02> { [ U2308 ] }; // ⌈ -- Left Ceiling + // D + key <AC03> { [ U230A ] }; // ⌊ -- Left Floor + // F + key <AC04> { [ underscore ] }; + // G + key <AC05> { [ U2207 ] }; // ∇ -- Nabla + // H + key <AC06> { [ U2206 ] }; // ∆ -- Increment + // J + key <AC07> { [ U2218 ] }; // ∘ -- Ring Operator + // K + key <AC08> { [ apostrophe ] }; + // L + key <AC09> { [ U2395 ] }; // ⎕ -- APL Functional Symbol Quad + + // Z + key <AB01> { [ U2282 ] }; // ⊂ -- Subset Of + // X + key <AB02> { [ U2283 ] }; // ⊃ -- Superset Of + // C + key <AB03> { [ U2229 ] }; // ∩ -- Intersection + // V + key <AB04> { [ U222A ] }; // ∪ -- Union + // B + key <AB05> { [ U22A5 ] }; // ⊥ -- Up Tack + // N + key <AB06> { [ U22A4 ] }; // ⊤ -- Down Tack + // M + key <AB07> { [ U007C ] }; // | -- Vertical Line +}; + +// Keys common to a number of keyboards that allow normal language usage alongside APL +partial alphanumeric_keys modifier_keys +xkb_symbols "unified" { + name[Group1]= "APL Keyboard Symbols: Unified Layout"; + + include "apl(common)" + + // ` + key <TLDE> { [ U22C4 ] }; // ⋄ -- Diamond Operator + key <AE09> { [ NoSymbol, U2371 ] }; // ⍱ -- APL Functional Symbol Down Caret Tilde + key <AE10> { [ NoSymbol, U2372 ] }; // ⍲ -- APL Functional Symbol Up Caret Tilde + // - + key <AE11> { [ U00D7 ] }; // × -- Multiplication Sign + // = + key <AE12> { [ U00F7, U2339 ] }; // ÷ ⌹ -- Division Sign / APL Functional Symbol Quad Divide + + // ] + key <AD12> { [ U2192 ] }; // → -- Rightwards Arrow +}; + +// Layout: http://www.wickensonline.co.uk/apl-unicomp.html +default +partial alphanumeric_keys modifier_keys +xkb_symbols "sax" { + name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix"; + + include "apl(unified)" + + key <AE01> { [ NoSymbol, U00A1 ] }; // ¡ -- Inverted Exclamation Mark + key <AE04> { [ NoSymbol, cent ] }; + key <AE08> { [ NoSymbol, U2342 ] }; // ⍂ -- APL Functional Symbol Quad Backslash + // - + key <AE11> { [ NoSymbol, U2261 ] }; // ≡ -- Identical To + + // Q + key <AD01> { [ NoSymbol, U00BF ] }; // ¿ -- Inverted Question Mark + // W + key <AD02> { [ NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile + // E + key <AD03> { [ NoSymbol, U2377 ] }; // ⍷ -- APL Functional Symbol Epsilon Underbar + // T + key <AD05> { [ NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash + // I + key <AD08> { [ NoSymbol, U2378 ] }; // ⍸ -- APL Functional Symbol Iota Underbar + // O + key <AD09> { [ NoSymbol, U2365 ] }; // ⍥ -- APL Functional Symbol Circle Diaeresis + // P + key <AD10> { [ NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star + + // A + key <AC01> { [ NoSymbol, U2296 ] }; // ⊖ -- Circled Minus + // F + key <AC04> { [ NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde + // G + key <AC05> { [ NoSymbol, U2352 ] }; // ∇ ⍒ -- APL Functional Symbol Del Stile + // H + key <AC06> { [ NoSymbol, U234B ] }; // ∆ ⍋ -- APL Functional Symbol Delta Stile + // J + key <AC07> { [ NoSymbol, U2364 ] }; // ⍤ -- APL Functional Symbol Jot Diaeresis + // K + key <AC08> { [ NoSymbol, U233B ] }; // ⌻ + // L + key <AC09> { [ NoSymbol, U235E ] }; // ⍞ -- APL Functional Symbol Quote Quad + // ; + key <AC10> { [ U22A2 ] }; // ⊢ -- Right Tack + // ' + key <AC11> { [ U22A3 ] }; // ⊣ -- Left Tack + + // C + key <AB03> { [ NoSymbol, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot + // B + key <AB05> { [ NoSymbol, U234E ] }; // ⍎ -- APL Functional Symbol Down Tack Jot (Unicode got the name wrong; it should have been "Up Tack") + // N + key <AB06> { [ NoSymbol, U2355 ] }; // ⍕ -- APL Functional Symbol Up Tack Jot (Unicode got the name wrong; it should have been "Down Tack") + // M + key <AB07> { [ NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam + // , + key <AB08> { [ U235E, U236A ] }; // ⍞ ⍪ -- APL Functional Symbol Quote Quad / APL Functional Symbol Comma Bar + // . + key <AB09> { [ U234E, U2359 ] }; // ⍎ ⍙ -- [See B key] / APL Functional Symbol Delta Underbar + // / + key <AB10> { [ U2355, U233F ] }; // ⍕ ⌿ -- [See N key] / APL Functional Symbol Slash Bar + + key <BKSL> { [ U235D, U2340 ] }; // ⍝ ⍀ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Backslash Bar +}; + +// Layout: http://www.wickensonline.co.uk/apl-unicomp.html +partial alphanumeric_keys modifier_keys +xkb_symbols "apl2" { + name[Group1]= "APL Keyboard Symbols: IBM APL2"; + + include "apl(common)" + + // The first column is NoSymbol because it inherits. The second is NoSymbol because those keys don't do anything + + // ` + key <TLDE> { [ NoSymbol, U233B, U2342 ] }; // ⌻ ⍂ -- + key <AE01> { [ NoSymbol, NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam + key <AE02> { [ NoSymbol, NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde + key <AE03> { [ NoSymbol, NoSymbol, U2353 ] }; // ⍒ -- APL Functional Symbol Del Stile + key <AE04> { [ NoSymbol, NoSymbol, U234B ] }; // ⍋ -- APL Functional Symbol Delta Stile + key <AE05> { [ NoSymbol, NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile + key <AE06> { [ NoSymbol, NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash + key <AE07> { [ NoSymbol, NoSymbol, U2296 ] }; // ⊖ -- Circled Minus + key <AE08> { [ NoSymbol, NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star + key <AE09> { [ NoSymbol, NoSymbol, U2371 ] }; // ⍱ -- APL Functional Symbol Down Caret Tilde + key <AE10> { [ NoSymbol, NoSymbol, U2372 ] }; // ⍲ -- APL Functional Symbol Up Caret Tilde + // - + key <AE11> { [ plus, minus, exclam ] }; + // = + key <AE12> { [ U00D7, U00F7, U2339 ] }; // × ÷ ⌹ -- Multiplication Sign / Division Sign / APL Functional Symbol Quad Divide + + // [ + key <AD11> { [ NoSymbol, U2192, U235E ] }; // (←) → ⍞ -- Rightwards Arrow / APL Functional Symbol Quote Quad + // ] + key <AD12> { [ U2337, U2378, U2359 ] }; // ⌷ ⍸ ⍙ -- APL Functional Symbol Squish Quad / APL Functional Symbol Iota Underbar / APL Functional Symbol Delta Underbar + + // ; + key <AC10> { [ bracketleft, parenleft, U234E ] }; // ⍎ -- [See B key in SAX layout] + // ' + key <AC11> { [ bracketright, parenright, U2355 ] }; // ⍕ -- [See N key in SAX layout] + + // , + key <AB08> { [ comma, semicolon, U235D ] }; // ⍝ -- APL Functional Symbol Up Shoe Jot + // . + key <AB09> { [ period, colon, U2340 ] }; // ⍀ -- APL Functional Symbol Backslash Bar + // / + key <AB10> { [ slash, backslash, U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar + + key <BKSL> { [ U2261, U2377, U2364 ] }; // ≡ ⍷ ⍤ -- Identical To / APL Functional Symbol Epsilon Underbar / APL Functional Symbol Jot Diaeresis +}; + +partial alphanumeric_keys modifier_keys +xkb_symbols "aplplusII" { + name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II"; + + include "apl(apl2)" + + // ` + key <TLDE> { [ dollar, U22C4, U236A ] }; // ⋄ ⍪ -- Diamond Operator / APL Functional Symbol Comma Bar + key <AE01> { [ NoSymbol, NoSymbol, U2261 ] }; // ≡ -- Identical To + + // [ + key <AD11> { [ U2190, NoSymbol, U235E ] }; // ← ⍞ -- Leftwards Arrow / APL Functional Symbol Quote Quad + // ] + key <AD12> { [ U2192, NoSymbol, U236C ] }; // → ⍬ -- Rightwards Arrow / APL Functional Symbol Zilde + + // ; + key <AC10> { [ bracketleft, parenleft, U234E ] }; // ⍎ -- [See B key in SAX layout] + // ' + key <AC11> { [ bracketright, parenright, U2355 ] }; // ⍕ -- [See N key in SAX layout] + + key <BKSL> { [ U22A3, U22A2, U2359 ] }; // ⊣ ⊢ ⍙ -- Left Tack / Right Tack / APL Functional Symbol Delta Underbar +}; + + +// MicroAPL layout: http://aplwiki.com/APLXKeyboardLayouts +// I didn't do the old-style MicroAPL layout; patches gratefully accepted +partial alphanumeric_keys modifier_keys +xkb_symbols "aplx" { + name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout"; + + include "apl(unified)" + + // ` + key <TLDE> { [ NoSymbol, U235E ] }; // ⍞ -- APL Functional Symbol Quote Quad + key <AE01> { [ NoSymbol, U2336 ] }; // ⌶ -- APL Functional Symbol I-Beam + key <AE02> { [ NoSymbol, U236B ] }; // ⍫ -- APL Functional Symbol Del Tilde + key <AE03> { [ NoSymbol, U2353 ] }; // ⍒ -- APL Functional Symbol Del Stile + key <AE04> { [ NoSymbol, U234B ] }; // ⍋ -- APL Functional Symbol Delta Stile + key <AE05> { [ NoSymbol, U233D ] }; // ⌽ -- APL Functional Symbol Circle Stile + key <AE06> { [ NoSymbol, U2349 ] }; // ⍉ -- APL Functional Symbol Circle Backslash + key <AE07> { [ NoSymbol, U2296 ] }; // ⊖ -- Circled Minus + key <AE08> { [ NoSymbol, U235F ] }; // ⍟ -- APL Functional Symbol Circle Star + // - + key <AE11> { [ NoSymbol, exclam ] }; + + // [ + key <AD11> { [ NoSymbol, U2347 ] }; // ⍇ -- Box With Left Arrow + // ] + key <AD12> { [ NoSymbol, U2348 ] }; // ⍈ -- Box With Right Arrow + + // ; + key <AC10> { [ U234E, U2261 ] }; // ⍎ ≡ -- [See B key in SAX layout] / Identical To + // ' + key <AC11> { [ U2355, U2262 ] }; // ⍕ ≢ -- [See N key in SAX layout] / Not Identical To + + // , + key <AB08> { [ U235D, U236A ] }; // ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar + // . + key <AB09> { [ U2340, U2364 ] }; // ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis + // / + key <AB10> { [ U233F ] }; // ⌿ -- APL Functional Symbol Slash Bar + + key <BKSL> { [ U22A3, U22A3 ] }; // ⊣ ⊢ -- Left Tack / Right Tack +}; + + diff --git a/xorg-server/xkbdata.src/symbols/extras/rs b/xorg-server/xkbdata.src/symbols/extras/rs new file mode 100644 index 000000000..cc6b5fb44 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/extras/rs @@ -0,0 +1,15 @@ +xkb_symbols "combiningkeys" { + // Raw combining characters instead of dead keys, + // especially good for post-accenting texts. + + name[Group1]= "Serbia - Combining accents instead of dead keys"; + + include "rs(basic)" + + key <AE03> { [ any,any, U0302, dead_circumflex ] }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT + key <AE07> { [ any,any, U0300, NoSymbol ] }; // 7, U0300 = COMBINING GRAVE ACCENT + key <AE08> { [ any,any, U030F, NoSymbol ] }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT + key <AE09> { [ any,any, U0301, NoSymbol ] }; // 9, U0301 = COMBINING ACUTE ACCENT + key <AE10> { [ any,any, U0311, NoSymbol ] }; // 0, U0311 = COMBINING INVERTED BREVE + key <AE11> { [ any,any, U0304, NoSymbol ] }; // -, U0304 = COMBINING MACRON +}; diff --git a/xorg-server/xkbdata.src/symbols/extras/us b/xorg-server/xkbdata.src/symbols/extras/us new file mode 100644 index 000000000..b58932c6a --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/extras/us @@ -0,0 +1,147 @@ +// XCompose is out! Unicode combining is in! For those of us who live +// on the edge: A keymap using Unicode combining characters instead of +// deadkeys. This variation does not deviate from the lame MS-style +// US-intl layout; but it uses AltGr for combining, like altgr-intl. +// +// This might break your font layout layout systems (because they +// suck), caveat emptor. Also, most of today's software will count +// individual combining marks for selection, deletion, character +// counting &c., and won't be smart enough to do canonical equivalence +// when searching, &c. +// +// With Unicode combining you use "handwriting order", not +// "typewriting order" as with deadkeys. That is, you first type the +// base character, then the diacritics/accents/modifiers. This has +// the advantage of avoiding hidden states --- each keypress changes +// something on screen. +// +// TODO: as of now, this duplicates all us(intl) functionality with +// combining. With care, perhaps we could add more combining marks +// not present in intl, and support all major languages. +partial alphanumeric_keys +xkb_symbols "intl-unicode" { + + name[Group1]= "USA - International (AltGr Unicode combining)"; + + include "us(intl)" + include "level3(ralt_switch)" + + // grave, tilde + key <TLDE> { [grave, asciitilde, U0300, U0303 ] }; + // double acute + key <AE02> { [ 2, at, twosuperior, U030B ] }; + // macron + key <AE03> { [ 3, numbersign, threesuperior, U0304 ] }; + // circumflex + key <AE06> { [ 6, asciicircum, onequarter, U0302 ] }; + // horn + key <AE07> { [ 7, ampersand, onehalf, U031B ] }; + // ogonek + key <AE08> { [ 8, asterisk, threequarters, U0328 ] }; + // breve + key <AE09> { [ 9, parenleft, leftsinglequotemark, U0306 ] }; + // abovering + key <AE10> { [ 0, parenright, rightsinglequotemark, U030A ] }; + + // belowdot + key <AE11> { [ minus, underscore, yen, U0323 ] }; + // acute, diaeresis + key <AC11> { [apostrophe, quotedbl, U0301, U0308 ] }; + // abovedot, caron + key <AB09> { [ period, greater, U0307, U030C ] }; + // hook + key <AB10> { [ slash, question, questiondown, 0309 ] }; + + // alt-intl compatibility + // cedilla, caron + key <AB08> { [ comma, less, U0327, U030C ] }; + // ogonek, diaeresis + key <AC10> { [ semicolon, colon, U0328, U0308 ] }; + // doubleacute, horn + key <AE12> { [ equal, plus, U030B, U031B ] }; + + // we don't do combining latin letters and combining enclosures + // because support for those is very rare. +}; + +// XCompose is out! Unicode combining is in! For those of us who live +// on the edge: A keymap using Unicode combining characters instead of +// deadkeys. This variation does break compatibility with us-intl, +// whenever I thought it would be more mnemonic or Unicodeish. +partial alphanumeric_keys +xkb_symbols "alt-intl-unicode" { + + name[Group1]= "USA - International (AltGr Unicode combining, alternative)"; + + include "extras/us(intl-unicode)" + include "level3(ralt_switch)" + + // easier macron; em-dash. + // em-dash is available via compose, but I added here since it's such + // an important typographic character. + key <AE11> { [ minus, underscore, U0304, U2014 ] }; + + // belowdot, abovedot (caron at coma/less key, per above) + key <AB09> { [ period, greater, U0323, U0307 ] }; + +}; + +partial alphanumeric_keys +xkb_symbols "ats" { + + include "us" + + name[Group1]= "USA - Atsina"; + + //Using Dead key to get COMBINING COMMA ABOVE for ejectives on + //q, l, t, s, m, g, k, p, w, y, r + //XCompose key is used for the other accute and grave. + + key <AD03> { [ e, E, eacute, Eacute ] }; + key <AD07> { [ u, U, uacute, Uacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AD11> { [ bracketleft, braceleft, U03B8 ] }; + key <AD12> { [ bracketright, braceright, U010D, U010C ] }; + //U+010C (uppercase Č) and U+010D (lowercase č). + + key <AC01> { [ a, A, aacute, Aacute ] }; + + + //Small letter Open use compose to key get acute accent + key <AB03> { [ c, C, U0254, U0186 ] }; + key <AB08> { [ comma, less, U0313 ] }; + key <AB10> { [ slash, question, U0294 ] }; + + include "level3(ralt_switch)" + include "compose(rctrl)" +}; + +partial alphanumeric_keys +xkb_symbols "crd" { + + include "us" + + name[Group1]= "USA - Couer D'alene Salish"; + + // Alphanumeric section + key <AD02> { [ w, W, U02B7, U02B7 ] }; + key <AE07> { [ 7, ampersand, U0294 ] }; + key <AD01> { [ q, Q, U221A ] }; + key <AB04> { [ v, V, U0259 ] }; + key <BKSL> { [ backslash, bar, U026B ] }; + key <AD03> { [ e, E, U025B ] }; + key <AD08> { [ i, I, U026A ] }; + key <AC07> { [ j, J, U01F0 ] }; + key <AE06> { [ 6, asciicircum, U0295 ] }; + key <AC02> { [ s, S, U0161 ] }; + key <AB03> { [ c, C, U010D ] }; + key <AD09> { [ o, O, U0254 ] }; + key <AB09> { [ period, greater, U0323 ] }; + + include "level3(ralt_switch)" + include "compose(rctrl)" + + // End alphanumeric section +}; + diff --git a/xorg-server/xkbdata.src/symbols/gb b/xorg-server/xkbdata.src/symbols/gb index bfb54820c..de11f64eb 100644 --- a/xorg-server/xkbdata.src/symbols/gb +++ b/xorg-server/xkbdata.src/symbols/gb @@ -122,8 +122,17 @@ xkb_symbols "colemak" { key <TLDE> { [ grave, notsign, bar, bar ] }; key <BKSL> { [numbersign, asciitilde, dead_grave, dead_breve ] }; - key <LSGT> { [ backslash, bar, bar, brokenbar ] }; - + key <LSGT> { [ z, Z, ae, AE ] }; + key <AB01> { [ x, X, dead_circumflex, asciitilde ] }; + key <AB02> { [ c, C, ccedilla, Ccedilla ] }; + key <AB03> { [ v, V, oe, OE ] }; + key <AB04> { [ b, B, dead_breve, asciitilde ] }; + key <AB05> { [ k, K, dead_abovering, asciitilde ] }; + key <AB06> { [ m, M, dead_macron, asciitilde ] }; + key <AB07> { [ comma, less, dead_cedilla, asciitilde ] }; + key <AB08> { [ period, greater, dead_abovedot, asciitilde ] }; + key <AB09> { [ backslash, bar, asciitilde, asciitilde ] }; + key <AB10> { [ slash, question, questiondown, asciitilde ] }; include "level3(ralt_switch_multikey)" }; diff --git a/xorg-server/xkbdata.src/symbols/in b/xorg-server/xkbdata.src/symbols/in index bb616fdd8..f80abfe91 100644 --- a/xorg-server/xkbdata.src/symbols/in +++ b/xorg-server/xkbdata.src/symbols/in @@ -739,53 +739,129 @@ xkb_symbols "tam_unicode" { // Description: A keymap based on the TamilNet'99 typewriter keyboard // Encoding: Unicode (http://www.unicode.org) // Author: Thuraiappah Vaseeharan <vasee@ieee.org> -// Date : Sat Feb 9 21:10:48 CST 2002 +// Modifed by: Malathi S <malathiramya@gmail.com> +// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org> +// Date : Fri Sep 4 11:32:00 CST 2009 // Mapping: name[Group1]= "India - Tamil Unicode"; // granthas - key <AE01> { [ U0b83 ] } ; - key <AE03> { [ U0b9c ] } ; - key <AE04> { [ U0bb7 ] } ; - key <AE05> { [ U0bb8 ] } ; - key <AE06> { [ U0bb9 ] } ; - + key <TLDE> { [ apostrophe, asciitilde ] }; + key <AE01> { [ U0031, exclam ] } ; + key <AE02> { [ U0032, at ] } ; + key <AE03> { [ U0033, numbersign ] } ; + key <AE04> { [ U0034, U0BF9 ] } ; + key <AE05> { [ U0035, percent ] } ; + key <AE06> { [ U0036, asciicircum ] } ; + key <AE07> { [ U0037, ampersand ] } ; + key <AE08> { [ U0038, asterisk ] } ; + key <AE09> { [ U0039, parenleft ] } ; + key <AE10> { [ U0030, parenright ] } ; + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + + // Qrow - key <AD01> { [ U0b9e ] }; - key <AD02> { [ U0bb1 ] }; - key <AD03> { [ U0ba8 ] }; - key <AD04> { [ U0b9a ] }; - key <AD05> { [ U0bb5 ] }; - key <AD06> { [ U0bb2 ] }; - key <AD07> { [ U0bb0 ] }; - key <AD08> { [ U0bc8, U0b90 ] }; - key <AD09> { [ U0bca, U0bcb ] }; - key <AD10> { [ U0bbf, U0bc0 ] }; - key <AD11> { [ U0bc1, U0bc2 ] }; + key <AD01> { [ U0B9E, U0BB6 ] }; + key <AD02> { [ U0BB1, U0BB7 ] }; + key <AD03> { [ U0BA8, U0BB8 ] }; + key <AD04> { [ U0B9A, U0BB9 ] }; + key <AD05> { [ U0BB5, U0B9C ] }; + key <AD06> { [ U0BB2 ] }; + key <AD07> { [ U0BB0 ] }; + key <AD08> { [ U0BC8, U0B90 ] }; + key <AD09> { [ U0BCA, U0BCB ] }; + key <AD10> { [ U0BBF, U0BC0 ] }; + key <AD11> { [ U0BC1, U0BC2 ] }; // Arow - key <AC01> { [ U0baf ] }; - key <AC02> { [ U0bb3 ] }; - key <AC03> { [ U0ba9 ] }; - key <AC04> { [ U0b95 ] }; - key <AC05> { [ U0baa ] }; - key <AC06> { [ U0bbe, U0bb4 ] }; - key <AC07> { [ U0ba4 ] }; - key <AC08> { [ U0bae ] }; - key <AC09> { [ U0b9f ] }; - key <AC10> { [ U0bcd ] }; - key <AC11> { [ U0b99 ] }; + key <AC01> { [ U0BAF ] }; + key <AC02> { [ U0BB3 ] }; + key <AC03> { [ U0BA9 ] }; + key <AC04> { [ U0B95 ] }; + key <AC05> { [ U0BAA ] }; + key <AC06> { [ U0BBE, U0BB4 ] }; + key <AC07> { [ U0BA4 ] }; + key <AC08> { [ U0BAE ] }; + key <AC09> { [ U0B9F ] }; + key <AC10> { [ U0BCD, U0B83 ] }; + key <AC11> { [ U0B99 ] }; // Zrow - key <AB01> { [ U0ba3 ] }; - key <AB02> { [ U0b92, U0b93 ] }; - key <AB03> { [ U0b89, U0b8a ] }; - key <AB04> { [ U0b8e, U0b8f ] }; - key <AB05> { [ U0bc6, U0bc7 ] }; - key <AB06> { [ U0b94, U0bcc ] }; - key <AB07> { [ U0b85, U0b86 ] }; - key <AB08> { [ U0b87, U0b88 ] }; + key <AB01> { [ U0BA3 ] }; + key <AB02> { [ U0B92, U0B93 ] }; + key <AB03> { [ U0B89, U0B8A ] }; + key <AB04> { [ U0B8E, U0B8F ] }; + key <AB05> { [ U0BC6, U0BC7 ] }; + key <AB06> { [ U0B94, U0BCC ] }; + key <AB07> { [ U0B85, U0B86 ] }; + key <AB08> { [ U0B87, U0B88 ] }; +}; + +partial alphanumeric_keys +xkb_symbols "tam_keyboard_with_numerals" { + +// Description: A keymap based on the TamilNet'99 typewriter keyboard +// Encoding: Unicode (http://www.unicode.org) +// Author: Malathi S <malathiramya@gmail.com> +// Secondary contact: Sri Ramadoss M <amachu@au-kbc.org> +// Date : Fri Sep 4 11:33:00 CST 2009 +// Mapping: + + name[Group1]= "India - Tamil Keyboard with Numerals"; + + // Mainly numbers. + key <TLDE> { [ apostrophe, asciitilde ] }; + key <AE01> { [ U0BE7, exclam ] }; + key <AE02> { [ U0BE8, at ] }; + key <AE03> { [ U0BE9, numbersign ] }; + key <AE04> { [ U0BEA, U0BF9 ] }; + key <AE05> { [ U0BEB, percent ] }; + key <AE06> { [ U0BEC, asciicircum ] }; + key <AE07> { [ U0BED, ampersand ] }; + key <AE08> { [ U0BEE, asterisk ] }; + key <AE09> { [ U0BEF, parenleft ] }; + key <AE10> { [ U0BE6, parenright ] }; + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + + + // Qrow + key <AD01> { [ U0B9E, U0BB6 ] }; + key <AD02> { [ U0BB1, U0BB7 ] }; + key <AD03> { [ U0BA8, U0BB8 ] }; + key <AD04> { [ U0B9a, U0BB9 ] }; + key <AD05> { [ U0BB5, U0B9c ] }; + key <AD06> { [ U0BB2 ] }; + key <AD07> { [ U0BB0 ] }; + key <AD08> { [ U0BC8, U0B90 ] }; + key <AD09> { [ U0BCA, U0BCB ] }; + key <AD10> { [ U0BBF, U0BC0 ] }; + key <AD11> { [ U0BC1, U0BC2 ] }; + + // Arow + key <AC01> { [ U0BAF ] }; + key <AC02> { [ U0BB3 ] }; + key <AC03> { [ U0BA9 ] }; + key <AC04> { [ U0B95 ] }; + key <AC05> { [ U0BAA ] }; + key <AC06> { [ U0BBE, U0BB4 ] }; + key <AC07> { [ U0BA4 ] }; + key <AC08> { [ U0BAE ] }; + key <AC09> { [ U0B9F ] }; + key <AC10> { [ U0BCD, U0B83 ] }; + key <AC11> { [ U0B99 ] }; + + // Zrow + key <AB01> { [ U0BA3 ] }; + key <AB02> { [ U0B92, U0B93 ] }; + key <AB03> { [ U0B89, U0B8A ] }; + key <AB04> { [ U0B8E, U0B8F ] }; + key <AB05> { [ U0BC6, U0BC7 ] }; + key <AB06> { [ U0B94, U0BCC ] }; + key <AB07> { [ U0B85, U0B86 ] }; + key <AB08> { [ U0B87, U0B88 ] }; }; partial alphanumeric_keys diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet index a159021f8..7300e76da 100644 --- a/xorg-server/xkbdata.src/symbols/inet +++ b/xorg-server/xkbdata.src/symbols/inet @@ -122,7 +122,7 @@ xkb_symbols "evdev" { // key <I120> { [ ] }; // KEY_MACRO key <I126> { [ plusminus ] }; - key <I129> { [ KP_Separator ] }; + key <I129> { [ KP_Decimal ] }; key <I147> { [ XF86MenuKB ] }; key <I148> { [ XF86Calculator ] }; // key <I149> { [ ] }; // KEY_SETUP @@ -174,7 +174,7 @@ xkb_symbols "evdev" { key <I213> { [ XF86Suspend ] }; key <I214> { [ XF86Close ] }; key <I215> { [ XF86AudioPlay ] }; - key <I216> { [ XF86Forward ] }; + key <I216> { [ XF86AudioForward ] }; // key <I217> { [ ] }; // KEY_BASSBOOST key <I218> { [ Print ] }; // key <I219> { [ ] }; // KEY_HP @@ -1797,6 +1797,15 @@ xkb_symbols "unitekkb1925" { key <I1A> { [ XF86Reload ] }; }; +// Creative + +// Creative Desktop Wireless 7000 +partial alphanumeric_keys +xkb_symbols "creativedw7000" { + include "inet(media_nav_acpi_common)" + key <I66> { [ XF86Pictures ] }; +}; + // Compal // Compal FL90 diff --git a/xorg-server/xkbdata.src/symbols/ir b/xorg-server/xkbdata.src/symbols/ir index af662cf3a..85f18b144 100644 --- a/xorg-server/xkbdata.src/symbols/ir +++ b/xorg-server/xkbdata.src/symbols/ir @@ -1,17 +1,38 @@ // $XKeyboardConfig$ -// Iranian keyboard layout, -// based on National Iranian Keyboard Standard (ISIRI 2901:1994), -// with additions. + +// Iranian keyboard layout + +//////////////////////////////////////// +// Persian layout, +// based on +// Information Technology – Layout of Persian Letters and Symbols on Computer Keyboards +// ISIRI 9147 – 1st Edition +// Institute of Standards and Industrial Research of Iran +// http://www.isiri.org/UserStd/DownloadStd.aspx?id=9147 +// http://behnam.esfahbod.info/standards/isiri-keyboard-9147.pdf // // Author: Behnam Esfahbod <behnam@esfahbod.info> // - -// 3-Level layout - partial default alphanumeric_keys -xkb_symbols "basic" { +xkb_symbols "pes" { + include "ir(pes_part_basic)" + include "ir(pes_part_ext)" + name[Group1]= "Iran"; +}; + + +partial alphanumeric_keys +xkb_symbols "pes_keypad" { + include "ir(pes_part_basic)" + include "ir(pes_part_keypad)" + + name[Group1]= "Iran - Persian, with Persian Keypad"; +}; + +partial hidden alphanumeric_keys +xkb_symbols "pes_part_basic" { // Persian digits key <AE01> { [ 0x10006f1, exclam, quoteleft ] }; @@ -25,13 +46,7 @@ xkb_symbols "basic" { key <AE09> { [ 0x10006f9, parenright, 0x100200e ] }; key <AE10> { [ 0x10006f0, parenleft, 0x100200f ] }; - // Other 3-Level symbols - key <TLDE> { [ 0x100200d, division, asciitilde ] }; - key <AE11> { [ minus, Arabic_tatweel, underscore ] }; - key <AE12> { [ equal, plus, 0x1002212 ] }; - key <BKSL> { [ backslash, bar, 0x1002010 ] }; - key <SPCE> { [ space, 0x100200c, nobreakspace ] }; - + // Persian letters and symbols key <AD01> { [ Arabic_dad, Arabic_sukun, degree ] }; key <AD02> { [ Arabic_sad, Arabic_dammatan, VoidSymbol ] }; key <AD03> { [ Arabic_theh, Arabic_kasratan, 0x13a4 ] }; @@ -68,14 +83,20 @@ xkb_symbols "basic" { key <AB09> { [ period, less, apostrophe ] }; key <AB10> { [ slash, Arabic_question_mark, question ] }; + key <TLDE> { [ 0x100200d, division, asciitilde ] }; + key <AE11> { [ minus, Arabic_tatweel, underscore ] }; + key <AE12> { [ equal, plus, 0x1002212 ] }; + key <BKSL> { [ backslash, bar, 0x1002010 ] }; + + key <SPCE> { [ space, 0x100200c, nobreakspace ] }; + include "level3(ralt_switch)" }; - partial hidden alphanumeric_keys -xkb_symbols "part_pro" { +xkb_symbols "pes_part_ext" { - // Persian and English (ASCII) digits + // Persian and ASCII digits key <AE01> { [ 0x10006f1, exclam, quoteleft, 1 ] }; key <AE02> { [ 0x10006f2, 0x100066c, at, 2 ] }; key <AE03> { [ 0x10006f3, 0x100066b, numbersign, 3 ] }; @@ -86,10 +107,12 @@ xkb_symbols "part_pro" { key <AE08> { [ 0x10006f8, asterisk, enfilledcircbullet, 8 ] }; key <AE09> { [ 0x10006f9, parenright, 0x100200e, 9 ] }; key <AE10> { [ 0x10006f0, parenleft, 0x100200f, 0 ] }; + + key <SPCE> { [ space, 0x100200c, nobreakspace, 0x100202F ] }; }; partial hidden alphanumeric_keys -xkb_symbols "part_keypad" { +xkb_symbols "pes_part_keypad" { // Persian digits and Mathematical operators key <KPDV> { [ division, XF86_Ungrab ] }; @@ -116,39 +139,9 @@ xkb_symbols "part_keypad" { key <KPDL> { [ KP_Delete, 0x100066b ] }; }; -// 4-Level leyout - -partial alphanumeric_keys -xkb_symbols "pro" { - include "ir(basic)" - include "ir(part_pro)" - - name[Group1]= "Iran - Pro"; -}; - - -// Persian Keypad leyout - -partial alphanumeric_keys -xkb_symbols "keypad" { - include "ir(basic)" - include "ir(part_keypad)" - - name[Group1]= "Iran - Keypad"; -}; - - -// 4-Level leyout with Persian Keypad leyout - -partial alphanumeric_keys -xkb_symbols "pro_keypad" { - include "ir(basic)" - include "ir(part_keypad)" - include "ir(part_pro)" - - name[Group1]= "Iran - Pro Keypad"; -}; +//////////////////////////////////////// +// Kurdish Layout partial alphanumeric_keys xkb_symbols "ku" { @@ -168,6 +161,7 @@ xkb_symbols "ku_alt" { name[Group1]= "Iran - Kurdish, Latin Alt-Q"; }; +//////////////////////////////////////// // Kurdish Soranî Bahdînî (Arabic) keyboard layout, // based on the Kurdî Soranî Bahdînî keyboard from KurdITGroup // which is based on National Iranian Keyboard Standard (ISIRI 2901:1994), @@ -182,6 +176,7 @@ xkb_symbols "ku_alt" { // Author: Erdal Ronahî <erdal.ronahi@gmail.com> // // Kurdish Arabic-Latin Layout for Soranî + partial alphanumeric_keys xkb_symbols "ku_ara" { name[Group1]= "Iran - Kurdish, Arabic-Latin"; @@ -242,5 +237,5 @@ xkb_symbols "ku_ara" { key <AB10> { [ slash, Arabic_question_mark, question ] }; include "level3(ralt_switch)" - }; + diff --git a/xorg-server/xkbdata.src/symbols/it b/xorg-server/xkbdata.src/symbols/it index e91a9f804..7f703d16f 100644 --- a/xorg-server/xkbdata.src/symbols/it +++ b/xorg-server/xkbdata.src/symbols/it @@ -176,3 +176,43 @@ xkb_symbols "olpc" { key <I219> { [ less, greater, guillemotleft, guillemotright ] }; }; +partial alphanumeric_keys modifier_keys +xkb_symbols "us" { + + name[Group1]= "Italy - US keyboard with Italian letters"; + + include "us(euro)" + + // Alphanumeric section + + key <TLDE> { [ grave, asciitilde, dead_grave, dead_tilde ] }; + key <AE01> { [ 1, exclam, onesuperior ] }; + key <AE02> { [ 2, at, twosuperior ] }; + key <AE03> { [ 3, numbersign, threesuperior ] }; + key <AE06> { [ 6,asciicircum,dead_circumflex ] }; + key <AE10> { [ 0, parenright, degree ] }; + key <AE11> { [ minus, underscore, dead_macron ] }; + + key <AD03> { [ e, E, egrave, Egrave ] }; + key <AD04> { [ r, R, registered ] }; + key <AD07> { [ u, U, ugrave, Ugrave ] }; + key <AD08> { [ i, I, igrave, Igrave ] }; + key <AD09> { [ o, O, ograve, Ograve ] }; + + key <AC01> { [ a, A, agrave, Agrave ] }; + key <AC03> { [ d, D, eacute, Eacute ] }; + key <AC07> { [ j, J, uacute, Uacute ] }; + key <AC08> { [ k, K, iacute, Iacute ] }; + key <AC09> { [ l, L, oacute, Oacute ] }; + key <AC10> { [ semicolon, colon,dead_diaeresis, dead_diaeresis ] }; + key <AC11> { [apostrophe, quotedbl, dead_acute ] }; + + key <AB01> { [ z, Z, aacute, Aacute ] }; + key <AB03> { [ c, C, copyright ] }; + key <AB06> { [ n, N, ntilde, Ntilde ] }; + key <AB08> { [ comma, less, guillemotleft ] }; + key <AB09> { [ period, greater, guillemotright ] }; + + include "level3(ralt_switch)" +}; + diff --git a/xorg-server/xkbdata.src/symbols/ng b/xorg-server/xkbdata.src/symbols/ng index 8c3567b3a..5b3a19e27 100644 --- a/xorg-server/xkbdata.src/symbols/ng +++ b/xorg-server/xkbdata.src/symbols/ng @@ -77,7 +77,7 @@ xkb_symbols "olpc" { key <AE11> { [ minus, underscore, 0x1000304, 0x1000304 ] }; // combining macron above key <AE12> { [ equal, plus, 0x1000303, 0x1000303 ] }; // combining tilde above - key <AD02> { [ w, W, 0x1000, 0x1000 ] }; // E with dot below + key <AD02> { [ w, W, 0x1001EB9, 0x1001EB8 ] }; // E with dot below key <AD03> { [ e, E, 0x10001DD, 0x100018E ] }; // reversed E key <AD04> { [ r, R, 0x10001B4, 0x10001B3 ] }; // Y with hook key <AD05> { [ t, T, 0x1000327, 0x1000327 ] }; // combining cedilla diff --git a/xorg-server/xkbdata.src/symbols/no b/xorg-server/xkbdata.src/symbols/no index 80a10a2eb..56c3d2c42 100644 --- a/xorg-server/xkbdata.src/symbols/no +++ b/xorg-server/xkbdata.src/symbols/no @@ -15,6 +15,12 @@ xkb_symbols "basic" { name[Group1]="Norway"; + key <AB09> { [ period, colon, ellipsis, periodcentered ] }; + key <AB10> { [ minus, underscore, endash, emdash ] }; + key <AD04> { [ r, R, registered, trademark ] }; + key <AD10> { [ p, P, Greek_pi, Greek_PI ] }; + key <AE05> { [ 5, percent, onehalf, 0x1002030 ] }; + key <AE11> { [ plus, question, plusminus, questiondown ] }; key <AE12> { [ backslash, dead_grave, dead_acute, notsign ] }; @@ -26,6 +32,8 @@ xkb_symbols "basic" { key <BKSL> { [apostrophe, asterisk, dead_doubleacute, multiply ] }; key <LSGT> { [ less, greater, onehalf, threequarters] }; + include "nbsp(level3n)" + include "keypad(ossmath)" include "kpdl(comma)" include "level3(ralt_switch)" diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru index e7317c771..6bc48940f 100644 --- a/xorg-server/xkbdata.src/symbols/ru +++ b/xorg-server/xkbdata.src/symbols/ru @@ -438,3 +438,28 @@ xkb_symbols "dos" { key <AB10> { [ Cyrillic_io, Cyrillic_IO ] }; }; +partial alphanumeric_keys +xkb_symbols "bak" { + include "ru(winkeys)" + + name[Group1]= "Russia - Bashkirian"; + key.type[group1]="FOUR_LEVEL"; + + key <TLDE> { [ 0x010004d9, 0x010004d8, Cyrillic_io, Cyrillic_IO ] }; + key <AE01> { [ exclam, quotedbl, 1, 1 ] }; + key <AE02> { [ 0x010004e9, 0x010004e8, 2, 2 ] }; + key <AE03> { [ 0x010004a1, 0x010004a0, 3, 3 ] }; + key <AE04> { [ 0x01000493, 0x01000492, 4, 4 ] }; + key <AE05> { [ 0x010004ab, 0x010004aa, 5, 5 ] }; + key <AE06> { [ colon, semicolon, 6, 6 ] }; + key <AE07> { [ 0x01000499, 0x01000498, 7, 7 ] }; + key <AE08> { [ 0x010004bb, 0x010004ba, 8, 8 ] }; + key <AE09> { [ question, parenleft, 9, 9 ] }; + key <AE10> { [ numerosign, parenright, 0, 0 ] }; + key <AE11> { [ minus, percent, minus, underscore ]}; + key <AE12> { [ 0x010004af, 0x010004ae, equal, plus ]}; + key <BKSL> { [ 0x010004a3, 0x010004a2, backslash, slash ]}; + + include "level3(ralt_switch)" +}; + diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us index 5378cf888..41670f018 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/us +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us @@ -257,6 +257,8 @@ xkb_symbols "type6" { include "eurosign(4)" key <SYRQ> { [ SunSys_Req ]}; + key <LSGT> { [ less, greater, bar, brokenbar ] }; + }; xkb_symbols "pc101" { diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir index e68960ad3..79681dbee 100644 --- a/xorg-server/xkbdata.src/symbols/symbols.dir +++ b/xorg-server/xkbdata.src/symbols/symbols.dir @@ -145,6 +145,7 @@ h-p----- a------- pc(editing) --p----- a------- in(ori) --p----- a------- in(tam) --p----- a------- in(tam_unicode) +--p----- a------- in(tam_keyboard_with_numerals) --p----- a------- in(tam_TSCII) --p----- a------- in(tam_TAB) --p----- a------- in(tel) @@ -163,7 +164,7 @@ h-p----- a------- pc(editing) --p----- a------- hr(unicode) --p----- a------- hr(unicodeus) -dp----- a------- by(basic) ---p----- a------- by(winkeys) +--p----- a------- by(legacy) --p----- a------- by(latin) -dp----- -------- tr(basic) --p----- -------- tr(f) @@ -226,12 +227,11 @@ h-p----- --k----- hu(def_dot) h-p----- a------- hu(def_dead) h-p----- a------- hu(def_nodead) h-p----- a------- hu(def_common) --dp----- a------- ir(basic) -h-p----- a------- ir(part_pro) -h-p----- a------- ir(part_keypad) ---p----- a------- ir(pro) ---p----- a------- ir(keypad) ---p----- a------- ir(pro_keypad) +-dp----- a------- ir(pes) +--p----- a------- ir(pes_keypad) +h-p----- a------- ir(pes_part_basic) +h-p----- a------- ir(pes_part_ext) +h-p----- a------- ir(pes_part_keypad) --p----- a------- ir(ku) --p----- a------- ir(ku_f) --p----- a------- ir(ku_alt) @@ -345,6 +345,10 @@ h-p----- -m------ capslock(swapescape) h-p----- -m------ capslock(groupshift) h-p----- -m------ capslock(escape) h-p----- -m------ capslock(backspace) +h-p----- -m------ capslock(super) +h-p----- -m------ capslock(hyper) +h-p----- -m------ capslock(none) +h-p----- -m------ capslock(numlock) -dp----- a------- is(basic) --p----- a------- is(Sundeadkeys) --p----- a------- is(nodeadkeys) @@ -548,6 +552,17 @@ h------- -------- macintosh_vndr/us(oldmac) -------- -------- sony_vndr/us(nwp5461) -dp----- am------ za(basic) -------- -------- hp_vndr/us(hil) +-------- -------- extras/rs(combiningkeys) +--p----- am------ extras/apl(common) +--p----- am------ extras/apl(unified) +-dp----- am------ extras/apl(sax) +--p----- am------ extras/apl(apl2) +--p----- am------ extras/apl(aplplusII) +--p----- am------ extras/apl(aplx) +--p----- a------- extras/us(intl-unicode) +--p----- a------- extras/us(alt-intl-unicode) +--p----- a------- extras/us(ats) +--p----- a------- extras/us(crd) -dp----- a------- ie(basic) --p----- a------- ie(CloGaelach) --p----- a------- ie(UnicodeExpert) @@ -659,9 +674,11 @@ h-p----- -m------ group(olpc) --p----- a------- it(mac) --p----- a------- it(geo) -------- -------- it(olpc) +--p----- am------ it(us) -dp----- a------- bg(bds) --p----- a------- bg(phonetic) --p----- a------- bg(bas_phonetic) +h-p----- a------- bg(latin) h-p----- a------- inet(media_common) h-p----- a------- inet(nav_common) h-p----- a------- inet(acpi_common) @@ -770,6 +787,7 @@ h-p----- a------- inet(logitech_set3) --p----- a------- inet(benqx) --p----- a------- inet(classmate) --p----- a------- inet(unitekkb1925) +--p----- a------- inet(creativedw7000) --p----- a------- inet(compalfl90) --p----- a------- inet(pc105) -dp----- a------- latam(basic) @@ -836,6 +854,7 @@ h-p----- a------- ru(common) --p----- a------- ru(sah) --p----- a------- ru(xal) --p----- a------- ru(dos) +--p----- a------- ru(bak) -dp----- am------ lv(basic) --p----- am------ lv(apostrophe) --p----- am------ lv(tilde) diff --git a/xorg-server/xkbdata.src/symbols/tr b/xorg-server/xkbdata.src/symbols/tr index 68672aa11..c217a7af0 100644 --- a/xorg-server/xkbdata.src/symbols/tr +++ b/xorg-server/xkbdata.src/symbols/tr @@ -299,9 +299,11 @@ xkb_symbols "olpc" { }; // Crimean Tatar (Crimean Turkish) layouts. +// First released: 2009. // These layouts are currently experimental. In particular, the mapping of letter 'x', // included for foreign words and shortcuts, might change in the future... -// Reşat SABIQ <tilde.birlik@gmail.com>, 2009 +// Reşat SABIQ <tilde.birlik @ gmail . com> +// Özgür Qarahan <qarahan @ gmail . com> // Crimean Tatar (Crimean Turkish) Q Layout partial diff --git a/xorg-server/xkbdata.src/symbols/us b/xorg-server/xkbdata.src/symbols/us index 20a1b57f4..c732de64b 100644 --- a/xorg-server/xkbdata.src/symbols/us +++ b/xorg-server/xkbdata.src/symbols/us @@ -91,7 +91,7 @@ xkb_symbols "intl" { key <AE02> { [ 2, at, twosuperior, dead_doubleacute ] }; key <AE03> { [ 3, numbersign, threesuperior, dead_macron ] }; key <AE04> { [ 4, dollar, currency, sterling ] }; - key <AE05> { [ 5, percent, EuroSign ] }; + key <AE05> { [ 5, percent, EuroSign, dead_cedilla ] }; key <AE06> { [ 6, dead_circumflex, onequarter, asciicircum ] }; key <AE07> { [ 7, ampersand, onehalf, dead_horn ] }; key <AE08> { [ 8, asterisk, threequarters, dead_ogonek ] }; @@ -765,11 +765,11 @@ xkb_symbols "altgr-intl" { key <AB02> { [ x, X, oe, OE ] }; key <AB04> { [ v, V, registered, registered ] }; -// onequarter etc (not in iso8859-15) deleted to get three unshifted deadkeys: +// onequarter etc (not in iso8859-15) moved to get three unshifted deadkeys: - key <AE06> { [ 6, asciicircum, dead_circumflex ] }; - key <AE07> { [ 7, ampersand, dead_horn ] }; - key <AE08> { [ 8, asterisk, dead_ogonek ] }; + key <AE06> { [ 6, asciicircum, dead_circumflex, onequarter ] }; + key <AE07> { [ 7, ampersand, dead_horn, onehalf ] }; + key <AE08> { [ 8, asterisk, dead_ogonek, threequarters ] }; include "level3(ralt_switch)" }; diff --git a/xorg-server/xkbdata.src/symbols/vn b/xorg-server/xkbdata.src/symbols/vn index 37d81408a..acebae572 100644 --- a/xorg-server/xkbdata.src/symbols/vn +++ b/xorg-server/xkbdata.src/symbols/vn @@ -6,6 +6,8 @@ // August 1999 // Further modified by Ashley Clark <aclark@debian.org> // July 2000 for X 4.0 +// Fix accents into combining marks by Samuel Thibault <samuel.thibault@ens-lyon.org> +// July 2009 partial default alphanumeric_keys @@ -21,11 +23,11 @@ xkb_symbols "basic" { key <AE02> { [ acircumflex, Acircumflex ] }; key <AE03> { [ ecircumflex, Ecircumflex ] }; key <AE04> { [ ocircumflex, Ocircumflex ] }; - key <AE05> { [ dead_grave, percent ] }; - key <AE06> { [ dead_hook, asciicircum ] }; - key <AE07> { [ dead_tilde, ampersand ] }; - key <AE08> { [ dead_acute, asterisk ] }; - key <AE09> { [ dead_belowdot,parenleft ] }; + key <AE05> { [ 0x1000300, percent, dead_grave, percent ] }; + key <AE06> { [ 0x1000309, asciicircum, dead_hook, asciicircum ] }; + key <AE07> { [ 0x1000303, ampersand, dead_tilde, ampersand ] }; + key <AE08> { [ 0x1000301, asterisk, dead_acute, asterisk ] }; + key <AE09> { [ 0x1000323, parenleft, dead_belowdot, parenleft ] }; key <AE10> { [ dstroke, Dstroke ] }; key <AE11> { [ minus, underscore ] }; key <AE12> { [ DongSign, plus ] }; diff --git a/xorg-server/xkbdata.src/types/Makefile.in b/xorg-server/xkbdata.src/types/Makefile.in index 54285e41e..d1ba36e04 100644 --- a/xorg-server/xkbdata.src/types/Makefile.in +++ b/xorg-server/xkbdata.src/types/Makefile.in @@ -382,7 +382,7 @@ uninstall-am: uninstall-dist_dirDATA uninstall-dist_typesDATA $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/xorg-server/xkbdata.src/xkbrules.am b/xorg-server/xkbdata.src/xkbrules.am index 6fde169f9..0251b7499 100644 --- a/xorg-server/xkbdata.src/xkbrules.am +++ b/xorg-server/xkbdata.src/xkbrules.am @@ -8,7 +8,7 @@ dirdir = $(xkb_base) $(subdir).dir: $(dir_data) -rm -f $@ - here=$$(pwd); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' + here=$(abs_builddir); cd $(srcdir) && $(XKBCOMP) -lfhlpR -o $${here}/$@ '*' CLEANFILES = $(subdir).dir diff --git a/xorg-server/xkbdata.src/xkeyboard-config.spec b/xorg-server/xkbdata.src/xkeyboard-config.spec index 631d90142..65f2153a1 100644 --- a/xorg-server/xkbdata.src/xkeyboard-config.spec +++ b/xorg-server/xkbdata.src/xkeyboard-config.spec @@ -1,6 +1,6 @@ Name: xkeyboard-config Summary: XML-based XKB configuration registry -Version: 1.6 +Version: 1.6.99 Release: 1 License: X11/MIT Group: User Interface/X |