diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-31 12:30:46 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-31 12:30:46 +0000 |
| commit | 74e21f951a8a1c11445cab7accce2ace6c1acef5 (patch) | |
| tree | 9dfc383a132bc2105e953ae46f94500d3a3215ae /xorg-server/xkbdata.src/symbols | |
| parent | a0b1a2d0be5641d39e23725a20e9bf4a52c2ed2a (diff) | |
| download | vcxsrv-74e21f951a8a1c11445cab7accce2ace6c1acef5.tar.gz vcxsrv-74e21f951a8a1c11445cab7accce2ace6c1acef5.tar.bz2 vcxsrv-74e21f951a8a1c11445cab7accce2ace6c1acef5.zip | |
Updated to xkeyboard-config-1.8
Diffstat (limited to 'xorg-server/xkbdata.src/symbols')
58 files changed, 2954 insertions, 1313 deletions
diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am index 472a39922..d22d6c39b 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 extras +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_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 45c080daf..7cac7aa82 100644 --- a/xorg-server/xkbdata.src/symbols/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/Makefile.in @@ -124,6 +124,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -181,7 +182,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 extras +SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras symbolsdir = $(xkb_base)/symbols dist_symbols_DATA = \ ad af al \ @@ -231,9 +232,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/Makefile + $(AUTOMAKE) --foreign symbols/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/altwin b/xorg-server/xkbdata.src/symbols/altwin index d0154f2f3..4463fe06c 100644 --- a/xorg-server/xkbdata.src/symbols/altwin +++ b/xorg-server/xkbdata.src/symbols/altwin @@ -77,8 +77,7 @@ xkb_symbols "alt_super_win" { partial modifier_keys xkb_symbols "swap_lalt_lwin" { - key <LALT> { [ Super_L ] }; + key <LALT> { type[Group1] = "ONE_LEVEL", + symbols[Group1] = [ Super_L ] }; key <LWIN> { [ Alt_L, Meta_L ] }; - modifier_map Mod1 { <LWIN> }; - modifier_map Mod4 { <LALT> }; }; diff --git a/xorg-server/xkbdata.src/symbols/ch b/xorg-server/xkbdata.src/symbols/ch index 3a7646f80..a0a2621a9 100644 --- a/xorg-server/xkbdata.src/symbols/ch +++ b/xorg-server/xkbdata.src/symbols/ch @@ -16,7 +16,7 @@ xkb_symbols "basic" { key <AE04> { [ 4, ccedilla ] }; key <AE05> { [ 5, percent ] }; key <AE06> { [ 6, ampersand, notsign ] }; - key <AE07> { [ 7, slash, brokenbar ] }; + key <AE07> { [ 7, slash, bar ] }; key <AE08> { [ 8, parenleft, cent ] }; key <AE09> { [ 9, parenright ] }; key <AE10> { [ 0, equal ] }; @@ -42,6 +42,14 @@ xkb_symbols "basic" { }; partial alphanumeric_keys +xkb_symbols "legacy" { + include "ch(basic)" + + name[Group1]= "Switzerland - Legacy"; + key <AE07> { [ 7, slash, brokenbar ] }; +}; + +partial alphanumeric_keys xkb_symbols "de" { include "ch(basic)" }; diff --git a/xorg-server/xkbdata.src/symbols/compose b/xorg-server/xkbdata.src/symbols/compose index 521d93eb9..3bedb3315 100644 --- a/xorg-server/xkbdata.src/symbols/compose +++ b/xorg-server/xkbdata.src/symbols/compose @@ -28,6 +28,11 @@ xkb_symbols "rctrl" { }; partial modifier_keys +xkb_symbols "lctrl" { + key <LCTL> { type[Group1]="TWO_LEVEL", [ Multi_key, Multi_key ] }; +}; + +partial modifier_keys xkb_symbols "caps" { replace key <CAPS> { type="TWO_LEVEL", [ Multi_key, Multi_key ] }; }; diff --git a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in index 6a4f87404..59d530e54 100644 --- a/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/digital_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -180,9 +181,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/digital_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/digital_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/digital_vndr/Makefile + $(AUTOMAKE) --foreign symbols/digital_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/extras/Makefile.in b/xorg-server/xkbdata.src/symbols/extras/Makefile.in index e00e6e91e..8ba3d24d7 100644 --- a/xorg-server/xkbdata.src/symbols/extras/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/extras/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -180,9 +181,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/extras/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/extras/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/extras/Makefile + $(AUTOMAKE) --foreign symbols/extras/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in index 2680b63b6..ec4357e2b 100644 --- a/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/fujitsu_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/fujitsu_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/fujitsu_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/fujitsu_vndr/Makefile + $(AUTOMAKE) --foreign symbols/fujitsu_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/group b/xorg-server/xkbdata.src/symbols/group index 1b23e31c2..f39b05159 100644 --- a/xorg-server/xkbdata.src/symbols/group +++ b/xorg-server/xkbdata.src/symbols/group @@ -120,6 +120,19 @@ xkb_symbols "lctrl_lshift_toggle" { key <LCTL> { [ Control_L, ISO_Next_Group ] }; }; +// using the group(rctrl_rshift_toggle) map, pressing: +// Control_R+Shift_R locks the next group +// If you have two groups and group wrap is enabled, the effect is +// indistinguishable. +partial modifier_keys +xkb_symbols "rctrl_rshift_toggle" { + key <RTSH> { + type[Group1]="PC_CONTROL_LEVEL2", + symbols[Group1]= [ Shift_R, ISO_Next_Group ] + }; + key <RCTL> { [ Control_R, ISO_Next_Group ] }; +}; + // using the group(shift_caps_toggle) map, pressing: // Shift+Caps Lock toggles group partial modifier_keys @@ -155,6 +168,22 @@ xkb_symbols "win_menu_switch" { }; }; +// using the group(lctrl_rctrl_switch) map, pressing: +// Left Control selects the first group +// Right Control selects the last group +partial modifier_keys +xkb_symbols "lctrl_rctrl_switch" { + virtual_modifiers AltGr; + key <LCTL> { + virtualMods= AltGr, + symbols[Group1] = [ ISO_First_Group ] + }; + key <RCTL> { + virtualMods= AltGr, + symbols[Group1] = [ ISO_Last_Group ] + }; +}; + // using the group(ctrl_alt_toggle) map, pressing: // Control_L+Alt_L locks the previous group // Control_R+Alt_R locks the next group diff --git a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in index 61fa05a1d..25b97d2d8 100644 --- a/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/hp_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/hp_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/hp_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/hp_vndr/Makefile + $(AUTOMAKE) --foreign symbols/hp_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet index f6cd6ac91..89e802e98 100644 --- a/xorg-server/xkbdata.src/symbols/inet +++ b/xorg-server/xkbdata.src/symbols/inet @@ -32,6 +32,7 @@ xkb_symbols "media_common" { key <I2E> { [ XF86AudioLowerVolume ] }; key <I30> { [ XF86AudioRaiseVolume ] }; key <K5A> { [ XF86Eject ] }; + key <K6C> { [ XF86Eject ] }; }; // popular web navigation combination @@ -429,7 +430,6 @@ xkb_symbols "btc9019u" { include "inet(media_nav_acpi_common)" key <FK17> { [ XF86Search ] }; key <I02> { [ XF86HomePage ] }; - key <K6C> { [ XF86Eject ] }; }; // Cherry Blue Line @@ -1722,7 +1722,6 @@ xkb_symbols "cymotionlinux" { key <I3C> { [ XF86Cut ] }; key <I78> { [ XF86Copy ] }; key <K65> { [ XF86Paste ] }; - key <K6C> { [ XF86Eject ] }; key <K75> { [ XF86ScrollUp ] }; key <XFER> { [ XF86AudioMedia ] }; }; diff --git a/xorg-server/xkbdata.src/symbols/lt b/xorg-server/xkbdata.src/symbols/lt index d535da7d3..5956ace48 100644 --- a/xorg-server/xkbdata.src/symbols/lt +++ b/xorg-server/xkbdata.src/symbols/lt @@ -160,9 +160,9 @@ xkb_symbols "ibm" { include "level3(ralt_switch)" }; -// LEKP, LEKPa and Baltic+ layouts 1.0 for Linux. +// LEKP and LEKPa layouts 1.0 // Copyright (c) 2007 Tautrimas Pajarskas -// For more info go to http://lekp.info +// For more info visit http://lekp.info // // LEKP and LEKPa layouts are licensed under the Creative Commons // Attribution-Noncommercial-Share Alike 3.0 License. @@ -292,29 +292,3 @@ xkb_symbols "lekpa" { include "level3(ralt_switch)" }; -partial alphanumeric_keys modifier_keys -xkb_symbols "balticplus" { - include "latin" - name[Group1]="Lithuania - Baltic+"; - key <AE01> { [ aogonek, Aogonek, 1, exclam ] }; - key <AE02> { [ ccaron, Ccaron, 2, at ] }; - key <AE03> { [ eogonek, Eogonek, 3, numbersign ] }; - key <AE04> { [ eabovedot, Eabovedot, 4, dollar ] }; - key <AE05> { [ iogonek, Iogonek, 5, percent ] }; - key <AE06> { [ scaron, Scaron, 6, asciicircum ] }; - key <AE07> { [ uogonek, Uogonek, 7, ampersand ] }; - key <AE08> { [ umacron, Umacron, 8, asterisk ] }; - key <AE09> { [ parenleft, doublelowquotemark, 9 ] }; - key <AE10> { [ parenright, leftdoublequotemark, 0 ] }; - key <AE11> { [ minus, underscore, minus, section ] }; - key <AE12> { [ zcaron, Zcaron, equal, plus ] }; - key <CAPS> { [ BackSpace ] }; - key <NFER> { [ backslash, bar, endash ] }; - key <AD03> { [ e, E, EuroSign ] }; - key <AD04> { [ r, R, registered ] }; - key <AD05> { [ t, T, trademark ] }; - key <AB03> { [ c, C, copyright ] }; - key <AB08> { [ comma, less, degree ] }; - include "level3(ralt_switch)" -}; - diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am index d409eff93..8a4ca9fc4 100644 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am +++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.am @@ -2,7 +2,7 @@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr dist_symbols_DATA = \ apple ch de dk \ -es fi fr \ +fi fr \ gb is it \ latam nl no pt \ se us diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in index 801f8ab0d..e4e5eb4e2 100644 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/macintosh_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -166,7 +167,7 @@ xkb_rules_symlink = @xkb_rules_symlink@ symbolsdir = $(xkb_base)/symbols/macintosh_vndr dist_symbols_DATA = \ apple ch de dk \ -es fi fr \ +fi fr \ gb is it \ latam nl no pt \ se us @@ -183,9 +184,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/macintosh_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/macintosh_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/macintosh_vndr/Makefile + $(AUTOMAKE) --foreign symbols/macintosh_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es b/xorg-server/xkbdata.src/symbols/macintosh_vndr/es deleted file mode 100644 index 61f12498f..000000000 --- a/xorg-server/xkbdata.src/symbols/macintosh_vndr/es +++ /dev/null @@ -1,6 +0,0 @@ - -partial default alphanumeric_keys -xkb_symbols "basic" { - include "es" - name[Group1]= "Spain - Mac"; -}; diff --git a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in index 6f96e6797..6a481e118 100644 --- a/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/nec_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/nec_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/nec_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/nec_vndr/Makefile + $(AUTOMAKE) --foreign symbols/nec_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am new file mode 100644 index 000000000..71200ec4d --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.am @@ -0,0 +1,6 @@ +symbolsdir = $(xkb_base)/symbols/nokia_vndr + +dist_symbols_DATA = \ +rx-44 \ +rx-51 \ +su-8w diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in new file mode 100644 index 000000000..8f508f285 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/Makefile.in @@ -0,0 +1,356 @@ +# 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/nokia_vndr +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_URL = @PACKAGE_URL@ +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/nokia_vndr +dist_symbols_DATA = \ +rx-44 \ +rx-51 \ +su-8w + +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) --foreign symbols/nokia_vndr/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign symbols/nokia_vndr/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/nokia_vndr/rx-44 b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44 new file mode 100644 index 000000000..515b69eef --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-44 @@ -0,0 +1,303 @@ +partial alphanumeric_keys +xkb_symbols "us" { + name[Group1] = "U.S. English"; + + include "nokia_vndr/rx-44(base)" + + key <AC01> { [ a, A, exclam, exclam ] }; + key <AC02> { [ s, S, quotedbl, quotedbl ] }; + key <AC03> { [ d, D, at, at ] }; + key <AC04> { [ f, F, numbersign, numbersign ] }; + key <AC05> { [ g, G, backslash, backslash ] }; + key <AC06> { [ h, H, slash, slash ] }; + key <AC07> { [ j, J, parenleft, parenleft ] }; + key <AC08> { [ k, K, parenright, parenright ] }; + key <AC09> { [ l, L, asterisk, asterisk ] }; + key <AC11> { [ apostrophe, question, question, question ] }; + + key <AB01> { [ z, Z, yen, yen ] }; + key <AB02> { [ x, X, asciicircum, asciicircum ] }; + key <AB03> { [ c, C, asciitilde, asciitilde ] }; + key <AB04> { [ v, V, percent, percent ] }; + key <AB05> { [ b, B, ampersand, ampersand ] }; + key <AB06> { [ n, N, dollar, dollar ] }; + key <AB07> { [ m, M, EuroSign, EuroSign ] }; + key <AC10> { [ semicolon, colon, sterling, sterling ] }; + key <AE11> { [ minus, underscore, underscore, underscore ] }; + key <AE12> { [ plus, equal, equal, equal ] }; + + key <AB08> { [ comma, less, comma, less ] }; + key <AB09> { [ period, greater, period, greater ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fisenoda" { + name[Group1] = "Finnish/Swedish/Norwegian/Danish"; + + include "nokia_vndr/rx-44(base)" + + key <AC01> { [ a, A, exclam, exclam ] }; + key <AC02> { [ s, S, quotedbl, quotedbl ] }; + key <AC03> { [ d, D, at, at ] }; + key <AC04> { [ f, F, numbersign, numbersign ] }; + key <AC05> { [ g, G, asterisk, asterisk ] }; + key <AC06> { [ h, H, backslash, backslash ] }; + key <AC07> { [ j, J, slash, slash ] }; + key <AC08> { [ k, K, parenleft, parenleft ] }; + key <AC09> { [ l, L, parenright, parenright ] }; + key <AC11> { [ aring, Aring, question, question ] }; + + key <AB01> { [ z, Z, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, asciitilde, asciitilde ] }; + key <AB03> { [ c, C, percent, percent ] }; + key <AB04> { [ v, V, ampersand, ampersand ] }; + key <AB05> { [ b, B, plus, plus ] }; + key <AB06> { [ n, N, less, less ] }; + key <AB07> { [ m, M, greater, greater ] }; + key <AC10> { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; + key <AE11> { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key <AE12> { [ minus, underscore, underscore, underscore ] }; + + key <AB08> { [ comma, semicolon, comma, semicolon ] }; + key <AB09> { [ period, colon, period, colon ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ptes" { + name[Group1] = "Portuguese/Spanish"; + + include "nokia_vndr/rx-44(base)" + + key <AC01> { [ a, A, exclam, exclam ] }; + key <AC02> { [ s, S, quotedbl, quotedbl ] }; + key <AC03> { [ d, D, at, at ] }; + key <AC04> { [ f, F, numbersign, numbersign ] }; + key <AC05> { [ g, G, asterisk, asterisk ] }; + key <AC06> { [ h, H, backslash, backslash ] }; + key <AC07> { [ j, J, slash, slash ] }; + key <AC08> { [ k, K, parenleft, parenleft ] }; + key <AC09> { [ l, L, parenright, parenright ] }; + key <AC11> { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; + + key <AB01> { [ z, Z, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, percent, percent ] }; + key <AB03> { [ c, C, ampersand, ampersand ] }; + key <AB04> { [ v, V, exclamdown, exclamdown ] }; + key <AB05> { [ b, B, apostrophe, apostrophe ] }; + key <AB06> { [ n, N, plus, plus ] }; + key <AB07> { [ m, M, equal, equal ] }; + key <AC10> { [ ccedilla, Ccedilla, questiondown, questiondown ] }; + key <AE11> { [ ntilde, Ntilde, question, question ] }; + key <AE12> { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; + + key <AB08> { [ comma, semicolon, minus, minus ] }; + key <AB09> { [ period, colon, underscore, underscore ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fr" { + name[Group1] = "French"; + + include "nokia_vndr/rx-44(base)" + + key <AD01> { [ a, A, 1, 1 ] }; + key <AD02> { [ z, Z, 2, 2 ] }; + + key <AC01> { [ q, Q, at, at ] }; + key <AC02> { [ s, S, percent, percent ] }; + key <AC03> { [ d, D, ecircumflex, Ecircumflex ] }; + key <AC04> { [ f, F, eacute, Eacute ] }; + key <AC05> { [ g, G, egrave, Egrave ] }; + key <AC06> { [ h, H, oe, OE ] }; + key <AC07> { [ j, J, parenleft, parenleft ] }; + key <AC08> { [ k, K, parenright, parenright ] }; + key <AC09> { [ l, L, agrave, Agrave ] }; + key <AC11> { [ m, M, ugrave, Ugrave ] }; + + key <AB01> { [ w, w, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, numbersign, numbersign ] }; + key <AB03> { [ c, C, ccedilla, Ccedilla ] }; + key <AB04> { [ v, V, plus, plus ] }; + key <AB05> { [ b, B, equal, equal ] }; + key <AB06> { [ n, N, quotedbl, quotedbl ] }; + key <AB07> { [ comma, question, backslash, backslash ] }; + key <AC10> { [ semicolon, period, minus, minus ] }; + key <AE11> { [ colon, slash, underscore, underscore ] }; + key <AE12> { [ apostrophe, apostrophe, mu, mu ] }; + + key <AB08> { [ less, greater, less, greater ] }; + key <AB09> { [ exclam, section, asterisk, asterisk ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "de" { + name[Group1] = "German"; + + include "nokia_vndr/rx-44(base)" + + key <AD06> { [ z, Z, 6, 6 ] }; + + key <AC01> { [ a, A, exclam, exclam ] }; + key <AC02> { [ s, S, quotedbl, quotedbl ] }; + key <AC03> { [ d, D, at, at ] }; + key <AC04> { [ f, F, numbersign, numbersign ] }; + key <AC05> { [ g, G, percent, percent ] }; + key <AC06> { [ h, H, backslash, backslash ] }; + key <AC07> { [ j, J, slash, slash ] }; + key <AC08> { [ k, K, parenleft, parenleft ] }; + key <AC09> { [ l, L, parenright, parenright ] }; + key <AC11> { [ udiaeresis, Udiaeresis, question, question ] }; + + key <AB01> { [ y, Y, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, asciitilde, asciitilde ] }; + key <AB03> { [ c, C, asterisk, asterisk ] }; + key <AB04> { [ v, V, ampersand, ampersand ] }; + key <AB05> { [ b, B, plus, plus ] }; + key <AB06> { [ n, N, less, less ] }; + key <AB07> { [ m, M, greater, greater ] }; + key <AC10> { [ odiaeresis, Odiaeresis, equal, equal ] }; + key <AE11> { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key <AE12> { [ minus, underscore, ssharp, ssharp ] }; + + key <AB08> { [ comma, semicolon, comma, semicolon ] }; + key <AB09> { [ period, colon, period, colon ] }; +}; + + +// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. +partial alphanumeric_keys +xkb_symbols "ru" { + name[Group1] = "Russian"; + + include "nokia_vndr/rx-44(base)" + + key <AD01> { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; + key <AD02> { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; + key <AD03> { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; + key <AD04> { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; + key <AD05> { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; + key <AD06> { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; + key <AD07> { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; + key <AD08> { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; + key <AD09> { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; + key <AD10> { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; + + key <AC01> { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; + key <AC02> { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; + key <AC03> { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; + key <AC04> { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; + key <AC05> { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; + key <AC06> { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; + key <AC07> { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; + key <AC08> { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; + key <AC09> { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; + key <AC11> { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; + + key <AB01> { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; + key <AB02> { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; + key <AB03> { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; + key <AB04> { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; + key <AB05> { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; + key <AB06> { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; + key <AB07> { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; + key <AC10> { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; + key <AE11> { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; + key <AE12> { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + key <AB08> { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; + key <AB09> { type="EIGHT_LEVEL", [ NoSymbol, NoSymbol, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "it" { + name[Group1] = "Italian"; + + include "nokia_vndr/rx-44(base)" + + key <AC01> { [ a, A, exclam, exclam ] }; + key <AC02> { [ s, S, quotedbl, quotedbl ] }; + key <AC03> { [ d, D, at, at ] }; + key <AC04> { [ f, F, numbersign, numbersign ] }; + key <AC05> { [ g, G, asterisk, asterisk ] }; + key <AC06> { [ h, H, backslash, backslash ] }; + key <AC07> { [ j, J, slash, slash ] }; + key <AC08> { [ k, K, parenleft, parenleft ] }; + key <AC09> { [ l, L, parenright, parenright ] }; + key <AC11> { [ apostrophe, question, igrave, Igrave ] }; + + key <AB01> { [ z, Z, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, asciitilde, asciitilde ] }; + key <AB03> { [ c, C, ampersand, ampersand ] }; + key <AB04> { [ v, V, equal, equal ] }; + key <AB05> { [ b, B, less, less ] }; + key <AB06> { [ n, N, greater, greater ] }; + key <AB07> { [ m, M, plus, plus ] }; + key <AC10> { [ eacute, Eacute, ograve, Ograve ] }; + key <AE11> { [ egrave, Egrave, agrave, Agrave ] }; + key <AE12> { [ minus, underscore, ugrave, Ugrave ] }; + + key <AB08> { [ comma, semicolon, comma, semicolon ] }; + key <AB09> { [ period, colon, period, colon ] }; +}; + +partial default alphanumeric_keys +xkb_symbols "base" { + key <AD01> { [ q, Q, 1, 1 ] }; + key <AD02> { [ w, W, 2, 2 ] }; + key <AD03> { [ e, E, 3, 3 ] }; + key <AD04> { [ r, R, 4, 4 ] }; + key <AD05> { [ t, T, 5, 5 ] }; + key <AD06> { [ y, Y, 6, 6 ] }; + key <AD07> { [ u, U, 7, 7 ] }; + key <AD08> { [ i, I, 8, 8 ] }; + key <AD09> { [ o, O, 9, 9 ] }; + key <AD10> { [ p, P, 0, 0 ] }; + key <BKSP> { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + + // broken UI spec. + key <RTRN> { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; + + key <COMP> { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; + key <LFSH> { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; + key <FN> { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; + key <SPCE> { [ space, space, space, space ] }; + key <RCTL> { [ Control_R, Control_R, Control_R, Control_R ] }; + key <TAB> { [ Tab, Tab, Tab, Tab ] }; + + modifier_map Shift { Shift_L }; + modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Control { Control_R }; + + key <KPEN> { [ Return ] }; + key <UP> { [ Up ] }; + key <DOWN> { [ Down ] }; + key <LEFT> { [ Left ] }; + key <RGHT> { [ Right ] }; + + key <ESC> { [ Escape ] }; + key <FK01> { [ F1 ] }; + key <FK02> { [ F2 ] }; + key <FK03> { [ F3 ] }; + key <FK04> { [ F4 ] }; + key <FK05> { [ F5 ] }; + key <FK06> { [ F6 ] }; + key <FK07> { [ F7 ] }; + key <FK08> { [ F8 ] }; + key <FK09> { [ F9 ] }; + key <FK10> { [ F10 ] }; + key <FK11> { [ F11 ] }; + key <FK12> { [ F12 ] }; + + // generated from the headset, must always be in the map. + key <I29> { [ XF86Phone ] }; +}; diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51 b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51 new file mode 100644 index 000000000..fd98fbf28 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/rx-51 @@ -0,0 +1,491 @@ +default partial alphanumeric_keys +xkb_symbols "common" { + include "nokia_vndr/rx-51(common_keys)" + include "nokia_vndr/rx-51(modifiers)" + + // This section should not be included by any other section. + // It's referenced only once by rule file to allow multiple layout configurations. + + // More than one layout at the same time could be set for instance as follows: + // setxkbmap -rules evdev \ + // -model nokiarx51 \ + // -option grp:ctrl_shift_toggle \ + // -layout us,cz \ + // -variant ",qwerty" + + // Notice the similarity: + // "pc+us+cz(qwerty):2+grp:XYZ" vs. + // "nokia_vndr/rx-51(common)+nokia_vndr/rx-51(us)+nokia_vndr/rx-51(cz_qwerty):2+grp:XYZ" + // where XYZ is one of xkb_symbols section usually located in file symbols/group. + + // Bear in mind that option XYZ could replace current keys configuration!!! + + // For instance using symbols/group(ctrl_shift_toggle) redefines LCTL and LFSH keys + // which may disallow opening of virtual symbol table (Multi_key). + // Fortunately the Multi_key is defined in 3rd and 4th level a ctrl_shift_toggle + // redefines first two levels only. But RX-51 has not right Ctrl nor Shift therefore + // pressing Ctrl+Shift will switch to previous layout, not to the next one. + + // For RX-51 device there is a lot of restrictions if more than one layout is + // is configured at the same time because some modifiers and special cases are + // handled by hildon layer (especially with eight-level layout): + // - settings may be done from terminal only (GUI doesn't and won't support it) + // - virtual symbol table is not updated according to current layout + // - for unknown reasons the eight-level layout (nordic,ru) works properly + // only if it's configured as first layout (e.g. "ru,us,cz" not "us,cz,ru") + // otherwise it's not possible to access levels 5-8 + // - Ctrl+Space related problems: + // - If eight-level layout is used as first layout one of eight-level layouts has to + // be also chosen in GUI - otherwise the Ctrl+Space "switch" is disabled + // - Ctrl+Space has no effect if only four-level layouts are chosen + // (don't forget the layout configured in GUI - despite of it's not reachable) + // - a few keys in 2nd layer could be mixed with other layouts when Ctrl+Space is "turned on" (why?) + // in case eight- and four-level layouts are configured simultaneously + // - Ctrl+Space is "turned on" by default and has to be "turned off" for four-level layouts + // in case eight- and four-level layouts are configured simultaneously + // - four-level layout on first place doesn't work at all when Ctrl+Space is "turned on" + // in case the 2nd, 3rd or 4th layout is eight-level layout +}; + +//////////////////////////////////////////////////////////////////////////////// + +partial alphanumeric_keys +xkb_symbols "us" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_4btns)" + + name[Group1] = "U.S. English"; +}; + + + +partial alphanumeric_keys +xkb_symbols "pl" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_4btns)" + + name[Group1] = "Polish"; +}; + + + +partial alphanumeric_keys +xkb_symbols "fise" { + include "nokia_vndr/rx-51(nordic_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Finnish/Swedish"; + + // 2. row + key <AB09> { [ odiaeresis, Odiaeresis, exclam, exclam ] }; + key <UP> { [ adiaeresis, Adiaeresis, question, question ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "dano" { + include "nokia_vndr/rx-51(nordic_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Danish/Norwegian"; + + // 2. row + key <AB09> { [ oslash, Oslash, exclam, exclam ] }; + key <UP> { [ ae, AE, question, question ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "nordic" { + include "nokia_vndr/rx-51(nordic_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Danish/Finnish/Norwegian/Swedish"; + + key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + + // 2. row + key <AB09> { [ odiaeresis, Odiaeresis, exclam, exclam, oslash, Oslash, exclam, exclam ] }; + key <UP> { [ adiaeresis, Adiaeresis, question, question, ae, AE, question, question ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ptes" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Portuguese/Spanish"; + + // 1. row + key <AB08> { [ dead_acute, dead_acute, dead_grave, dead_grave ] }; + + // 2. row + key <AC05> { [ g, G, exclamdown, exclamdown ] }; + key <AC06> { [ h, H, exclam, exclam ] }; + key <AC07> { [ j, J, questiondown, questiondown ] }; + key <AC08> { [ k, K, question, question ] }; + key <AC09> { [ l, L, dead_diaeresis, dead_diaeresis ] }; + key <AB09> { [ ntilde, Ntilde, dead_tilde, dead_tilde ] }; + key <UP> { [ ccedilla, Ccedilla, dead_circumflex,dead_circumflex ] }; + + // 3. row + key <AB01> { [ z, Z, parenleft, parenleft ] }; + key <AB02> { [ x, X, parenright, parenright ] }; + key <AB03> { [ c, C, slash, slash ] }; + key <AB04> { [ v, V, quotedbl, quotedbl ] }; + key <AB05> { [ b, B, apostrophe, apostrophe ] }; + key <AB06> { [ n, N, colon, colon ] }; + key <AB07> { [ m, M, semicolon, semicolon ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fr" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "French"; + + // 1. row + key <AD01> { [ a, A, 1, 1 ] }; + key <AD02> { [ z, Z, 2, 2 ] }; + key <AB08> { [ agrave, Agrave, ccedilla, Ccedilla ] }; + + // 2. row + key <AC01> { [ q, Q, asterisk, asterisk ] }; + key <AC02> { [ s, S, plus, plus ] }; + key <AC03> { [ d, D, numbersign, numbersign ] }; + key <AC04> { [ f, F, minus, minus ] }; + key <AC05> { [ g, G, underscore, underscore ] }; + key <AC06> { [ h, H, exclam, exclam ] }; + key <AC07> { [ j, J, question, question ] }; + key <AC08> { [ k, K, colon, colon ] }; + key <AC09> { [ l, L, dead_circumflex,dead_circumflex ] }; + key <AB09> { [ m, M, ugrave, Ugrave ] }; + key <UP> { [ eacute, Eacute, egrave, Egrave ] }; + + // 3. row + key <AB01> { [ w, W, EuroSign, EuroSign ] }; + key <AB03> { [ c, C, parenleft, parenleft ] }; + key <AB04> { [ v, V, parenright, parenright ] }; + key <AB05> { [ b, B, slash, slash ] }; + key <AB07> { [ comma, comma, apostrophe, apostrophe ] }; + key <LEFT> { [ semicolon, period, period, period ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "de" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "German"; + + // 1. row + key <AD06> { [ z, Z, 6, 6 ] }; + key <AB08> { [ udiaeresis, Udiaeresis, ssharp, ssharp ] }; + + // 2. row + key <AC08> { [ k, K, semicolon, semicolon ] }; + key <AC09> { [ l, L, colon, colon ] }; + key <AB09> { [ odiaeresis, Odiaeresis, exclam, exclam ] }; + key <UP> { [ adiaeresis, Adiaeresis, question, question ] }; + + // 3. row + key <AB01> { [ y, Y, EuroSign, EuroSign ] }; + key <AB03> { [ c, C, equal, equal ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ch" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Swiss"; + + // 1. row + key <AD06> { [ z, Z, 6, 6 ] }; + key <AB08> { [ udiaeresis, Udiaeresis, egrave, Egrave ] }; + + // 2. row + key <AC06> { [ h, H, equal, equal ] }; + key <AC07> { [ j, J, parenleft, parenleft ] }; + key <AC08> { [ k, K, parenright, parenright ] }; + key <AC09> { [ l, L, colon, colon ] }; + key <AB09> { [ odiaeresis, Odiaeresis, eacute, Aacute ] }; + key <UP> { [ adiaeresis, Adiaeresis, agrave, Agrave ] }; + + // 3. row + key <AB01> { [ y, Y, question, question ] }; + key <AB02> { [ x, X, exclam, exclam ] }; + key <AB03> { [ c, C, ccedilla, Ccedilla ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + + + +// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. +partial alphanumeric_keys +xkb_symbols "ru" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Russian"; + + key.type[Group1] = "EIGHT_LEVEL_SEMIALPHABETIC"; + + // 1. row + key <AD01> { [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; + key <AD02> { [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; + key <AD03> { [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; + key <AD04> { [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; + key <AD05> { [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; + key <AD06> { [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; + key <AD07> { [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; + key <AD08> { [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; + key <AD09> { [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; + key <AD10> { [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; + key <AB08> { [ Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + // 2. row + key <AC01> { [ a, A, asterisk, asterisk, Cyrillic_ef, Cyrillic_EF, asterisk, asterisk ] }; + key <AC02> { [ s, S, plus, plus, Cyrillic_yeru, Cyrillic_YERU, plus, plus ] }; + key <AC03> { [ d, D, numbersign, numbersign, Cyrillic_ve, Cyrillic_VE, numbersign, numbersign ] }; + key <AC04> { [ f, F, minus, minus, Cyrillic_a, Cyrillic_A, minus, minus ] }; + key <AC05> { [ g, G, underscore, underscore, Cyrillic_pe, Cyrillic_PE, underscore, underscore ] }; + key <AC06> { [ h, H, exclam, exclam, Cyrillic_er, Cyrillic_ER, exclam, exclam ] }; + key <AC07> { [ j, J, question, question, Cyrillic_o, Cyrillic_O, question, question ] }; + key <AC08> { [ k, K, semicolon, semicolon, Cyrillic_el, Cyrillic_EL, semicolon, semicolon ] }; + key <AC09> { [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; + key <AB09> { [ comma, comma, comma, comma, Cyrillic_zhe, Cyrillic_ZHE, comma, comma ] }; + key <UP> { [ period, period, period, period, Cyrillic_e, Cyrillic_E, period, period ] }; + + // 3. row + key <AB01> { [ z, Z, dollar, dollar, Cyrillic_ya, Cyrillic_YA, dollar, dollar ] }; + key <AB02> { [ x, X, EuroSign, EuroSign, Cyrillic_che, Cyrillic_CHE, EuroSign, EuroSign ] }; + key <AB03> { [ c, C, slash, slash, Cyrillic_es, Cyrillic_ES, slash, slash ] }; + key <AB04> { [ v, V, parenleft, parenleft, Cyrillic_em, Cyrillic_EM, parenleft, parenleft ] }; + key <AB05> { [ b, B, parenright, parenright, Cyrillic_i, Cyrillic_I, parenright, parenright ] }; + key <AB06> { [ n, N, quotedbl, quotedbl, Cyrillic_te, Cyrillic_TE, quotedbl, quotedbl ] }; + key <AB07> { [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; + key <LEFT> { [ Cyrillic_be, Cyrillic_BE, Cyrillic_yu, Cyrillic_YU, Cyrillic_be, Cyrillic_BE, Cyrillic_yu, Cyrillic_YU ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "it" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Italian"; + + // 1. row + key <AB08> { [ egrave, Egrave, eacute, Eacute ] }; + + // 2. row + key <AC06> { [ h, H, semicolon, semicolon ] }; + key <AC07> { [ j, J, colon, colon ] }; + key <AC08> { [ k, K, exclam, exclam ] }; + key <AC09> { [ l, L, question, question ] }; + key <AB09> { [ ograve, Ograve, igrave, Igrave ] }; + key <UP> { [ agrave, Agrave, ugrave, Ugrave ] }; + + // 3. row + key <AB01> { [ z, Z, EuroSign, EuroSign ] }; + key <AB02> { [ x, X, parenleft, parenleft ] }; + key <AB03> { [ c, C, parenright, parenright ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "cz" { + include "nokia_vndr/rx-51(english_base)" + include "nokia_vndr/rx-51(arrows_2btns)" + + name[Group1] = "Czech"; + + // 1. row + key <AD06> { [ z, Z, 6, 6 ] }; + key <AB08> { [ dead_acute, dead_acute, sterling, sterling ] }; + + // 2. row + key <AC08> { [ k, K, semicolon, semicolon ] }; + key <AC09> { [ l, L, colon, colon ] }; + key <AB09> { [ uring, Uring, EuroSign, EuroSign ] }; + key <UP> { [ dead_caron, dead_caron, dollar, dollar ] }; + + // 3. row + key <AB01> { [ y, Y, equal, equal ] }; + key <AB02> { [ x, X, slash, slash ] }; + key <AB03> { [ c, C, backslash, backslash ] }; + key <AB04> { [ v, V, apostrophe, apostrophe ] }; + key <AB05> { [ b, B, quotedbl, quotedbl ] }; + key <AB06> { [ n, N, exclam, exclam ] }; + key <AB07> { [ m, M, question, question ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + +partial alphanumeric_keys +xkb_symbols "cz_qwerty" { + include "nokia_vndr/rx-51(cz)" + + name[Group1] = "Czech - qwerty"; + + // Do not use the layout "cz_qwerty" directly if it is the only layout and compat rules enabled. + // There is one compat rule that converts "cz_qwerty" to "pc+cz(qwerty)" which is not correct for RX-51. + // Use either the layout "cz(qwerty)" or the general "cz" with variant "qwerty". + + // 1. row + key <AD06> { [ y, Y, 6, 6 ] }; + + // 3. row + key <AB01> { [ z, Z, percent, percent ] }; +}; + + + +//////////////////////////////////////////////////////////////////////////////// + +partial hidden alphanumeric_keys +xkb_symbols "nordic_base" { + include "nokia_vndr/rx-51(english_base)" + + // 1. row + key <AB08> { [ aring, Aring, equal, equal ] }; + + // 2. row + key <AC08> { [ k, K, semicolon, semicolon ] }; + key <AC09> { [ l, L, colon, colon ] }; + + // 3. row + key <AB01> { [ z, Z, EuroSign, EuroSign ] }; + key <AB03> { [ c, C, sterling, sterling ] }; + key <LEFT> { [ period, comma, comma, comma ] }; +}; + +partial hidden alphanumeric_keys +xkb_symbols "english_base" { + + // 1. row + key <AD01> { [ q, Q, 1, 1 ] }; + key <AD02> { [ w, W, 2, 2 ] }; + key <AD03> { [ e, E, 3, 3 ] }; + key <AD04> { [ r, R, 4, 4 ] }; + key <AD05> { [ t, T, 5, 5 ] }; + key <AD06> { [ y, Y, 6, 6 ] }; + key <AD07> { [ u, U, 7, 7 ] }; + key <AD08> { [ i, I, 8, 8 ] }; + key <AD09> { [ o, O, 9, 9 ] }; + key <AD10> { [ p, P, 0, 0 ] }; + key <AB08> { [ comma, semicolon, equal, equal ] }; + + // 2. row + key <AC01> { [ a, A, asterisk, asterisk ] }; + key <AC02> { [ s, S, plus, plus ] }; + key <AC03> { [ d, D, numbersign, numbersign ] }; + key <AC04> { [ f, F, minus, minus ] }; + key <AC05> { [ g, G, underscore, underscore ] }; + key <AC06> { [ h, H, parenleft, parenleft ] }; + key <AC07> { [ j, J, parenright, parenright ] }; + key <AC08> { [ k, K, ampersand, ampersand ] }; + key <AC09> { [ l, L, exclam, exclam ] }; + key <AB09> { [ period, colon, question, question ] }; + + // 3. row + key <AB01> { [ z, Z, sterling, sterling ] }; + key <AB02> { [ x, X, dollar, dollar ] }; + key <AB03> { [ c, C, EuroSign, EuroSign ] }; + key <AB04> { [ v, V, slash, slash ] }; + key <AB05> { [ b, B, backslash, backslash ] }; + key <AB06> { [ n, N, quotedbl, quotedbl ] }; + key <AB07> { [ m, M, apostrophe, apostrophe ] }; + key <SPCE> { [ space, space, at, at ] }; +}; + +partial hidden alphanumeric_keys +xkb_symbols "common_keys" { + // all other common keys + + key <BKSP> { [ BackSpace ] }; + key <TAB> { [ Tab ] }; + + // broken UI spec. + key <RTRN> { [ KP_Enter ] }; + + key <KPEN> { [ Return ] }; + key <ESC> { [ Escape ] }; + + key <FK01> { [ F1 ] }; + key <FK02> { [ F2 ] }; + key <FK03> { [ F3 ] }; + key <FK04> { [ F4 ] }; + key <FK05> { [ F5 ] }; + key <FK06> { [ F6 ] }; + + // Swap +/- keys intentionally. The VOL+/VOL- keys are located physically + // on left/right and up/down in landscape/portrait orientation. This does + // not feel natural for the user and therefore we want the VOL+/VOL- keys + // map to -/+. + // + // The only exception is an active call in portrait mode where we want to + // use the real meanings of the keys. This special case and management of + // +/- keys in general is handled in maemo-statusmenu-volume. + key <FK07> { [ F8 ] }; + key <FK08> { [ F7 ] }; + + key <FK09> { [ F9 ] }; + key <FK10> { [ F10 ] }; + key <FK11> { [ F11 ] }; +}; + +partial hidden alphanumeric_keys modifier_keys +xkb_symbols "modifiers" { + // Shift switches between current level and level+1 + key <LFSH> { + type[Group1] = "ONE_LEVEL", + symbols[Group1] = [ Shift_L ] + }; + modifier_map Shift { Shift_L }; + + // Fn+Ctrl virtual symbol table (Multi_key) + // Ctrl+Space switches between 1st and 5th level (hardcoded in hildon) + key <LCTL> { + type[Group1] = "FOUR_LEVEL", + symbols[Group1] = [ Control_L, Control_L, Multi_key, Multi_key ] + }; + modifier_map Control { Control_L }; + + // Fn key (right alt) switches to 3rd level + include "level3(ralt_switch)" +}; + +partial hidden alphanumeric_keys +xkb_symbols "arrows_2btns" { + // rx-51 specific arrows mapping + // normal 2nd level must not be enumerated to allow text selection with Shift key + key <DOWN> { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Left, Up ] }; + key <RGHT> { type[Group1] = "PC_FN_LEVEL2", symbols[Group1] = [ Right, Down ] }; +}; + +partial hidden alphanumeric_keys +xkb_symbols "arrows_4btns" { + // standard arrows mapping + // normal 2nd level must not be enumerated to allow text selection with Shift key + key <UP> { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Up ] }; + key <LEFT> { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Left ] }; + key <DOWN> { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Down ] }; + key <RGHT> { type[Group1] = "ONE_LEVEL", symbols[Group1] = [ Right ] }; +}; diff --git a/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w b/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w new file mode 100644 index 000000000..6962aa971 --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/nokia_vndr/su-8w @@ -0,0 +1,484 @@ +partial alphanumeric_keys default +xkb_symbols "no" { + name[Group1]= "Norwegian/Danish"; + + include "nokia_vndr/su-8w(base)" + + key <AE01> { [ 1, exclam, dead_circumflex ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, EuroSign ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent, sterling ] }; + key <AE06> { [ 6, ampersand ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ dead_acute, dead_grave, backslash ] }; + + key <AD01> { [ q, Q, dead_circumflex ] }; + key <AD02> { [ w, W, at ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, dollar ] }; + key <AD05> { [ t, T, sterling ] }; + key <AD06> { [ y, Y ] }; + key <AD07> { [ u, U, braceleft ] }; + key <AD08> { [ i, I, bracketleft ] }; + key <AD09> { [ o, O, bracketright ] }; + key <AD10> { [ p, P, braceright ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ ssharp, ssharp, backslash ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S ] }; + key <AC03> { [ d, D ] }; + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ h, H ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K ] }; + key <AC09> { [ l, L ] }; + key <AC10> { [ oslash, Ooblique ] }; + key <AC11> { [ ae, AE ] }; + + key <AB01> { [ z, Z ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ c, C ] }; + key <AB04> { [ v, V ] }; + key <AB05> { [ b, B ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M ] }; + key <AB08> { [ comma, semicolon, less ] }; + key <AB09> { [ period, colon, greater ] }; + key <AB10> { [ minus, underscore, dead_diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "no_nodeadkeys" { + name[Group1] = "Norwegian/Danish (no dead keys)"; + + include "nokia_vndr/su-8w(no)" + + key <AE01> { [ 1, exclam, asciicircum ] }; + key <AE12> { [ acute, grave, backslash ] }; + key <AD01> { [ q, Q, asciicircum ] }; +}; + +partial alphanumeric_keys default +xkb_symbols "dk" { + include "nokia_vndr/su-8w(no)" +}; + +partial alphanumeric_keys default +xkb_symbols "dk_nodeadkeys" { + include "nokia_vndr/su-8w(no_nodeadkeys)" +}; + + + +partial alphanumeric_keys default +xkb_symbols "de" { + name[Group1]= "German"; + include "nokia_vndr/su-8w(base)" + + key <AE01> { [ 1, exclam, dead_circumflex ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, EuroSign ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent, sterling ] }; + key <AE06> { [ 6, ampersand ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ dead_acute, dead_grave, backslash ] }; + + key <AD01> { [ q, Q, dead_circumflex ] }; + key <AD02> { [ w, W, at ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, dollar ] }; + key <AD05> { [ t, T, sterling ] }; + key <AD06> { [ z, Z ] }; + key <AD07> { [ u, U, braceleft ] }; + key <AD08> { [ i, I, bracketleft ] }; + key <AD09> { [ o, O, bracketright ] }; + key <AD10> { [ p, P, braceright ] }; + key <AD11> { [ udiaeresis, Udiaeresis ] }; + key <AD12> { [ ssharp, ssharp, backslash ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S ] }; + key <AC03> { [ d, D ] }; + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ h, H ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K ] }; + key <AC09> { [ l, L ] }; + key <AC10> { [ odiaeresis, Odiaeresis ] }; + key <AC11> { [ adiaeresis, Adiaeresis ] }; + + key <AB01> { [ y, Y ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ c, C ] }; + key <AB04> { [ v, V ] }; + key <AB05> { [ b, B ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M ] }; + key <AB08> { [ comma, semicolon, less ] }; + key <AB09> { [ period, colon, greater ] }; + // XXX Inexplicably, the diaeresis is dead on other layouts, but not + // German. Go figure. + key <AB10> { [ minus, underscore, diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "de_nodeadkeys" { + name[Group1] = "German (no dead keys)"; + + include "nokia_vndr/su-8w(de)" + + key <AE01> { [ 1, exclam, asciicircum ] }; + key <AE12> { [ acute, grave, backslash ] }; + key <AD01> { [ q, Q, asciicircum ] }; +}; + + + +partial alphanumeric_keys default +xkb_symbols "se" { + name[Group1]= "Finnish/Swedish"; + + include "nokia_vndr/su-8w(base)" + + key <AE01> { [ 1, exclam, dead_circumflex ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, EuroSign ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent, sterling ] }; + key <AE06> { [ 6, ampersand ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <AE11> { [ plus, question ] }; + key <AE12> { [ dead_acute, dead_grave, backslash ] }; + + key <AD01> { [ q, Q, dead_circumflex ] }; + key <AD02> { [ w, W, at ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, dollar ] }; + key <AD05> { [ t, T, sterling ] }; + key <AD06> { [ y, Y ] }; + key <AD07> { [ u, U, braceleft ] }; + key <AD08> { [ i, I, bracketleft ] }; + key <AD09> { [ o, O, bracketright ] }; + key <AD10> { [ p, P, braceright ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ ssharp, ssharp, backslash ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S ] }; + key <AC03> { [ d, D ] }; + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ h, H ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K ] }; + key <AC09> { [ l, L ] }; + key <AC10> { [ odiaeresis, Odiaeresis ] }; + key <AC11> { [ adiaeresis, Adiaeresis ] }; + + key <AB01> { [ z, Z ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ c, C ] }; + key <AB04> { [ v, V ] }; + key <AB05> { [ b, B ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M ] }; + key <AB08> { [ comma, semicolon, less ] }; + key <AB09> { [ period, colon, greater ] }; + key <AB10> { [ minus, underscore, dead_diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "se_nodeadkeys" { + name[Group1] = "Finnish/Swedish (no dead keys)"; + + include "nokia_vndr/su-8w(se)" + + key <AE01> { [ 1, exclam, asciicircum ] }; + key <AE12> { [ acute, grave, backslash ] }; + key <AD01> { [ q, Q, asciicircum ] }; + key <AB10> { [ minus, underscore, diaeresis ] }; +}; + +partial alphanumeric_keys default +xkb_symbols "fi" { + include "nokia_vndr/su-8w(se)" +}; + +xkb_symbols "fi_nodeadkeys" { + include "nokia_vndr/su-8w(se_nodeadkeys)" +}; + + + +// Russian layout on first two levels, US layout on third and fourth. +partial alphanumeric_keys default +xkb_symbols "ru" { + name[Group1]= "Russian"; + + include "nokia_vndr/su-8w(base)" + + // XXX Would be nice if this actually generated a tilde. + key <TLDE> { [ Cyrillic_io, Cyrillic_IO, grave ] }; + key <AE01> { [ 1, exclam, exclam, exclam ] }; + key <AE02> { [ 2, at, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, numbersign, numbersign ] }; + key <AE04> { [ 4, dollar, currency, dollar ] }; + key <AE05> { [ 5, percent, percent, percent ] }; + key <AE06> { [ 6, dead_circumflex, ampersand, asciicircum ] }; + key <AE07> { [ 7, ampersand, slash, ampersand ] }; + key <AE08> { [ 8, asterisk, parenleft, asterisk ] }; + key <AE09> { [ 9, parenleft, parenright, parenleft ] }; + key <AE10> { [ 0, parenright, equal, parenright ] }; + key <AE11> { [ minus, underscore, plus, question ] }; + key <AE12> { [ equal, plus, equal, plus ] }; + + key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; + key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; + key <AD03> { [ Cyrillic_u, Cyrillic_U, e, E ] }; + key <AD04> { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; + key <AD05> { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; + key <AD06> { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; + key <AD07> { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; + key <AD08> { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; + key <AD09> { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; + key <AD10> { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; + key <AD11> { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; + key <AD12> { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright, braceright ] }; + + key <AC01> { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; + key <AC02> { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; + key <AC03> { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; + key <AC04> { [ Cyrillic_a, Cyrillic_A, f, F ] }; + key <AC05> { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; + key <AC06> { [ Cyrillic_er, Cyrillic_ER, h, H ] }; + key <AC07> { [ Cyrillic_o, Cyrillic_O, j, J ] }; + key <AC08> { [ Cyrillic_el, Cyrillic_EL, k, K ] }; + key <AC09> { [ Cyrillic_de, Cyrillic_DE, l, L ] }; + key <AC10> { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; + key <AC11> { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; + + key <AB01> { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; + key <AB02> { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; + key <AB03> { [ Cyrillic_es, Cyrillic_ES, c, C ] }; + key <AB04> { [ Cyrillic_em, Cyrillic_EM, v, V ] }; + key <AB05> { [ Cyrillic_i, Cyrillic_I, b, B ] }; + key <AB06> { [ Cyrillic_te, Cyrillic_TE, n, N ] }; + key <AB07> { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, m, M ] }; + key <AB08> { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; + key <AB09> { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; + key <AB10> { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "ru_nodeadkeys" { + name[Group1] = "Russian - no dead keys"; + + include "nokia_vndr/su-8w(ru)" + + key <AE06> { [ 6, asciicircum, ampersand, asciicircum ] }; +}; + + + +partial alphanumeric_keys default +xkb_symbols "us" { + name[Group1]= "U.S. English - International"; + + include "nokia_vndr/su-8w(base)" + + // I can't believe it's not us(intl). + key <AE01> { [ 1, exclam, exclamdown ] }; + key <AE02> { [ 2, at, twosuperior ] }; + key <AE03> { [ 3, numbersign ] }; + key <AE04> { [ 4, dollar, currency ] }; + key <AE05> { [ 5, percent, EuroSign ] }; + key <AE06> { [ 6, asciicircum, onequarter ] }; + key <AE07> { [ 7, ampersand, onehalf ] }; + key <AE08> { [ 8, asterisk, threequarters ] }; + key <AE09> { [ 9, parenleft, leftsinglequotemark ] }; + key <AE10> { [ 0, parenright, rightsinglequotemark ] }; + key <AE11> { [ minus, underscore, yen ] }; + key <AE12> { [ equal, plus, multiply ] }; + + key <AD01> { [ q, Q, adiaeresis, Adiaeresis ] }; + key <AD02> { [ w, W, aring, Aring ] }; + key <AD03> { [ e, E, eacute, Eacute ] }; + key <AD04> { [ r, R, registered ] }; + key <AD05> { [ t, T, thorn, THORN ] }; + key <AD06> { [ y, Y, udiaeresis, Udiaeresis ] }; + key <AD07> { [ u, U, uacute, Uacute ] }; + key <AD08> { [ i, I, iacute, Iacute ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AD10> { [ p, P, odiaeresis, Odiaeresis ] }; + key <AD11> { [ bracketleft, braceleft, guillemotleft ] }; + key <AD12> { [ bracketright, braceright, guillemotright ] }; + + key <AC01> { [ a, A, aacute, Aacute ] }; + key <AC02> { [ s, S, ssharp, section ] }; + key <AC03> { [ d, D, eth, ETH ] }; + key <AC04> { [ f, F ] }; + key <AC05> { [ g, G ] }; + key <AC06> { [ h, H ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K ] }; + key <AC09> { [ l, L, oslash, Ooblique ] }; + key <AC10> { [ semicolon, colon, paragraph, degree ] }; + // XXX Not entirely sure if fourth level is quotedbl or diaeresis. + // The former makes a lot more sense. + key <AC11> { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; + + key <AB01> { [ z, Z, ae, AE ] }; + key <AB02> { [ x, X ] }; + key <AB03> { [ c, C, copyright ] }; + key <AB04> { [ v, V ] }; + key <AB05> { [ b, B ] }; + key <AB06> { [ n, N, ntilde, Ntilde ] }; + key <AB07> { [ m, M, mu ] }; + key <AB08> { [ comma, less, ccedilla, Ccedilla ] }; + key <AB09> { [ period, greater ] }; + key <AB10> { [ slash, question, questiondown ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "us_nodeadkeys" { + name[Group1] = "U.S. English - no dead keys"; + + include "nokia_vndr/su-8w(us_intl)" + + // XXX Not entirely sure if second level is quotedbl or diaeresis. + // The former makes a lot more sense. + key <AC10> { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] }; +}; + + + +partial default alphanumeric_keys +xkb_symbols "base" { + // forked from from pc(pc105); madness. + key <ESC> { [ Escape ] }; + + // the extra key on most European keyboards + key <LSGT> { [ less, greater, bar, brokenbar ] }; + + // these keys are common to all layouts + key <BKSL> { [ backslash, bar ] }; + key <SPCE> { [ space ] }; + + key <BKSP> { [ BackSpace ] }; + + key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <RTRN> { [ Return ] }; + // we don't ever generate this key, but the VKB needs it always. + key <KPEN> { [ KP_Enter ] }; + // generated from the headset, must always be in the map. + key <I29> { [ XF86Phone ] }; + + key <CAPS> { [ Caps_Lock ] }; + + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + + key <LFSH> { [ Shift_L ] }; + key <LCTL> { [ Control_L ] }; + key <LALT> { [ Alt_L, Meta_L ] }; + key <LWIN> { [ Super_L ] }; + + key <RTSH> { [ Shift_R ] }; + key <RCTL> { [ Control_R ] }; + key <RALT> { [ Alt_R, Meta_R ] }; + key <RWIN> { [ Super_R ] }; + + key <MENU> { [ Menu ] }; + + key <FK01> { [ F1 ] }; + key <FK02> { [ F2 ] }; + key <FK03> { [ F3 ] }; + key <FK04> { [ F4 ] }; + key <FK05> { [ F5 ] }; + key <FK06> { [ F6 ] }; + key <FK07> { [ F7 ] }; + key <FK08> { [ F8 ] }; + key <FK09> { [ F9 ] }; + key <FK10> { [ F11 ] }; + key <FK11> { [ F10 ] }; + key <FK12> { [ F12 ] }; + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; + + // Fake keys for virtual<->real modifiers mapping + key <LVL3> { [ ISO_Level3_Shift ] }; + key <MDSW> { [ Mode_switch ] }; + modifier_map Mod5 { <LVL3>, <MDSW> }; + + key <ALT> { [ NoSymbol, Alt_L ] }; + modifier_map Mod1 { <ALT>, <LALT> }; + + key <META> { [ NoSymbol, Meta_L ] }; + modifier_map Mod1 { <META> }; + + key <SUPR> { [ NoSymbol, Super_L ] }; + modifier_map Mod4 { <SUPR> }; + + key <HYPR> { [ NoSymbol, Hyper_L ] }; + modifier_map Mod4 { <HYPR> }; + + key <INS> { [ Insert ] }; + key <DELE> { [ Delete ] }; + key <END> { [ End ] }; + key <UP> { [ Up ] }; + key <LEFT> { [ Left ] }; + key <DOWN> { [ Down ] }; + key <RGHT> { [ Right ] }; + + // True for all layouts (except for ru). + key <TLDE> { [ grave, asterisk, asciitilde ] }; + + // SU-8W uses 140 for Home, not the normal keycode. Very useful. + key <HOME> { [ NoSymbol ] }; + // Ditto LWIN/RWIN and Page Up/Page Down. + key <PGUP> { [ none ] }; + key <PGDN> { [ NoSymbol ] }; + + // The LWIN & RWIN keys correspond to the 'select left' and + // 'select right' keys. + key <LWIN> { [ Prior ] }; + key <RWIN> { [ Next ] }; + + // <FRNT> = 140 ~ <I140> + key <FRNT> { [ Home ] }; + // <PROP> = 138 ~ <I138> + key <PROP> { [ Menu ] }; + key <I163> { [ XF86Mail ] }; + + // Power button. + key <I5E> { [ Execute ] }; +}; diff --git a/xorg-server/xkbdata.src/symbols/pc b/xorg-server/xkbdata.src/symbols/pc index 9f3da6640..a359b8023 100644 --- a/xorg-server/xkbdata.src/symbols/pc +++ b/xorg-server/xkbdata.src/symbols/pc @@ -32,13 +32,11 @@ xkb_symbols "pc105" { key <LCTL> { [ Control_L ] }; key <LWIN> { [ Super_L ] }; - modifier_map Mod4 { <LWIN> }; key <RTSH> { [ Shift_R ] }; key <RCTL> { [ Control_R ] }; key <RWIN> { [ Super_R ] }; - modifier_map Mod4 { <RWIN> }; key <MENU> { [ Menu ] }; @@ -47,6 +45,7 @@ xkb_symbols "pc105" { modifier_map Lock { Caps_Lock, ISO_Lock }; modifier_map Control{ Control_L, Control_R }; modifier_map Mod2 { Num_Lock }; + modifier_map Mod4 { Super_L, Super_R }; // Fake keys for virtual<->real modifiers mapping key <LVL3> { [ ISO_Level3_Shift ] }; diff --git a/xorg-server/xkbdata.src/symbols/pl b/xorg-server/xkbdata.src/symbols/pl index 6eb8b1c56..9ac908779 100644 --- a/xorg-server/xkbdata.src/symbols/pl +++ b/xorg-server/xkbdata.src/symbols/pl @@ -135,6 +135,81 @@ xkb_symbols "dvorak_altquotes" { key <AE01> { [ 1, exclam, doublelowquotemark, rightdoublequotemark ] }; }; +// Polish Programmer Dvorak keymap by Michal Nazarewicz <mina86@mina86.com> +// based on Programmer Dvorak by Roland Kaufmann <rlndkfmn at gmail dot com> +// and Polish Dvorak keymaps by Rafal Rzepecki <divide@users.sf.net +// and latin(basic) +// +// * Numbers are in shift position (like French). +// * Symbols have been placed in locations that give good +// hand-alternation and finger rolling with symbols that usually +// follows. +// * Polish diacritics on AltGr+"acelnosxz" (same as in basic pl(basic)). +// * Aditionaly, zacute on AltGr+"v" so that both zacute and zabovedot +// next to each other same as in pl(basic). +// * Polish open and close quotes on AltGr+& (same location as in +// pl(dvp_altquotes)). +// * English open quote on AltGr+k (same location as in latin(basic)) +// * English/Polish close quote on AltGr+b (similar location as in +// latin(basic) but moved right because AltGr+x is taken for zacute). +// * Polish open and close quote on AltGr+j. +// +// Those rules overwrite only the following rules from us(dvp): +// * ccedilla on AltGr+c +// * aring on Alt+a +// * oslash/Ooblique on Alt+o +// * ae on Alt+e +// * ntilde on Alt+n +// +partial alphanumeric_keys +xkb_symbols "dvp" { + include "us(dvp)" + + name[Group1] = "Poland - Programmer Dvorak"; + + // Unmodified Shift AltGr Shift+AltGr + // symbols row, left side + key <AE01> { [ ampersand, percent, doublelowquotemark, rightdoublequotemark ] }; + + // symbols row, right side + + // upper row, left side + + // // upper row, right side + key <AD08> { [ c, C, cacute, Cacute ] }; + key <AD10> { [ l, L, lstroke, Lstroke ] }; + + // home row, left side + key <AC01> { [ a, A, aogonek, Aogonek ], type[Group1] = "EIGHT_LEVEL_ALPHABETIC" }; + key <AC02> { [ o, O, oacute, Oacute ] }; + key <AC03> { [ e, E, eogonek, Eogonek ] }; + + // home row, right side + key <AC09> { [ n, N, nacute, Nacute ] }; + key <AC10> { [ s, S, sacute, Sacute ] }; + key <AC11> { [ minus, underscore, hyphen ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" }; + key <BKSL> { [ backslash, bar ] }; + + // lower row, left side + key <AB03> { [ j, J, doublelowquotemark, rightdoublequotemark ] }; + key <AB04> { [ k, K, leftdoublequotemark, leftsinglequotemark ] }; + key <AB05> { [ x, X, zacute, Zacute ] }; + + // lower row, right side + key <AB06> { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key <AB09> { [ v, V, zacute, Zacute ] }; + key <AB10> { [ z, Z, zabovedot, Zabovedot ] }; + + include "kpdl(comma)" + + // this to allow writing ALL CAPS with a Shift key + include "level3(ralt_switch)" + + // use one of compose:* options to choose Multi_key, if you will, + // or layout +level3(ralt_switch_multikey) to revert standard behaviour +}; + + partial alphanumeric_keys xkb_symbols "csb" { diff --git a/xorg-server/xkbdata.src/symbols/ru b/xorg-server/xkbdata.src/symbols/ru index 6bc48940f..dee1f718f 100644 --- a/xorg-server/xkbdata.src/symbols/ru +++ b/xorg-server/xkbdata.src/symbols/ru @@ -132,6 +132,27 @@ xkb_symbols "typewriter" { }; partial alphanumeric_keys +xkb_symbols "typewriter-legacy" { + include "ru(common)" + name[Group1]= "Russia - Typewriter, legacy"; + key <TLDE> { [ apostrophe, quotedbl ] }; + key <AE01> { [ exclam, 1 ] }; + key <AE02> { [ numerosign, 2 ] }; + key <AE03> { [ slash, 3 ] }; + key <AE04> { [ semicolon, 4 ] }; + key <AE05> { [ colon, 5 ] }; + key <AE06> { [ comma, 6 ] }; + key <AE07> { [ period, 7 ] }; + key <AE08> { [ underscore, 8 ] }; + key <AE09> { [ question, 9 ] }; + key <AE10> { [ percent, 0 ] }; + key <BKSL> { [ parenleft, parenright ] }; + + key <AD12> { [Cyrillic_hardsign,Cyrillic_HARDSIGN ] }; + key <AB10> { [ Cyrillic_io, Cyrillic_IO ] }; +}; + +partial alphanumeric_keys xkb_symbols "phonetic" { name[Group1]= "Russia - Phonetic"; diff --git a/xorg-server/xkbdata.src/symbols/se b/xorg-server/xkbdata.src/symbols/se index 9b32fd6b3..6e24202a7 100644 --- a/xorg-server/xkbdata.src/symbols/se +++ b/xorg-server/xkbdata.src/symbols/se @@ -28,7 +28,7 @@ xkb_symbols "se" { key <SPCE> { [ space, space, space, nobreakspace ] }; - key <LSGT> { [ less, greater, bar, bar ] }; + key <LSGT> { [ less, greater, bar, brokenbar ] }; include "kpdl(comma)" include "level3(ralt_switch)" diff --git a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in index 0af827346..7d0718b52 100644 --- a/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/sgi_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/sgi_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/sgi_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/sgi_vndr/Makefile + $(AUTOMAKE) --foreign symbols/sgi_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in index 52cd9085f..a86a8516a 100644 --- a/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/sony_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/sony_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/sony_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/sony_vndr/Makefile + $(AUTOMAKE) --foreign symbols/sony_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in index 8db5fff20..c5a5dc6b6 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -184,9 +185,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/sun_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/sun_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/sun_vndr/Makefile + $(AUTOMAKE) --foreign symbols/sun_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cs b/xorg-server/xkbdata.src/symbols/sun_vndr/cs index e487ba096..ed46dcf7c 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/cs +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cs @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type5" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkbdata.src/symbols/sun_vndr/cz index e487ba096..ed46dcf7c 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/cz +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cz @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type5" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de index a80de66b5..230e0ca29 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/de +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkbdata.src/symbols/sun_vndr/dk index 15f8603bc..87c099781 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/dk +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/dk @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkbdata.src/symbols/sun_vndr/es index e863d6a97..fc2b4420b 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/es +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/es @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // partial diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkbdata.src/symbols/sun_vndr/fi index 2c524180e..84756d4a1 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/fi +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fi @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "basic" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr index 3517eed27..7aa23a71b 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // NOTE: // These are the French keyboard symbols diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb index d2c21124d..3cb25fc1d 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { include "sun_vndr/us(type4basic)" diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkbdata.src/symbols/sun_vndr/gr index cce87510b..ba781752b 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/gr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gr @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type5" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/hu b/xorg-server/xkbdata.src/symbols/sun_vndr/hu index 62eb551d9..f14a72fab 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/hu +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/hu @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ default partial alphanumeric_keys diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it index 6f42aa109..9be87ced9 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/it +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkbdata.src/symbols/sun_vndr/jp index dd06b8bd1..b3a6859bf 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/jp +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/jp @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ // diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ko b/xorg-server/xkbdata.src/symbols/sun_vndr/ko index ba26c5159..acc568f6b 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/ko +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ko @@ -3,29 +3,23 @@ // Copyright 2005 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // // Korean layout for a Type 4 Sun keyboard diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt index e9840a10e..8a8d54a64 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ default partial alphanumeric_keys diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkbdata.src/symbols/sun_vndr/lv index 442242e53..cb5f97c6f 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/lv +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lv @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // default partial alphanumeric_keys diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl index 0feb57be7..f6564d132 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { include "sun_vndr/us(type4basic)" diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no index 471e5e13d..aad44cc20 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/no +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl index 7c5362020..deb58190d 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type5" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkbdata.src/symbols/sun_vndr/pt index 8fdf8549d..a88c68270 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/pt +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pt @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { //this is a Portugal4 keyboard diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru index 97bd42df4..101cad72d 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "basic" { diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se index 38e530afa..3daf12525 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/se +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4" { key <BKSL> { [ section, onehalf ] }; diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris index 11a738143..c99f04f3e 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris @@ -3,29 +3,23 @@ // Copyright 2005 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. // -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // //------------------------------------------------------------------------- // diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/sw b/xorg-server/xkbdata.src/symbols/sun_vndr/sw index 11a1b4774..ecf52fc9d 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/sw +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/sw @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "type4de" { include "sun_vndr/us(type4basic)" diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr index f70396e0e..7e6d4bf74 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // xkb_symbols "basic" { include "sun_vndr/tr(type6Q)" diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv index cda512ecc..d047f33b8 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ // diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkbdata.src/symbols/sun_vndr/tw index 212c9fb57..736c242eb 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tw +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tw @@ -3,29 +3,23 @@ // Copyright 2005 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // // Taiwanese layout for a Type 4 Sun keyboard diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us index 41670f018..f85cec950 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/us +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us @@ -3,29 +3,23 @@ // Copyright 2004 Sun Microsystems, Inc. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, and/or sell copies of the Software, and to permit persons -// to whom the Software is furnished to do so, provided that the above -// copyright notice(s) and this permission notice appear in all copies of -// the Software and that both the above copyright notice(s) and this -// permission notice appear in supporting documentation. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -// -// Except as contained in this notice, the name of a copyright holder -// shall not be used in advertising or otherwise to promote the sale, use -// or other dealings in this Software without prior written authorization -// of the copyright holder. +// copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the +// Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice (including the next +// paragraph) shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. // // $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ // Sun: @(#)us 1.5 03/04/21 SMI @@ -89,6 +83,8 @@ xkb_symbols "sunbasic" { key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; key <SPCE> { [ space ] }; + key <BKSP> { [ BackSpace ] }; + // By default, we use the same symbols as other XKB implementations // for greater compatibility & AccessX MouseKeys support, but it is // different than the traditional Sun key mappings that date back to the diff --git a/xorg-server/xkbdata.src/symbols/symbols.dir b/xorg-server/xkbdata.src/symbols/symbols.dir index 2479c1640..3318a0cf2 100644 --- a/xorg-server/xkbdata.src/symbols/symbols.dir +++ b/xorg-server/xkbdata.src/symbols/symbols.dir @@ -1,129 +1,248 @@ --dp----- a------- mn(basic) ---p----- a------- mn(olpc) ---p----- -m------ compose(ralt) ---p----- -m------ compose(lwin) ---p----- -m------ compose(rwin) ---p----- -m------ compose(menu) ---p----- -m------ compose(rctrl) ---p----- -m------ compose(caps) ---p----- -m------ compose(102) --d------ -------- de(basic) ---p----- a------- de(nodeadkeys) ---p----- a------- de(deadgraveacute) ---p----- a------- de(deadacute) ---p----- a------- de(ro) ---p----- a------- de(ro_nodeadkeys) ---p----- a------- de(dvorak) ---p----- a------- de(Sundeadkeys) ---p----- a------- de(sundeadkeys) ---p----- amk----- de(neo) ---p----- a------- de(mac) ---p----- a------- de(mac_nodeadkeys) ---p----- a------- de(dsb) ---p----- a------- de(dsb_qwertz) ---p----- a------- de(qwerty) --------- -------- extras/rs(combiningkeys) ---p----- a------- extras/us(intl-unicode) ---p----- a------- extras/us(alt-intl-unicode) ---p----- a------- extras/us(ats) ---p----- a------- extras/us(crd) ---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) --dp----- a------- il(basic) ---p----- a------- il(lyx) ---p----- a------- il(phonetic) ---p----- a------- il(biblical) --dp----- a------- ro(basic) ---p----- a------- ro(cedilla) ---p----- a------- ro(std) ---p----- a------- ro(std_cedilla) ---p----- a------- ro(winkeys) ---p----- -------- ro(crh_f) ---p----- -------- ro(crh_alt) ---p----- -------- ro(crh_dobruca1) ---p----- -------- ro(crh_dobruca2) ---p----- -------- eurosign(e) ---p----- -------- eurosign(2) ---p----- -------- eurosign(4) ---p----- -------- eurosign(5) --dp----- a------- me(basic) ---p----- a------- me(cyrillic) ---p----- a------- me(cyrillicyz) ---p----- a------- me(latinunicode) ---p----- a------- me(latinyz) ---p----- a------- me(latinunicodeyz) --------- -------- me(cyrillicalternatequotes) --------- -------- me(latinalternatequotes) --dp----- a------- mm(basic) --dp----- a------- ma(arabic) ---p----- a------- ma(french) ---p----- a------- ma(tifinagh) ---p----- a------- ma(tifinagh-phonetic) ---p----- a------- ma(tifinagh-extended) ---p----- a------- ma(tifinagh-extended-phonetic) ---p----- a------- ma(tifinagh-alt) ---p----- a------- ma(tifinagh-alt-phonetic) --dp----- a------- fi(kotoistus) ---p----- a------- fi(classic) -h-p----- a------- fi(fi) ---p----- a------- fi(nodeadkeys) --------- -------- fi(smi) ---p----- a------- fi(mac) --dp----- a------- bt(basic) --dp----- a------- ie(basic) ---p----- a------- ie(CloGaelach) ---p----- a------- ie(UnicodeExpert) ---p----- a------- ie(ogam) ---p----- a------- ie(ogam_is434) --dp----- a------- be(basic) ---p----- a------- be(oss) ---p----- a------- be(oss_frbe) ---p----- a------- be(oss_latin9) ---p----- a------- be(oss_Sundeadkeys) ---p----- a------- be(oss_sundeadkeys) ---p----- a------- be(iso-alternate) ---p----- a------- be(sundeadkeys) ---p----- a------- be(Sundeadkeys) ---p----- a------- be(nodeadkeys) ---p----- a------- be(wang) ---p----- --kf---- srvr_ctrl(xfree86) ---p----- --k----- srvr_ctrl(stdkeypad) ---p----- ---f---- srvr_ctrl(fkey2vt) ---p----- --kf---- srvr_ctrl(no_srvr_keys) --dp----- a------- ba(basic) ---p----- a------- ba(us) ---p----- a------- ba(alternatequotes) ---p----- a------- ba(unicode) ---p----- a------- ba(unicodeus) +-dp----- a------- am(basic) +--p----- a------- am(olpc) +-------- -------- am(phonetic) +--p----- a------- am(phonetic-alt) +--p----- a------- am(eastern) +--p----- a------- am(western) +--p----- a------- am(eastern-alt) +-dp----- -m------ terminate(ctrl_alt_bksp) +-dp----- a------- fr(basic) +--p----- a------- fr(Sundeadkeys) +--p----- a------- fr(sundeadkeys) +--p----- a------- fr(nodeadkeys) +--p----- a------- fr(oss) +--p----- a------- fr(oss_latin9) +--p----- a------- fr(oss_Sundeadkeys) +--p----- a------- fr(oss_sundeadkeys) +--p----- a------- fr(oss_nodeadkeys) +--p----- a------- fr(latin9) +--p----- a------- fr(latin9_Sundeadkeys) +--p----- a------- fr(latin9_sundeadkeys) +--p----- a------- fr(latin9_nodeadkeys) +--p----- a------- fr(bepo) +--p----- a------- fr(bepo_latin9) +--p----- am------ fr(dvorak) +--p----- a------- fr(bre) +--p----- a------- fr(oci) +--p----- a------- fr(mac) +--p----- a------- fr(geo) -dp----- a------- ng(basic) --p----- a------- ng(yoruba) --p----- a------- ng(igbo) --p----- a------- ng(hausa) --p----- a------- ng(olpc) +-dp----- a------- np(basic) +--p----- a------- np(olpc) +-dp----- a------- nl(basic) +--p----- a------- nl(std) +--p----- a------- nl(Sundeadkeys) +--p----- a------- nl(sundeadkeys) +--p----- a------- nl(mac) +-dp----- a------- ad(basic) +-dp----- a------- ua(unicode) +--p----- a------- ua(legacy) +--p----- a------- ua(winkeys) +--p----- a------- ua(typewriter) +--p----- a------- ua(phonetic) +--p----- a------- ua(rstu) +--p----- a------- ua(rstu_ru) +--p----- a------- ua(homophonic) +--p----- -------- ua(crh) +--p----- -------- ua(crh_f) +--p----- -------- ua(crh_alt) +-dp----- a------- rs(basic) +--p----- a------- rs(latin) +--p----- a------- rs(yz) +h-p----- a------- rs(common) +h-p----- a------- rs(cyralpha) +h-p----- a------- rs(latalpha) +h-p----- a------- rs(twoletter) +h-p----- a------- rs(latlevel3) +h-p----- a------- rs(cyrlevel3) +--p----- a------- rs(latinunicode) +--p----- a------- rs(latinyz) +--p----- a------- rs(latinunicodeyz) +-------- -------- rs(alternatequotes) +-------- -------- rs(latinalternatequotes) +-dp----- a------- nokia_vndr/rx-51(common) +--p----- a------- nokia_vndr/rx-51(us) +--p----- a------- nokia_vndr/rx-51(pl) +--p----- a------- nokia_vndr/rx-51(fise) +--p----- a------- nokia_vndr/rx-51(dano) +--p----- a------- nokia_vndr/rx-51(nordic) +--p----- a------- nokia_vndr/rx-51(ptes) +--p----- a------- nokia_vndr/rx-51(fr) +--p----- a------- nokia_vndr/rx-51(de) +--p----- a------- nokia_vndr/rx-51(ch) +--p----- a------- nokia_vndr/rx-51(ru) +--p----- a------- nokia_vndr/rx-51(it) +--p----- a------- nokia_vndr/rx-51(cz) +--p----- a------- nokia_vndr/rx-51(cz_qwerty) +h-p----- a------- nokia_vndr/rx-51(nordic_base) +h-p----- a------- nokia_vndr/rx-51(english_base) +h-p----- a------- nokia_vndr/rx-51(common_keys) +h-p----- am------ nokia_vndr/rx-51(modifiers) +h-p----- a------- nokia_vndr/rx-51(arrows_2btns) +h-p----- a------- nokia_vndr/rx-51(arrows_4btns) +-dp----- a------- nokia_vndr/su-8w(no) +--p----- a------- nokia_vndr/su-8w(no_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(dk) +--p----- a------- nokia_vndr/su-8w(dk_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(de) +--p----- a------- nokia_vndr/su-8w(de_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(se) +--p----- a------- nokia_vndr/su-8w(se_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(fi) +-------- -------- nokia_vndr/su-8w(fi_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(ru) +--p----- a------- nokia_vndr/su-8w(ru_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(us) +--p----- a------- nokia_vndr/su-8w(us_nodeadkeys) +--p----- a------- nokia_vndr/su-8w(base) +--p----- a------- nokia_vndr/rx-44(us) +--p----- a------- nokia_vndr/rx-44(fisenoda) +--p----- a------- nokia_vndr/rx-44(ptes) +--p----- a------- nokia_vndr/rx-44(fr) +--p----- a------- nokia_vndr/rx-44(de) +--p----- a------- nokia_vndr/rx-44(ru) +--p----- a------- nokia_vndr/rx-44(it) +-dp----- a------- nokia_vndr/rx-44(base) +-dp----- a------- cd(basic) +-dp----- a------- epo(basic) +--p----- a------- epo(legacy) +--p----- -------- epo(qwerty) +--p----- -------- epo(dvorak) +-dp----- a------- tj(basic) +-------- -------- tj(legacy) -dp----- a------- af(basic) --p----- a------- af(ps) --p----- a------- af(uz) --p----- a------- af(olpc-ps) --p----- a------- af(olpc-fa) --p----- a------- af(olpc-uz) --dp----- a------- dk(basic) ---p----- a------- dk(nodeadkeys) ---p----- a------- dk(mac) ---p----- a------- dk(mac_nodeadkeys) ---p----- a------- dk(dvorak) +-dp----- a------- ch(basic) +--p----- a------- ch(legacy) +--p----- a------- ch(de) +--p----- a------- ch(de_Sundeadkeys) +--p----- a------- ch(de_sundeadkeys) +--p----- a------- ch(de_nodeadkeys) +--p----- a------- ch(fr) +--p----- a------- ch(fr_Sundeadkeys) +--p----- a------- ch(fr_sundeadkeys) +--p----- a------- ch(fr_nodeadkeys) +--p----- a------- ch(de_mac) +--p----- a------- ch(fr_mac) +-dp----- am------ pc(pc105) +h-p----- a------- pc(function) +h-p----- a------- pc(editing) +-dp----- a------- pl(basic) +--p----- a------- pl(qwertz) +--p----- a------- pl(dvorak) +--p----- a------- pl(dvorak_quotes) +--p----- a------- pl(dvorak_altquotes) +--p----- a------- pl(dvp) +--p----- a------- pl(csb) +--p----- a------- pl(ru_phonetic_dvorak) +-dp----- a------- th(basic) +--p----- a------- th(pat) +--p----- a------- th(tis) +--p----- a------- th(olpc) +-dp----- a------- no(basic) +--p----- a------- no(nodeadkeys) +--p----- a------- no(dvorak) +--p----- a------- no(smi) +--p----- a------- no(smi_nodeadkeys) +--p----- a------- no(mac) +--p----- a------- no(mac_nodeadkeys) +-dp----- a------- iq(basic) +--p----- a------- iq(ku) +--p----- a------- iq(ku_f) +--p----- a------- iq(ku_alt) +--p----- a------- iq(ku_ara) +-dp----- am------ lt(basic) +--p----- am------ lt(us) +--p----- am------ lt(std) +--p----- am------ lt(ibm) +--p----- am------ lt(lekp) +--p----- am------ lt(lekpa) +--p----- --k----- kpdl(dot) +--p----- --k----- kpdl(comma) +--p----- --k----- kpdl(dotoss) +--p----- --k----- kpdl(dotoss_latin9) +--p----- --k----- kpdl(commaoss) +--p----- --k----- kpdl(momayyezoss) +--p----- --k----- kpdl(kposs) +--p----- --k----- kpdl(semi) +-dp----- a------- il(basic) +--p----- a------- il(lyx) +--p----- a------- il(phonetic) +--p----- a------- il(biblical) +-dp----- a------- sn(basic) +-dp----- a------- in(deva) +--p----- a------- in(bolnagri) +--p----- a------- in(ben) +-------- -------- in(ben_probhat) +--p----- a------- in(guj) +--p----- a------- in(kan) +--p----- a------- in(mal) +--p----- a------- in(mal_lalitha) +--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) +--p----- a------- in(urd-phonetic) +--p----- a------- in(urd-phonetic3) +--p----- a------- in(urd-winkeys) +--p----- a------- in(guru) +--p----- a------- in(jhelum) +--p----- a------- in(olpc) +--p----- a------- in(hin-wx) -dp----- a------- fo(basic) --p----- a------- fo(nodeadkeys) --dp----- a---g--- gr(basic) ---p----- a---g--- gr(simple) -h-p----- a---g--- gr(bare) ---p----- a---g--- gr(extended) ---p----- a---g--- gr(polytonic) ---p----- a---g--- gr(nodeadkeys) --------- -------- sony_vndr/us(nwp5461) +-dp----- a------- hr(basic) +--p----- a------- hr(us) +--p----- a------- hr(alternatequotes) +--p----- a------- hr(unicode) +--p----- a------- hr(unicodeus) +-dp----- a------- by(basic) +--p----- a------- by(legacy) +--p----- a------- by(latin) +-dp----- -------- tr(basic) +--p----- -------- tr(f) +--p----- -------- tr(alt) +--p----- a------- tr(Sundeadkeys) +--p----- a------- tr(sundeadkeys) +--p----- -------- tr(ku) +--p----- -------- tr(ku_f) +--p----- -------- tr(ku_alt) +--p----- -------- tr(intl) +--p----- a------- tr(olpc) +--p----- -------- tr(crh) +--p----- -------- tr(crh_f) +--p----- -------- tr(crh_alt) +-dp----- a------- gn(basic) +-dp----- a------- es(basic) +--p----- a------- es(Sundeadkeys) +--p----- a------- es(sundeadkeys) +--p----- a------- es(nodeadkeys) +--p----- a------- es(dvorak) +--p----- a------- es(cat) +--p----- a------- es(ast) +--p----- a------- es(mac) +--p----- a------- es(olpc) +--p----- a------- es(deadtilde) +-dp----- a------- cz(basic) +-------- -------- cz(bksl) +--p----- a------- cz(qwerty) +-------- -------- cz(qwerty_bksl) +--p----- a---g--- cz(ucw) +-dp----- a------- bd(basic) +-------- -------- bd(probhat) +-dp----- a------- kh(basic) +--p----- a------- kh(olpc) -dp----- -------- hu(basic) --p----- -------- hu(standard) --p----- -------- hu(nodeadkeys) @@ -152,23 +271,50 @@ h-p----- --k----- hu(def_dot) h-p----- a------- hu(def_dead) h-p----- a------- hu(def_nodead) h-p----- a------- hu(def_common) --------- -------- sun_vndr/de(type4) --------- -------- sun_vndr/fi(basic) --------- -------- sun_vndr/ko(type4) --------- -------- sun_vndr/ko(type5) ---p----- -------- sun_vndr/ko(type6) --------- -------- sun_vndr/tw(type4) --------- -------- sun_vndr/tw(type5) ---p----- -------- sun_vndr/tw(type6) --------- -------- sun_vndr/dk(type4) --------- -------- sun_vndr/dk(type5) --------- -------- sun_vndr/gr(type5) --dp----- a------- sun_vndr/hu(type5) --------- -------- sun_vndr/cz(type5) --dp----- -------- sun_vndr/solaris(defaults) ---p----- -------- sun_vndr/solaris(keynames) ---p----- -------- sun_vndr/solaris(xf86keynames) +-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) +--p----- a------- ir(ku_ara) +-dp----- a------- mt(basic) +--p----- a------- mt(us) +-------- -------- sgi_vndr/jp(jp106) +-------- -------- sgi_vndr/jp(alternate106) +-dp----- a------- pk(urd-phonetic) +--p----- a------- pk(urd-crulp) +--p----- a------- pk(urd-nla) +--p----- a------- pk(ara) +--p----- a------- pk(olpc) +-------- -------- sun_vndr/fr(type4) +-------- -------- sun_vndr/fr(type5) +-------- -------- sun_vndr/fr(type6) +-------- -------- sun_vndr/nl(type4) +-------- -------- sun_vndr/tuv(type4basic) +-------- -------- sun_vndr/tuv(type4) +-------- -------- sun_vndr/tuv(type5basic) +-------- -------- sun_vndr/tuv(type5) +-------- -------- sun_vndr/pl(type5) +-------- -------- sun_vndr/no(type4) +-------- -------- sun_vndr/no(type5) +-------- -------- sun_vndr/usb(sun_usb) -dp----- a------- sun_vndr/lt(type5) +-------- -------- sun_vndr/tr(basic) +-------- -------- sun_vndr/tr(type6Q) +-------- -------- sun_vndr/tr(type6F) +--p----- -------- sun_vndr/es(type4) +--p----- -------- sun_vndr/es(type5) +--p----- -------- sun_vndr/es(type6) +-------- -------- sun_vndr/cz(type5) +-dp----- a------- sun_vndr/hu(type5) +-------- -------- sun_vndr/sw(type4de) +-------- -------- sun_vndr/sw(type4fr) +-------- -------- sun_vndr/sw(type5fr) +-------- -------- sun_vndr/sw(type5de) +-------- -------- sun_vndr/gr(type5) -------- -------- sun_vndr/jp(basic) -------- -------- sun_vndr/jp(type4) -------- -------- sun_vndr/jp(type5) @@ -178,30 +324,18 @@ h-p----- a------- hu(def_common) -------- -------- sun_vndr/jp(J3100) -------- -------- sun_vndr/jp(Muhenkan_x86) --p----- -------- sun_vndr/jp(type7) --------- -------- sun_vndr/no(type4) --------- -------- sun_vndr/no(type5) --dp----- a------- sun_vndr/lv(type5) --------- -------- sun_vndr/pl(type5) -------- -------- sun_vndr/gb(type4) --p----- -------- sun_vndr/gb(type5) --p----- -------- sun_vndr/gb(type6) --------- -------- sun_vndr/tr(basic) --------- -------- sun_vndr/tr(type6Q) --------- -------- sun_vndr/tr(type6F) --------- -------- sun_vndr/pt(type4) --------- -------- sun_vndr/pt(type5) ---p----- -------- sun_vndr/pt(type6) --------- -------- sun_vndr/sw(type4de) --------- -------- sun_vndr/sw(type4fr) --------- -------- sun_vndr/sw(type5fr) --------- -------- sun_vndr/sw(type5de) --------- -------- sun_vndr/fr(type4) --------- -------- sun_vndr/fr(type5) --------- -------- sun_vndr/fr(type6) --------- -------- sun_vndr/nl(type4) -------- -------- sun_vndr/se(type4) -------- -------- sun_vndr/se(type5) --p----- -------- sun_vndr/se(type6) +-------- -------- sun_vndr/dk(type4) +-------- -------- sun_vndr/dk(type5) +-------- -------- sun_vndr/pt(type4) +-------- -------- sun_vndr/pt(type5) +--p----- -------- sun_vndr/pt(type6) +-------- -------- sun_vndr/cs(type5) h------- -------- sun_vndr/us(sunbasic) h------- -------- sun_vndr/us(left_funkeys) h------- -------- sun_vndr/us(volumekeys) @@ -217,31 +351,53 @@ h------- -------- sun_vndr/us(volumekeys) -------- -------- sun_vndr/us(pc104) -------- -------- sun_vndr/us(pc101currency) -------- -------- sun_vndr/us(US101A_Sun) ---p----- -------- sun_vndr/es(type4) ---p----- -------- sun_vndr/es(type5) ---p----- -------- sun_vndr/es(type6) +-------- -------- sun_vndr/de(type4) +-dp----- -------- sun_vndr/solaris(defaults) +--p----- -------- sun_vndr/solaris(keynames) +--p----- -------- sun_vndr/solaris(xf86keynames) -------- -------- sun_vndr/it(type4) -------- -------- sun_vndr/it(type5) --p----- -------- sun_vndr/it(type6) --------- -------- sun_vndr/tuv(type4basic) --------- -------- sun_vndr/tuv(type4) --------- -------- sun_vndr/tuv(type5basic) --------- -------- sun_vndr/tuv(type5) --------- -------- sun_vndr/cs(type5) --------- -------- sun_vndr/usb(sun_usb) +-------- -------- sun_vndr/tw(type4) +-------- -------- sun_vndr/tw(type5) +--p----- -------- sun_vndr/tw(type6) -------- -------- sun_vndr/ru(basic) --p----- -------- sun_vndr/ru(type6) --dp----- a------- az(latin) ---p----- a------- az(cyrillic) --dp----- a------- ge(basic) ---p----- a------- ge(qwerty) ---p----- a------- ge(ergonomic) ---p----- a------- ge(mess) ---p----- a------- ge(ru) ---p----- a------- ge(os) --------- -------- hp_vndr/us(hil) --dp----- a------- et(basic) ---p----- a------- et(olpc) +-dp----- a------- sun_vndr/lv(type5) +-------- -------- sun_vndr/ko(type4) +-------- -------- sun_vndr/ko(type5) +--p----- -------- sun_vndr/ko(type6) +-------- -------- sun_vndr/fi(basic) +-dp----- a------- ro(basic) +--p----- a------- ro(cedilla) +--p----- a------- ro(std) +--p----- a------- ro(std_cedilla) +--p----- a------- ro(winkeys) +--p----- -------- ro(crh_f) +--p----- -------- ro(crh_alt) +--p----- -------- ro(crh_dobruca1) +--p----- -------- ro(crh_dobruca2) +-dp----- a------- mm(basic) +-dp----- a------- ee(basic) +--p----- a------- ee(nodeadkeys) +--p----- a------- ee(dvorak) +--p----- a------- ee(us) +hdp----- -m------ capslock(capslock) +h-p----- -m------ capslock(shiftlock) +h-p----- -m------ capslock(grouplock) +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) +--p----- a------- is(mac) +--p----- a------- is(dvorak) -d------ -------- br(abnt2) --p----- a------- br(nodeadkeys) --p----- a------- br(thinkpad) @@ -250,85 +406,69 @@ h------- -------- sun_vndr/us(volumekeys) --p----- a------- br(nativo) --p----- a------- br(nativo-us) --p----- a------- br(nativo-epo) --dp----- -------- typo(base) --dp----- a------- kz(basic) ---p----- a------- kz(ruskaz) ---p----- a------- kz(kazrus) ---p----- a------- kz(olpc) ---p----- --k----- kpdl(dot) ---p----- --k----- kpdl(comma) ---p----- --k----- kpdl(dotoss) ---p----- --k----- kpdl(dotoss_latin9) ---p----- --k----- kpdl(commaoss) ---p----- --k----- kpdl(momayyezoss) ---p----- --k----- kpdl(kposs) ---p----- --k----- kpdl(semi) --dp----- a------- kh(basic) ---p----- a------- kh(olpc) --dp----- a------- cn(basic) ---p----- a------- cn(tib) ---p----- a------- cn(tib_asciinum) ---p----- -m------ altwin(meta_alt) ---p----- -m------ altwin(ctrl_win) ---p----- -m------ altwin(ctrl_alt_win) ---p----- -m------ altwin(meta_win) ---p----- -m------ altwin(left_meta_win) ---p----- -m------ altwin(hyper_win) ---p----- -m------ altwin(menu) ---p----- -m------ altwin(alt_super_win) ---p----- -m------ altwin(swap_lalt_lwin) ---p----- -m------ ctrl(nocaps) ---p----- -m------ ctrl(swapcaps) ---p----- -m------ ctrl(ctrl_ac) ---p----- -m------ ctrl(ctrl_aa) ---p----- -m------ ctrl(ctrl_ra) --dp----- a------- lk(sin_phonetic) ---p----- a------- lk(tam_unicode) ---p----- a------- lk(tam_TAB) --dp----- a------- cz(basic) --------- -------- cz(bksl) ---p----- a------- cz(qwerty) --------- -------- cz(qwerty_bksl) ---p----- a---g--- cz(ucw) --dp----- a------- bg(bds) ---p----- a------- bg(phonetic) ---p----- a------- bg(bas_phonetic) -h-p----- a------- bg(latin) --dp----- a------- sk(basic) --------- -------- sk(bksl) ---p----- a------- sk(qwerty) --------- -------- sk(qwerty_bksl) --dp----- am------ lt(basic) ---p----- am------ lt(us) ---p----- am------ lt(std) ---p----- am------ lt(ibm) ---p----- am------ lt(lekp) ---p----- am------ lt(lekpa) ---p----- am------ lt(balticplus) --------- -------- fujitsu_vndr/jp --------- -------- fujitsu_vndr/us --dp----- a------- sn(basic) --dp----- -m------ terminate(ctrl_alt_bksp) --dp----- a------- gn(basic) --dp----- a------- rs(basic) ---p----- a------- rs(latin) ---p----- a------- rs(yz) -h-p----- a------- rs(common) -h-p----- a------- rs(cyralpha) -h-p----- a------- rs(latalpha) -h-p----- a------- rs(twoletter) -h-p----- a------- rs(latlevel3) -h-p----- a------- rs(cyrlevel3) ---p----- a------- rs(latinunicode) ---p----- a------- rs(latinyz) ---p----- a------- rs(latinunicodeyz) --------- -------- rs(alternatequotes) --------- -------- rs(latinalternatequotes) +-dp----- -------- latin(basic) +--p----- -------- latin(type2) +--p----- -------- latin(type3) +--p----- -------- latin(type4) +--p----- -------- latin(nodeadkeys) +--p----- -------- latin(type2_nodeadkeys) +--p----- -------- latin(type3_nodeadkeys) +--p----- -------- latin(type4_nodeadkeys) +-dp----- a------- mao(basic) +-dp----- a---g--- gr(basic) +--p----- a---g--- gr(simple) +h-p----- a---g--- gr(bare) +--p----- a---g--- gr(extended) +--p----- a---g--- gr(polytonic) +--p----- a---g--- gr(nodeadkeys) -dp----- a------- jp(106) h-p----- a------- jp(common) --p----- a------- jp(OADG109A) --p----- a------- jp(kana) --p----- a------- jp(nicola_f_bs) +-d------ a------- kr(kr106) +-------- a------- kr(kr104) +h-p----- ---f---- kr(koreankeys) +h-p----- ---f---- kr(koreankeys_raltctl) +-dp----- a------- ara(basic) +--p----- a------- ara(qwerty) +--p----- a------- ara(azerty) +--p----- a------- ara(digits) +--p----- a------- ara(qwerty_digits) +--p----- a------- ara(azerty_digits) +--p----- a------- ara(buckwalter) +--p----- a------- ara(olpc) +-d------ -------- xfree68_vndr/ataritt(us) +-------- -------- xfree68_vndr/ataritt(de) +-d------ -------- xfree68_vndr/amiga(usa1) +-dp----- a------- gb(basic) +--p----- a------- gb(intl) +--p----- a------- gb(extd) +--p----- a------- gb(colemak) +--p----- a------- gb(dvorak) +--p----- a------- gb(dvorakukp) +--p----- a------- gb(mac) +--p----- -------- eurosign(e) +--p----- -------- eurosign(2) +--p----- -------- eurosign(4) +--p----- -------- eurosign(5) +-dp----- -------- typo(base) +-dp----- -m------ level3(ralt_switch) +--p----- -m------ level3(ralt_alt) +--p----- -m------ level3(ralt_switch_multikey) +h-p----- -m------ level3(ralt_switch_for_alts_toggle) +--p----- -m------ level3(alt_switch) +--p----- -m------ level3(lalt_switch) +--p----- -m------ level3(switch) +--p----- -m------ level3(menu_switch) +--p----- -m------ level3(win_switch) +--p----- -m------ level3(lwin_switch) +--p----- -m------ level3(rwin_switch) +--p----- -m------ level3(enter_switch) +--p----- --kf---- srvr_ctrl(xfree86) +--p----- --k----- srvr_ctrl(stdkeypad) +--p----- ---f---- srvr_ctrl(fkey2vt) +--p----- --kf---- srvr_ctrl(no_srvr_keys) h-p----- --k----- keypad(overlay) h-p----- --k----- keypad(overlay1) h-p----- --k----- keypad(overlay2) @@ -352,168 +492,72 @@ hdp----- --k----- keypad(x11) --p----- --k----- keypad(ops) --p----- --k----- keypad(hex) --p----- --k----- keypad(atm) --dp----- a------- hr(basic) ---p----- a------- hr(us) ---p----- a------- hr(alternatequotes) ---p----- a------- hr(unicode) ---p----- a------- hr(unicodeus) --dp----- a------- brai(home_row) ---p----- a------- brai(left_hand) ---p----- a------- brai(right_hand) -h-p----- --k----- brai(keypad) --dp----- a------- latam(basic) ---p----- a------- latam(Sundeadkeys) ---p----- a------- latam(sundeadkeys) ---p----- a------- latam(nodeadkeys) ---p----- a------- latam(deadtilde) --dp----- a------- sy(basic) ---p----- a------- sy(syc) ---p----- a------- sy(syc_phonetic) ---p----- a------- sy(ku) ---p----- a------- sy(ku_f) ---p----- a------- sy(ku_alt) --dp----- a------- am(basic) ---p----- a------- am(olpc) --------- -------- am(phonetic) ---p----- a------- am(phonetic-alt) ---p----- a------- am(eastern) ---p----- a------- am(western) ---p----- a------- am(eastern-alt) ---p----- -m------ level5(rctrl_switch) --d------ a------- kr(kr106) --------- a------- kr(kr104) -h-p----- ---f---- kr(koreankeys) -h-p----- ---f---- kr(koreankeys_raltctl) --d------ -------- xfree68_vndr/amiga(usa1) --d------ -------- xfree68_vndr/ataritt(us) --------- -------- xfree68_vndr/ataritt(de) --dp----- a------- no(basic) ---p----- a------- no(nodeadkeys) ---p----- a------- no(dvorak) ---p----- a------- no(smi) ---p----- a------- no(smi_nodeadkeys) ---p----- a------- no(mac) ---p----- a------- no(mac_nodeadkeys) --dp----- a------- mv(basic) --dp----- -------- latin(basic) ---p----- -------- latin(type2) ---p----- -------- latin(type3) ---p----- -------- latin(type4) ---p----- -------- latin(nodeadkeys) ---p----- -------- latin(type2_nodeadkeys) ---p----- -------- latin(type3_nodeadkeys) ---p----- -------- latin(type4_nodeadkeys) --dp----- a------- ua(unicode) ---p----- a------- ua(legacy) ---p----- a------- ua(winkeys) ---p----- a------- ua(typewriter) ---p----- a------- ua(phonetic) ---p----- a------- ua(rstu) ---p----- a------- ua(rstu_ru) ---p----- a------- ua(homophonic) ---p----- -------- ua(crh) ---p----- -------- ua(crh_f) ---p----- -------- ua(crh_alt) --dp----- a------- al(basic) --dp----- a------- iq(basic) ---p----- a------- iq(ku) ---p----- a------- iq(ku_f) ---p----- a------- iq(ku_alt) ---p----- a------- iq(ku_ara) --dp----- am------ pc(pc105) -h-p----- a------- pc(function) -h-p----- a------- pc(editing) --dp----- am------ lv(basic) ---p----- am------ lv(apostrophe) ---p----- am------ lv(tilde) ---p----- am------ lv(fkey) --dp----- a------- si(basic) ---p----- a------- si(us) ---p----- a------- si(alternatequotes) --dp----- a------- by(basic) ---p----- a------- by(legacy) ---p----- a------- by(latin) --dp----- -m------ level3(ralt_switch) ---p----- -m------ level3(ralt_alt) ---p----- -m------ level3(ralt_switch_multikey) -h-p----- -m------ level3(ralt_switch_for_alts_toggle) ---p----- -m------ level3(alt_switch) ---p----- -m------ level3(lalt_switch) ---p----- -m------ level3(switch) ---p----- -m------ level3(menu_switch) ---p----- -m------ level3(win_switch) ---p----- -m------ level3(lwin_switch) ---p----- -m------ level3(rwin_switch) ---p----- -m------ level3(enter_switch) +-dp----- a------- se(basic) +--p----- a------- se(se) +--p----- a------- se(nodeadkeys) +--p----- a------- se(dvorak) +--p----- a------- se(rus) +--p----- a------- se(rus_nodeadkeys) +-------- -------- se(smi) +--p----- a------- se(mac) +--p----- a------- se(svdvorak) +-dp----- a------- dk(basic) +--p----- a------- dk(nodeadkeys) +--p----- a------- dk(mac) +--p----- a------- dk(mac_nodeadkeys) +--p----- a------- dk(dvorak) +-dp----- a------- cn(basic) +--p----- a------- cn(tib) +--p----- a------- cn(tib_asciinum) +-dp----- a------- uz(cyrillic) +--p----- a------- uz(latin) +--p----- -------- uz(crh) +--p----- -------- uz(crh_f) +--p----- -------- uz(crh_alt) +-dp----- a------- sk(basic) +-------- -------- sk(bksl) +--p----- a------- sk(qwerty) +-------- -------- sk(qwerty_bksl) +-dp----- a------- me(basic) +--p----- a------- me(cyrillic) +--p----- a------- me(cyrillicyz) +--p----- a------- me(latinunicode) +--p----- a------- me(latinyz) +--p----- a------- me(latinunicodeyz) +-------- -------- me(cyrillicalternatequotes) +-------- -------- me(latinalternatequotes) +-dp----- a------- mk(basic) +--p----- a------- mk(nodeadkeys) +-dp----- a------- mn(basic) +--p----- a------- mn(olpc) +--p----- -m------ altwin(meta_alt) +--p----- -m------ altwin(ctrl_win) +--p----- -m------ altwin(ctrl_alt_win) +--p----- -m------ altwin(meta_win) +--p----- -m------ altwin(left_meta_win) +--p----- -m------ altwin(hyper_win) +--p----- -m------ altwin(menu) +--p----- -m------ altwin(alt_super_win) +--p----- -m------ altwin(swap_lalt_lwin) -------- am------ olpc(olpc) --dp----- a------- pl(basic) ---p----- a------- pl(qwertz) ---p----- a------- pl(dvorak) ---p----- a------- pl(dvorak_quotes) ---p----- a------- pl(dvorak_altquotes) ---p----- a------- pl(csb) ---p----- a------- pl(ru_phonetic_dvorak) --dp----- a------- gb(basic) ---p----- a------- gb(intl) ---p----- a------- gb(extd) ---p----- a------- gb(colemak) ---p----- a------- gb(dvorak) ---p----- a------- gb(dvorakukp) ---p----- a------- gb(mac) --dp----- a------- in(deva) ---p----- a------- in(bolnagri) ---p----- a------- in(ben) --------- -------- in(ben_probhat) ---p----- a------- in(guj) ---p----- a------- in(kan) ---p----- a------- in(mal) ---p----- a------- in(mal_lalitha) ---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) ---p----- a------- in(urd-phonetic) ---p----- a------- in(urd-phonetic3) ---p----- a------- in(urd-winkeys) ---p----- a------- in(guru) ---p----- a------- in(jhelum) ---p----- a------- in(olpc) ---p----- a------- in(hin-wx) ---p----- -m------ shift(breaks_caps) --dp----- a------- ch(basic) ---p----- a------- ch(de) ---p----- a------- ch(de_Sundeadkeys) ---p----- a------- ch(de_sundeadkeys) ---p----- a------- ch(de_nodeadkeys) ---p----- a------- ch(fr) ---p----- a------- ch(fr_Sundeadkeys) ---p----- a------- ch(fr_sundeadkeys) ---p----- a------- ch(fr_nodeadkeys) ---p----- a------- ch(de_mac) ---p----- a------- ch(fr_mac) --------- -------- sgi_vndr/jp(jp106) --------- -------- sgi_vndr/jp(alternate106) --dp----- a------- macintosh_vndr/de(basic) ---p----- a------- macintosh_vndr/de(Sundeadkeys) ---p----- a------- macintosh_vndr/de(sundeadkeys) ---p----- a------- macintosh_vndr/de(nodeadkeys) --dp----- a------- macintosh_vndr/fi(basic) ---p----- a------- macintosh_vndr/fi(nodeadkeys) ---p----- a------- macintosh_vndr/dk(basic) --dp----- a------- macintosh_vndr/dk(full) ---p----- a------- macintosh_vndr/dk(nodeadkeys) ---p----- a------- macintosh_vndr/dk(macbookpro) --dp----- a------- macintosh_vndr/latam(basic) --dp----- a------- macintosh_vndr/no(basic) ---p----- a------- macintosh_vndr/no(nodeadkeys) --dp----- a------- macintosh_vndr/gb(basic) +-d------ -------- macintosh_vndr/fr(extended) +-------- -------- macintosh_vndr/fr(nodeadkeys) +-dp----- a------- macintosh_vndr/nl(basic) --p----- a------- macintosh_vndr/ch(extended) --p----- a------- macintosh_vndr/ch(de) --p----- a------- macintosh_vndr/ch(fr) --p----- a------- macintosh_vndr/ch(nodeadkeys) +-dp----- a------- macintosh_vndr/no(basic) +--p----- a------- macintosh_vndr/no(nodeadkeys) +-dp----- a------- macintosh_vndr/is(basic) +--p----- a------- macintosh_vndr/is(nodeadkeys) +-dp----- a------- macintosh_vndr/gb(basic) +-dp----- a------- macintosh_vndr/se(basic) +--p----- a------- macintosh_vndr/se(nodeadkeys) +--p----- a------- macintosh_vndr/dk(basic) +-dp----- a------- macintosh_vndr/dk(full) +--p----- a------- macintosh_vndr/dk(nodeadkeys) +--p----- a------- macintosh_vndr/dk(macbookpro) -dp----- -m------ macintosh_vndr/apple(extended) --p----- -m------ macintosh_vndr/apple(laptop) --p----- -m------ macintosh_vndr/apple(laptop_bad_switch) @@ -521,35 +565,17 @@ h-p----- -m------ level3(ralt_switch_for_alts_toggle) --p----- a------- macintosh_vndr/pt(Sundeadkeys) --p----- a------- macintosh_vndr/pt(sundeadkeys) --p----- a------- macintosh_vndr/pt(nodeadkeys) --d------ -------- macintosh_vndr/fr(extended) --------- -------- macintosh_vndr/fr(nodeadkeys) --dp----- a------- macintosh_vndr/nl(basic) --dp----- a------- macintosh_vndr/se(basic) ---p----- a------- macintosh_vndr/se(nodeadkeys) -------- -------- macintosh_vndr/us(extended) h------- -------- macintosh_vndr/us(oldmac) --dp----- a------- macintosh_vndr/es(basic) +-dp----- a------- macintosh_vndr/de(basic) +--p----- a------- macintosh_vndr/de(Sundeadkeys) +--p----- a------- macintosh_vndr/de(sundeadkeys) +--p----- a------- macintosh_vndr/de(nodeadkeys) -------- -------- macintosh_vndr/it(extended) --dp----- a------- macintosh_vndr/is(basic) ---p----- a------- macintosh_vndr/is(nodeadkeys) --dp----- a------- bd(basic) --------- -------- bd(probhat) --dp----- -------- tr(basic) ---p----- -------- tr(f) ---p----- -------- tr(alt) ---p----- a------- tr(Sundeadkeys) ---p----- a------- tr(sundeadkeys) ---p----- -------- tr(ku) ---p----- -------- tr(ku_f) ---p----- -------- tr(ku_alt) ---p----- -------- tr(intl) ---p----- a------- tr(olpc) ---p----- -------- tr(crh) ---p----- -------- tr(crh_f) ---p----- -------- tr(crh_alt) --dp----- a------- tj(basic) --------- -------- tj(legacy) --dp----- a------- mao(basic) +-dp----- a------- macintosh_vndr/latam(basic) +-dp----- a------- macintosh_vndr/fi(basic) +--p----- a------- macintosh_vndr/fi(nodeadkeys) +--p----- -m------ level5(rctrl_switch) -dp----- a------- pt(basic) --p----- a------- pt(Sundeadkeys) --p----- a------- pt(sundeadkeys) @@ -560,14 +586,94 @@ h------- -------- macintosh_vndr/us(oldmac) --p----- a------- pt(nativo) --p----- a------- pt(nativo-us) --p----- a------- pt(nativo-epo) --dp----- a------- ara(basic) ---p----- a------- ara(qwerty) ---p----- a------- ara(azerty) ---p----- a------- ara(digits) ---p----- a------- ara(qwerty_digits) ---p----- a------- ara(azerty_digits) ---p----- a------- ara(buckwalter) ---p----- a------- ara(olpc) +-dp----- a------- ge(basic) +--p----- a------- ge(qwerty) +--p----- a------- ge(ergonomic) +--p----- a------- ge(mess) +--p----- a------- ge(ru) +--p----- a------- ge(os) +-------- -------- 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) +--p----- a------- ie(ogam) +--p----- a------- ie(ogam_is434) +--p----- -m------ group(switch) +--p----- -m------ group(lswitch) +--p----- -m------ group(win_switch) +--p----- -m------ group(lwin_switch) +--p----- -m------ group(rwin_switch) +--p----- -m------ group(rctrl_switch) +--p----- -m------ group(toggle) +--p----- -m------ group(shifts_toggle) +--p----- -m------ group(ctrl_shift_toggle) +--p----- -m------ group(lctrl_lshift_toggle) +--p----- -m------ group(rctrl_rshift_toggle) +--p----- -m------ group(shift_caps_toggle) +--p----- -m------ group(shift_caps_switch) +--p----- -m------ group(win_menu_switch) +--p----- -m------ group(lctrl_rctrl_switch) +--p----- -m------ group(ctrl_alt_toggle) +--p----- -m------ group(alt_shift_toggle) +--p----- -m------ group(menu_toggle) +--p----- -m------ group(lwin_toggle) +--p----- -m------ group(rwin_toggle) +--p----- -m------ group(ctrls_toggle) +--p----- -m------ group(alts_toggle) +--p----- -m------ group(lshift_toggle) +--p----- -m------ group(rshift_toggle) +--p----- -m------ group(lalt_toggle) +--p----- -m------ group(lctrl_toggle) +--p----- -m------ group(rctrl_toggle) +--p----- -m------ group(alt_caps_toggle) +h-p----- -m------ group(olpc) +--p----- -m------ group(alt_space_toggle) +--p----- -m------ group(sclk_toggle) +-dp----- am------ us(basic) +--p----- a------- us(euro) +--p----- a------- us(intl) +--p----- a------- us(alt-intl) +--p----- a------- us(dvorak) +--p----- a------- us(dvorak-intl) +--p----- a------- us(dvorak-l) +--p----- a------- us(dvorak-r) +--p----- a------- us(dvorak-classic) +--p----- a------- us(dvp) +--p----- a------- us(rus) +--p----- a------- us(mac) +--p----- a------- us(colemak) +--p----- a------- us(altgr-intl) +--p----- a------- us(classmate) +--p----- a------- us(classmate-intl) +--p----- a------- us(classmate-alt-intl) +--p----- a------- us(classmate-altgr-intl) +--p----- a------- us(olpc) +--p----- a------- us(olpc2) +--p----- am------ us(chr) +-dp----- a------- et(basic) +--p----- a------- et(olpc) +-d------ -------- nec_vndr/jp(pc98) +-dp----- a------- ma(arabic) +--p----- a------- ma(french) +--p----- a------- ma(tifinagh) +--p----- a------- ma(tifinagh-phonetic) +--p----- a------- ma(tifinagh-extended) +--p----- a------- ma(tifinagh-extended-phonetic) +--p----- a------- ma(tifinagh-alt) +--p----- a------- ma(tifinagh-alt-phonetic) -dp----- -------- ca(fr) -------- -------- ca(fr-dvorak) --p----- -------- ca(fr-legacy) @@ -579,7 +685,45 @@ h------- -------- macintosh_vndr/us(oldmac) -------- -------- ca(olpc) --p----- a------- ca(kut) --p----- a------- ca(eng) --d------ -------- nec_vndr/jp(pc98) +--p----- -------- nbsp(none) +--p----- -------- nbsp(level2) +--p----- -------- nbsp(level3) +--p----- -------- nbsp(level3s) +--p----- -------- nbsp(level3n) +--p----- -------- nbsp(level4) +--p----- -------- nbsp(level4n) +--p----- -------- nbsp(level4nl) +-dp----- a------- ba(basic) +--p----- a------- ba(us) +--p----- a------- ba(alternatequotes) +--p----- a------- ba(unicode) +--p----- a------- ba(unicodeus) +-dp----- a------- vn(basic) +-d------ -------- de(basic) +--p----- a------- de(nodeadkeys) +--p----- a------- de(deadgraveacute) +--p----- a------- de(deadacute) +--p----- a------- de(ro) +--p----- a------- de(ro_nodeadkeys) +--p----- a------- de(dvorak) +--p----- a------- de(Sundeadkeys) +--p----- a------- de(sundeadkeys) +--p----- amk----- de(neo) +--p----- a------- de(mac) +--p----- a------- de(mac_nodeadkeys) +--p----- a------- de(dsb) +--p----- a------- de(dsb_qwertz) +--p----- a------- de(qwerty) +-dp----- a------- it(basic) +--p----- a------- it(nodeadkeys) +--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) @@ -691,155 +835,59 @@ h-p----- a------- inet(logitech_set3) --p----- a------- inet(creativedw7000) --p----- a------- inet(compalfl90) --p----- a------- inet(pc105) --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) ---p----- a------- ir(ku_ara) --dp----- a------- fr(basic) ---p----- a------- fr(Sundeadkeys) ---p----- a------- fr(sundeadkeys) ---p----- a------- fr(nodeadkeys) ---p----- a------- fr(oss) ---p----- a------- fr(oss_latin9) ---p----- a------- fr(oss_Sundeadkeys) ---p----- a------- fr(oss_sundeadkeys) ---p----- a------- fr(oss_nodeadkeys) ---p----- a------- fr(latin9) ---p----- a------- fr(latin9_Sundeadkeys) ---p----- a------- fr(latin9_sundeadkeys) ---p----- a------- fr(latin9_nodeadkeys) ---p----- a------- fr(bepo) ---p----- a------- fr(bepo_latin9) ---p----- am------ fr(dvorak) ---p----- a------- fr(bre) ---p----- a------- fr(oci) ---p----- a------- fr(mac) ---p----- a------- fr(geo) ---p----- -------- nbsp(none) ---p----- -------- nbsp(level2) ---p----- -------- nbsp(level3) ---p----- -------- nbsp(level3s) ---p----- -------- nbsp(level3n) ---p----- -------- nbsp(level4) ---p----- -------- nbsp(level4n) ---p----- -------- nbsp(level4nl) --dp----- a------- nl(basic) ---p----- a------- nl(std) ---p----- a------- nl(Sundeadkeys) ---p----- a------- nl(sundeadkeys) ---p----- a------- nl(mac) --dp----- a------- cd(basic) --dp----- a------- se(basic) ---p----- a------- se(se) ---p----- a------- se(nodeadkeys) ---p----- a------- se(dvorak) ---p----- a------- se(rus) ---p----- a------- se(rus_nodeadkeys) --------- -------- se(smi) ---p----- a------- se(mac) ---p----- a------- se(svdvorak) --dp----- am------ us(basic) ---p----- a------- us(euro) ---p----- a------- us(intl) ---p----- a------- us(alt-intl) ---p----- a------- us(dvorak) ---p----- a------- us(dvorak-intl) ---p----- a------- us(dvorak-l) ---p----- a------- us(dvorak-r) ---p----- a------- us(dvorak-classic) ---p----- a------- us(dvp) ---p----- a------- us(rus) ---p----- a------- us(mac) ---p----- a------- us(colemak) ---p----- a------- us(altgr-intl) ---p----- a------- us(classmate) ---p----- a------- us(classmate-intl) ---p----- a------- us(classmate-alt-intl) ---p----- a------- us(classmate-altgr-intl) ---p----- a------- us(olpc) ---p----- a------- us(olpc2) ---p----- am------ us(chr) --dp----- a------- la(basic) ---p----- -m------ group(switch) ---p----- -m------ group(lswitch) ---p----- -m------ group(win_switch) ---p----- -m------ group(lwin_switch) ---p----- -m------ group(rwin_switch) ---p----- -m------ group(rctrl_switch) ---p----- -m------ group(toggle) ---p----- -m------ group(shifts_toggle) ---p----- -m------ group(ctrl_shift_toggle) ---p----- -m------ group(lctrl_lshift_toggle) ---p----- -m------ group(shift_caps_toggle) ---p----- -m------ group(shift_caps_switch) ---p----- -m------ group(win_menu_switch) ---p----- -m------ group(ctrl_alt_toggle) ---p----- -m------ group(alt_shift_toggle) ---p----- -m------ group(menu_toggle) ---p----- -m------ group(lwin_toggle) ---p----- -m------ group(rwin_toggle) ---p----- -m------ group(ctrls_toggle) ---p----- -m------ group(alts_toggle) ---p----- -m------ group(lshift_toggle) ---p----- -m------ group(rshift_toggle) ---p----- -m------ group(lalt_toggle) ---p----- -m------ group(lctrl_toggle) ---p----- -m------ group(rctrl_toggle) ---p----- -m------ group(alt_caps_toggle) -h-p----- -m------ group(olpc) ---p----- -m------ group(alt_space_toggle) ---p----- -m------ group(sclk_toggle) --dp----- am------ za(basic) --dp----- a------- vn(basic) --dp----- -------- tm(basic) ---p----- -------- tm(alt) --dp----- a------- es(basic) ---p----- a------- es(Sundeadkeys) ---p----- a------- es(sundeadkeys) ---p----- a------- es(nodeadkeys) ---p----- a------- es(dvorak) ---p----- a------- es(cat) ---p----- a------- es(ast) ---p----- a------- es(mac) ---p----- a------- es(olpc) ---p----- a------- es(deadtilde) --dp----- a------- it(basic) ---p----- a------- it(nodeadkeys) ---p----- a------- it(mac) ---p----- a------- it(geo) --------- -------- it(olpc) ---p----- am------ it(us) --dp----- a------- th(basic) ---p----- a------- th(pat) ---p----- a------- th(tis) ---p----- a------- th(olpc) --dp----- a------- pk(urd-phonetic) ---p----- a------- pk(urd-crulp) ---p----- a------- pk(urd-nla) ---p----- a------- pk(ara) ---p----- a------- pk(olpc) --dp----- a------- is(basic) ---p----- a------- is(Sundeadkeys) ---p----- a------- is(nodeadkeys) ---p----- a------- is(mac) ---p----- a------- is(dvorak) --dp----- a------- np(basic) ---p----- a------- np(olpc) --dp----- a------- kg(basic) ---p----- a------- kg(phonetic) --dp----- a------- ad(basic) --dp----- a------- mt(basic) ---p----- a------- mt(us) +-dp----- a------- latam(basic) +--p----- a------- latam(Sundeadkeys) +--p----- a------- latam(sundeadkeys) +--p----- a------- latam(nodeadkeys) +--p----- a------- latam(deadtilde) +-dp----- a------- sy(basic) +--p----- a------- sy(syc) +--p----- a------- sy(syc_phonetic) +--p----- a------- sy(ku) +--p----- a------- sy(ku_f) +--p----- a------- sy(ku_alt) +-dp----- a------- lk(sin_phonetic) +--p----- a------- lk(tam_unicode) +--p----- a------- lk(tam_TAB) +-------- -------- digital_vndr/pc(pc) +-------- -------- digital_vndr/pc(pc104) +-------- -------- digital_vndr/us(us) +-------- -------- digital_vndr/us(vt105-tw) +-------- -------- digital_vndr/us(vt105-dp) +-------- -------- digital_vndr/us(vt105) +-------- -------- digital_vndr/us(vt108-tw) +-------- -------- digital_vndr/us(vt108-dp) +-------- -------- digital_vndr/us(vt108) +-------- -------- digital_vndr/us(unix) +-------- -------- digital_vndr/us(pcxalga) +-------- -------- digital_vndr/us(pcxal) +-------- -------- digital_vndr/us(pcxalaa) +-------- -------- digital_vndr/us(pcxalfa) +-------- -------- digital_vndr/us(pcxalka) +-------- -------- digital_vndr/us(lk44x) +-------- -------- digital_vndr/us(pc104) +-d------ -------- digital_vndr/lk(common) +-------- -------- digital_vndr/lk(lk401) +-------- -------- digital_vndr/vt(vt105) +-------- -------- digital_vndr/vt(vt108) +-dp----- a------- be(basic) +--p----- a------- be(oss) +--p----- a------- be(oss_frbe) +--p----- a------- be(oss_latin9) +--p----- a------- be(oss_Sundeadkeys) +--p----- a------- be(oss_sundeadkeys) +--p----- a------- be(iso-alternate) +--p----- a------- be(sundeadkeys) +--p----- a------- be(Sundeadkeys) +--p----- a------- be(nodeadkeys) +--p----- a------- be(wang) +-dp----- a------- mv(basic) -dp----- a------- ru(winkeys) h-p----- a------- ru(common) --p----- a------- ru(legacy) --p----- a------- ru(olpc) --p----- a------- ru(typewriter) +--p----- a------- ru(typewriter-legacy) --p----- a------- ru(phonetic) --p----- a------- ru(phonetic_winkeys) --p----- a------- ru(tt) @@ -853,53 +901,47 @@ h-p----- a------- ru(common) --p----- a------- ru(xal) --p----- a------- ru(dos) --p----- a------- ru(bak) --d------ -------- digital_vndr/lk(common) --------- -------- digital_vndr/lk(lk401) --------- -------- digital_vndr/pc(pc) --------- -------- digital_vndr/pc(pc104) --------- -------- digital_vndr/vt(vt105) --------- -------- digital_vndr/vt(vt108) --------- -------- digital_vndr/us(us) --------- -------- digital_vndr/us(vt105-tw) --------- -------- digital_vndr/us(vt105-dp) --------- -------- digital_vndr/us(vt105) --------- -------- digital_vndr/us(vt108-tw) --------- -------- digital_vndr/us(vt108-dp) --------- -------- digital_vndr/us(vt108) --------- -------- digital_vndr/us(unix) --------- -------- digital_vndr/us(pcxalga) --------- -------- digital_vndr/us(pcxal) --------- -------- digital_vndr/us(pcxalaa) --------- -------- digital_vndr/us(pcxalfa) --------- -------- digital_vndr/us(pcxalka) --------- -------- digital_vndr/us(lk44x) --------- -------- digital_vndr/us(pc104) --dp----- a------- epo(basic) ---p----- a------- epo(legacy) ---p----- -------- epo(qwerty) ---p----- -------- epo(dvorak) -hdp----- -m------ capslock(capslock) -h-p----- -m------ capslock(shiftlock) -h-p----- -m------ capslock(grouplock) -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------- mk(basic) ---p----- a------- mk(nodeadkeys) --dp----- a------- uz(cyrillic) ---p----- a------- uz(latin) ---p----- -------- uz(crh) ---p----- -------- uz(crh_f) ---p----- -------- uz(crh_alt) --dp----- a------- ee(basic) ---p----- a------- ee(nodeadkeys) ---p----- a------- ee(dvorak) ---p----- a------- ee(us) +-dp----- am------ lv(basic) +--p----- am------ lv(apostrophe) +--p----- am------ lv(tilde) +--p----- am------ lv(fkey) +-dp----- a------- si(basic) +--p----- a------- si(us) +--p----- a------- si(alternatequotes) +-dp----- a------- bt(basic) +--p----- -m------ compose(ralt) +--p----- -m------ compose(lwin) +--p----- -m------ compose(rwin) +--p----- -m------ compose(menu) +--p----- -m------ compose(rctrl) +--p----- -m------ compose(lctrl) +--p----- -m------ compose(caps) +--p----- -m------ compose(102) +-dp----- a------- az(latin) +--p----- a------- az(cyrillic) +--p----- -m------ ctrl(nocaps) +--p----- -m------ ctrl(swapcaps) +--p----- -m------ ctrl(ctrl_ac) +--p----- -m------ ctrl(ctrl_aa) +--p----- -m------ ctrl(ctrl_ra) +-dp----- a------- brai(home_row) +--p----- a------- brai(left_hand) +--p----- a------- brai(right_hand) +h-p----- --k----- brai(keypad) +-dp----- -------- tm(basic) +--p----- -------- tm(alt) +-dp----- a------- kz(basic) +--p----- a------- kz(ruskaz) +--p----- a------- kz(kazrus) +--p----- a------- kz(olpc) +-dp----- a------- la(basic) +-dp----- a------- fi(kotoistus) +--p----- a------- fi(classic) +h-p----- a------- fi(fi) +--p----- a------- fi(nodeadkeys) +-------- -------- fi(smi) +--p----- a------- fi(mac) +-dp----- a------- al(basic) -dp----- a------- gh(basic) --p----- a------- gh(akan) --p----- a------- gh(ga) @@ -907,3 +949,8 @@ h-p----- -m------ capslock(numlock) --p----- a------- gh(fula) --p----- a------- gh(hausa) --p----- a------- gh(generic) +-------- -------- fujitsu_vndr/jp +-------- -------- fujitsu_vndr/us +-dp----- a------- kg(basic) +--p----- a------- kg(phonetic) +--p----- -m------ shift(breaks_caps) diff --git a/xorg-server/xkbdata.src/symbols/tm b/xorg-server/xkbdata.src/symbols/tm index d66e277f0..aed4c902d 100644 --- a/xorg-server/xkbdata.src/symbols/tm +++ b/xorg-server/xkbdata.src/symbols/tm @@ -9,7 +9,7 @@ xkb_symbols "basic" { name[Group1]="Turkmenistan"; include "us" - + key.type[group1]="ALPHABETIC"; key <TLDE> { [ zcaron, Zcaron, grave, asciitilde ] }; key <AD01> { [ adiaeresis, Adiaeresis, q, Q ] }; diff --git a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in index a12008f3e..cedb17159 100644 --- a/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in +++ b/xorg-server/xkbdata.src/symbols/xfree68_vndr/Makefile.in @@ -106,6 +106,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ POFILES = @POFILES@ @@ -179,9 +180,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu symbols/xfree68_vndr/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/xfree68_vndr/Makefile'; \ cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/xfree68_vndr/Makefile + $(AUTOMAKE) --foreign symbols/xfree68_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ |