diff options
Diffstat (limited to 'dist/xkeyboard-config/symbols/sun_vndr')
39 files changed, 3179 insertions, 1219 deletions
diff --git a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.am b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.am index db036de67..cc4c5b620 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.am +++ b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.am @@ -1,9 +1,10 @@ symbolsdir = $(xkb_base)/symbols/sun_vndr dist_symbols_DATA = \ - cs cz de dk es \ - fi fr gb gr hu \ - it jp ko lt lv \ - nl no pl pt ru \ - se solaris sw tr tuv \ - tw us usb + ara be br ca ch \ + cz de dk ee es \ + fi fr gb gr it \ + jp kr lt lv nl \ + no pl pt ro ru \ + se sk solaris tr tuv \ + tw ua us diff --git a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in index 8db5fff20..c382209a8 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in +++ b/dist/xkeyboard-config/symbols/sun_vndr/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 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. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 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. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -39,6 +41,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -46,9 +49,23 @@ 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__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(symbolsdir)" -dist_symbolsDATA_INSTALL = $(INSTALL_DATA) DATA = $(dist_symbols_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ @@ -106,6 +123,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@ @@ -165,12 +183,13 @@ xkb_base = @xkb_base@ xkb_rules_symlink = @xkb_rules_symlink@ symbolsdir = $(xkb_base)/symbols/sun_vndr dist_symbols_DATA = \ - cs cz de dk es \ - fi fr gb gr hu \ - it jp ko lt lv \ - nl no pl pt ru \ - se solaris sw tr tuv \ - tw us usb + ara be br ca ch \ + cz de dk ee es \ + fi fr gb gr it \ + jp kr lt lv nl \ + no pl pt ro ru \ + se sk solaris tr tuv \ + tw ua us all: all-am @@ -184,9 +203,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'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu symbols/sun_vndr/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign symbols/sun_vndr/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign symbols/sun_vndr/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -204,23 +223,27 @@ $(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 +$(am__aclocal_m4_deps): install-dist_symbolsDATA: $(dist_symbols_DATA) @$(NORMAL_INSTALL) test -z "$(symbolsdir)" || $(MKDIR_P) "$(DESTDIR)$(symbolsdir)" - @list='$(dist_symbols_DATA)'; for p in $$list; do \ + @list='$(dist_symbols_DATA)'; test -n "$(symbolsdir)" || list=; \ + 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"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(symbolsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(symbolsdir)" || exit $$?; \ 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 + @list='$(dist_symbols_DATA)'; test -n "$(symbolsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(symbolsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(symbolsdir)" && rm -f $$files tags: TAGS TAGS: @@ -244,13 +267,17 @@ distdir: $(DISTFILES) 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 "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -281,6 +308,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -299,6 +327,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -307,18 +337,28 @@ install-data-am: install-dist_symbolsDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -353,6 +393,7 @@ uninstall-am: uninstall-dist_symbolsDATA 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/dist/xkeyboard-config/symbols/sun_vndr/ara b/dist/xkeyboard-config/symbols/sun_vndr/ara new file mode 100644 index 000000000..a5a29aa6b --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ara @@ -0,0 +1,117 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]= "Arabic"; + + key <TLDE> { [ Arabic_thal, Arabic_shadda, grave, asciitilde ] }; + key <AE01> { [ 1, exclam, 1, exclam ] }; + key <AE02> { [ 2, at, 2, at ] }; + key <AE03> { [ 3, numbersign, 3, numbersign ] }; + key <AE04> { [ 4, dollar, 4, dollar ] }; + key <AE05> { [ 5, percent, 5, percent ] }; + key <AE06> { [ 6, asciicircum, 6, asciicircum ] }; + key <AE07> { [ 7, ampersand, 7, ampersand ] }; + key <AE08> { [ 8, asterisk, 8, asterisk ] }; + key <AE09> { [ 9, parenright, 9, parenright ] }; + key <AE10> { [ 0, parenleft, 0, parenleft ] }; + key <AE11> { [ minus, underscore, minus, underscore ] }; + key <AE12> { [ equal, plus, equal, plus ] }; + + key <AD01> { [ Arabic_dad, Arabic_fatha, q, Q ] }; + key <AD02> { [ Arabic_sad, Arabic_fathatan, w, W ] }; + key <AD03> { [ Arabic_theh, Arabic_damma, e, E ] }; + key <AD04> { [ Arabic_qaf, Arabic_dammatan, r, R ] }; + key <AD05> { [ Arabic_feh, 0x100fef9, t, T ] }; + key <AD06> { [ Arabic_ghain, Arabic_hamzaunderalef, y, Y ] }; + key <AD07> { [ Arabic_ain, grave, u, U ] }; + key <AD08> { [ Arabic_ha, division, i, I ] }; + key <AD09> { [ Arabic_khah, multiply, o, O ] }; + key <AD10> { [ Arabic_hah, Arabic_semicolon, p, P ] }; + key <AD11> { [ Arabic_jeem, greater, bracketleft, braceleft ] }; + key <AD12> { [ Arabic_dal, less, bracketright, braceright ] }; + + key <AC01> { [ Arabic_sheen, Arabic_kasra, a, A ] }; + key <AC02> { [ Arabic_seen, Arabic_kasratan, s, S ] }; + key <AC03> { [ Arabic_yeh, bracketright, d, D ] }; + key <AC04> { [ Arabic_beh, bracketleft, f, F ] }; + key <AC05> { [ Arabic_lam, 0x100fef7, g, G ] }; + key <AC06> { [ Arabic_alef, Arabic_hamzaonalef, h, H ] }; + key <AC07> { [ Arabic_teh, Arabic_tatweel, j, J ] }; + key <AC08> { [ Arabic_noon, Arabic_comma, k, K ] }; + key <AC09> { [ Arabic_meem, slash, l, L ] }; + key <AC10> { [ Arabic_kaf, colon, semicolon, colon ] }; + key <AC11> { [ Arabic_tah, quotedbl, apostrophe, quotedbl ] }; + key <BKSL> { [ backslash, bar, backslash, bar ] }; + + key <LSGT> { [ bar, brokenbar, bar, brokenbar ] }; + key <AB01> { [Arabic_hamzaonyeh, asciitilde, z, Z ] }; + key <AB02> { [ Arabic_hamza, Arabic_sukun, x, X ] }; + key <AB03> { [Arabic_hamzaonwaw, braceright, c, C ] }; + key <AB04> { [ Arabic_ra, braceleft, v, V ] }; + key <AB05> { [ 0x100fefb, 0x100fef5, b, B ] }; + key <AB06> { [Arabic_alefmaksura, Arabic_maddaonalef, n, N ] }; + key <AB07> { [Arabic_tehmarbuta, apostrophe, m, M ] }; + key <AB08> { [ Arabic_waw, comma, comma, less ] }; + key <AB09> { [ Arabic_zain, period, period, greater ] }; + key <AB10> { [ Arabic_zah, Arabic_question_mark, slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ara(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/be b/dist/xkeyboard-config/symbols/sun_vndr/be new file mode 100644 index 000000000..8c1226af4 --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/be @@ -0,0 +1,99 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Belgium"; + + key <TLDE> { [twosuperior, threesuperior ] }; + key <AE01> { [ ampersand, 1, bar ] }; + key <AE02> { [ eacute, 2, at ] }; + key <AE03> { [ quotedbl, 3, numbersign ] }; + key <AE04> { [apostrophe, 4 ] }; + key <AE05> { [ parenleft, 5 ] }; + key <AE06> { [ section, 6, asciicircum ] }; + key <AE07> { [ egrave, 7 ] }; + key <AE08> { [ exclam, 8 ] }; + key <AE09> { [ ccedilla, 9, braceleft ] }; + key <AE10> { [ agrave, 0, braceright ] }; + key <AE11> { [parenright, degree ] }; + key <AE12> { [ minus, underscore ] }; + + key <AD01> { [ a, A ] }; + key <AD02> { [ z, Z ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD09> { [ o, O ] }; + key <AD11> { [dead_circumflex, dead_diaeresis, bracketleft ] }; + key <AD12> { [ dollar, asterisk, bracketright ] }; + + key <AC01> { [ q, Q ] }; + key <AC10> { [ m, M ] }; + key <AC11> { [ ugrave, percent, dead_acute ] }; + key <BKSL> { [ mu, sterling, dead_grave ] }; + + key <LSGT> { [ less, greater, backslash ] }; + key <AB01> { [ w, W ] }; + key <AB07> { [ comma, question ] }; + key <AB08> { [ semicolon, period ] }; + key <AB09> { [ colon, slash ] }; + key <AB10> { [ equal, plus, dead_tilde ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/be(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/br b/dist/xkeyboard-config/symbols/sun_vndr/br new file mode 100644 index 000000000..a5e17e949 --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/br @@ -0,0 +1,102 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Brazil"; + + key <TLDE> { [ apostrophe, quotedbl, notsign ] }; + key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; + key <AE02> { [ 2, at, twosuperior, onehalf ] }; + key <AE03> { [ 3, numbersign, threesuperior, threequarters ] }; + key <AE04> { [ 4, dollar, sterling, onequarter ] }; + key <AE05> { [ 5, percent, cent ] }; + key <AE06> { [ 6, dead_diaeresis, notsign, diaeresis ] }; + key <AE07> { [ 7, ampersand, braceleft ] }; + key <AE08> { [ 8, asterisk, bracketleft ] }; + key <AE09> { [ 9, parenleft, bracketright ] }; + key <AE10> { [ 0, parenright, braceright ] }; + key <AE11> { [ minus, underscore, backslash ] }; + key <AE12> { [ equal, plus, section ] }; + + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, registered ] }; + key <AD11> { [ dead_acute, dead_grave, acute, grave ] }; + key <AD12> { [ bracketleft, braceleft, ordfeminine ] }; + + key <AC10> { [ ccedilla, Ccedilla, exclamdown ] }; + key <AC11> { [ dead_tilde, dead_circumflex, asciitilde, asciicircum ] }; + key <AC12> { [ bracketright, braceright, masculine ] }; + key <BKSL> { [ bracketright, braceright, masculine ] }; + + key <LSGT> { [ slash, bar, degree ] }; + key <AB01> { [ z, Z, guillemotleft ] }; + key <AB02> { [ x, X, guillemotright ] }; + key <AB03> { [ c, C, copyright ] }; + key <AB07> { [ m, M, mu ] }; + key <AB08> { [ comma, less, question ] }; + key <AB09> { [ period, greater, questiondown ] }; + key <AB10> { [ semicolon, colon ] }; + key <AB11> { [ slash, question, degree, questiondown ] }; + + key <KPPT> { [ KP_Decimal ] }; + key <KPDL> { [ KP_Delete, comma ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/br(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ca b/dist/xkeyboard-config/symbols/sun_vndr/ca new file mode 100644 index 000000000..c7b5fb88a --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ca @@ -0,0 +1,98 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Canada Bilingual"; + + key <TLDE> { [ slash, bar, backslash ]}; + key <AE01> { [ 1, exclam, plusminus ]}; + key <AE02> { [ 2, at ]}; + key <AE03> { [ 3, numbersign, sterling ]}; + key <AE04> { [ 4, dollar, cent ]}; + key <AE05> { [ 5, percent, currency ]}; + key <AE06> { [ 6, question, notsign ]}; + key <AE07> { [ 7, ampersand, braceleft ]}; + key <AE08> { [ 8, asterisk, braceright ]}; + key <AE09> { [ 9, parenleft, bracketleft ]}; + key <AE10> { [ 0, parenright, bracketright ]}; + key <AE11> { [ minus, underscore, onehalf ]}; + key <AE12> { [ equal, plus, notsign ]}; + + key <AD03> { [ e, E, EuroSign ]}; + key <AD09> { [ o, O, section ]}; + key <AD10> { [ p, P, paragraph ]}; + key <AD11> { [ dead_circumflex, dead_diaeresis, dead_grave ]}; + key <AD12> { [ ccedilla, Ccedilla, asciitilde ]}; + + key <AC10> { [ semicolon, colon, degree ]}; + key <AC11> { [ egrave, Egrave, braceleft ]}; + key <AC12> { [ agrave, Agrave, braceright ]}; + key <BKSL> { [ agrave, Agrave, braceright ]}; + + key <LSGT> { [ uacute, Uacute ]}; + key <AB01> { [ z, Z, guillemotleft ]}; + key <AB02> { [ x, X, guillemotright ]}; + key <AB07> { [ m, M, mu ]}; + key <AB08> { [ comma, quoteright, less ]}; + key <AB09> { [ period, quotedbl, greater ]}; + key <AB10> { [ eacute, Eacute, quoteleft ]}; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ca(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ch b/dist/xkeyboard-config/symbols/sun_vndr/ch new file mode 100644 index 000000000..df4ae80d8 --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ch @@ -0,0 +1,134 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "de_type6" { + + name[Group1]= "Switzerland - German"; + + key <TLDE> { [ section, degree ] }; + key <AE01> { [ 1, plus, bar ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, asterisk, numbersign ] }; + key <AE04> { [ 4, ccedilla, asciicircum ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, notsign ] }; + key <AE07> { [ 7, slash, brokenbar ] }; + key <AE08> { [ 8, parenleft, cent ] }; + key <AE09> { [ 9, parenright ] }; + key <AE10> { [ 0, equal, quoteleft ] }; + key <AE11> { [ quoteright, question, dead_acute ] }; + key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key <AD03> { [ e, E, EuroSign ] }; + key <AD06> { [ z, Z ] }; + key <AD11> { [ udiaeresis, egrave, bracketleft ] }; + key <AD12> { [ dead_diaeresis, exclam, bracketright ] }; + + key <AC10> { [ odiaeresis, eacute ] }; + key <AC11> { [ adiaeresis, agrave, braceleft ] }; + key <BKSL> { [ dollar, sterling, braceright ] }; + + key <LSGT> { [ less, greater, backslash ] }; + key <AB01> { [ y, Y ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + + +partial alphanumeric_keys +xkb_symbols "fr_type6" { + + name[Group1]= "Switzerland - French, Sun type 6"; + + key <TLDE> { [ section, degree ] }; + key <AE01> { [ 1, plus, bar ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, asterisk, numbersign ] }; + key <AE04> { [ 4, ccedilla, asciicircum ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, notsign ] }; + key <AE07> { [ 7, slash, brokenbar ] }; + key <AE08> { [ 8, parenleft, cent ] }; + key <AE09> { [ 9, parenright ] }; + key <AE10> { [ 0, equal, quoteleft ] }; + key <AE11> { [ quoteright, question, dead_acute ] }; + key <AE12> { [ dead_circumflex, dead_grave, dead_tilde ] }; + + key <AD03> { [ e, E, EuroSign ] }; + key <AD06> { [ z, Z ] }; + key <AD11> { [ egrave, udiaeresis, bracketleft ] }; + key <AD12> { [ dead_diaeresis, exclam, bracketright ] }; + + key <AC10> { [ eacute, odiaeresis ] }; + key <AC11> { [ agrave, adiaeresis, braceleft ] }; + key <BKSL> { [ dollar, sterling, braceright ] }; + + key <LSGT> { [ less, greater, backslash ] }; + key <AB01> { [ y, Y ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ch(de_type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/cs b/dist/xkeyboard-config/symbols/sun_vndr/cs deleted file mode 100644 index e487ba096..000000000 --- a/dist/xkeyboard-config/symbols/sun_vndr/cs +++ /dev/null @@ -1,59 +0,0 @@ -// $XdotOrg: $ -// -// 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. -// - -xkb_symbols "type5" { - include "sun_vndr/us(type5)" - include "cz" - - // A few keys are different - - - key <TLDE> { [ quoteleft, asciitilde ] }; -// key <AE02> { [ ecaron, 2 ], [ at ] }; -// key <AE03> { [ scaron, 3 ], [ numbersign ] }; -// key <AE04> { [ ccaron, 4 ], [ dollar ] }; -// key <AE05> { [ rcaron, 5 ], [ percent ] }; -// key <AE06> { [ zcaron, 6 ], [ asciicircum ] }; -// key <AE07> { [ yacute, 7 ], [ ampersand ] }; -// key <AE08> { [ aacute, 8 ], [ asterisk ] }; - key <AE09> { [ iacute, 9 ], [ braceleft ] }; - key <AE10> { [ eacute, 0 ], [ braceright ] }; - - key <AD03> { [ e, E ] }; - key <AD11> { [ uacute, slash ], [ bracketleft ] }; - key <AD12> { [ parenright, parenleft], [ bracketright ] }; - - key <AC02> { [ s, S ], [ ssharp, ssharp ] }; - key <BKSL> { [ SunFA_Diaeresis, backslash ] }; - - key <LSGT> { [ backslash, bar ] }; - -}; - diff --git a/dist/xkeyboard-config/symbols/sun_vndr/cz b/dist/xkeyboard-config/symbols/sun_vndr/cz index e487ba096..10f6deddd 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/cz +++ b/dist/xkeyboard-config/symbols/sun_vndr/cz @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,32 +27,80 @@ // of the copyright holder. // -xkb_symbols "type5" { - include "sun_vndr/us(type5)" - include "cz" - - // A few keys are different - - - key <TLDE> { [ quoteleft, asciitilde ] }; -// key <AE02> { [ ecaron, 2 ], [ at ] }; -// key <AE03> { [ scaron, 3 ], [ numbersign ] }; -// key <AE04> { [ ccaron, 4 ], [ dollar ] }; -// key <AE05> { [ rcaron, 5 ], [ percent ] }; -// key <AE06> { [ zcaron, 6 ], [ asciicircum ] }; -// key <AE07> { [ yacute, 7 ], [ ampersand ] }; -// key <AE08> { [ aacute, 8 ], [ asterisk ] }; - key <AE09> { [ iacute, 9 ], [ braceleft ] }; - key <AE10> { [ eacute, 0 ], [ braceright ] }; - - key <AD03> { [ e, E ] }; - key <AD11> { [ uacute, slash ], [ bracketleft ] }; - key <AD12> { [ parenright, parenleft], [ bracketright ] }; - - key <AC02> { [ s, S ], [ ssharp, ssharp ] }; - key <BKSL> { [ SunFA_Diaeresis, backslash ] }; - - key <LSGT> { [ backslash, bar ] }; - +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Czech"; + + key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key <AE01> { [ plus, 1, exclam, asciitilde ] }; + key <AE02> { [ ecaron, 2, at, dead_caron ] }; + key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] }; + key <AE04> { [ ccaron, 4, dollar, dead_breve ] }; + key <AE05> { [ rcaron, 5, percent, dead_abovering ] }; + key <AE06> { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key <AE07> { [ yacute, 7, ampersand, grave ] }; + key <AE08> { [ aacute, 8, asterisk, dead_abovedot ] }; + key <AE09> { [ iacute, 9, parenleft, dead_acute ] }; + key <AE10> { [ eacute, 0, parenright, dead_doubleacute ] }; + key <AE11> { [ equal, percent, dead_diaeresis, backslash ] }; + key <AE12> { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key <AD01> { [ q, Q, backslash ] }; + key <AD02> { [ w, W, bar ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD06> { [ z, Z ] }; + key <AD11> { [ uacute, slash, division ] }; + key <AD12> { [parenright, parenleft, multiply ] }; + + key <AC02> { [ s, S, dstroke ] }; + key <AC03> { [ d, D, Dstroke ] }; + key <AC04> { [ f, F, bracketleft ] }; + key <AC05> { [ g, G, bracketright ] }; + key <AC08> { [ k, K, lstroke ] }; + key <AC09> { [ l, L, Lstroke ] }; + key <AC10> { [ uring, quotedbl, dollar ] }; + key <AC11> { [ section, exclam, ssharp, currency ] }; + key <BKSL> { [ dead_diaeresis, apostrophe, backslash, bar ] }; + + key <LSGT> { [ backslash, asterisk, slash, brokenbar ] }; + key <AB01> { [ y, Y, less ] }; + key <AB02> { [ x, X, greater, numbersign ] }; + key <AB04> { [ v, V, at ] }; + key <AB05> { [ b, B, braceleft ] }; + key <AB06> { [ n, N, braceright ] }; + key <AB08> { [ comma, question, less ] }; + key <AB09> { [ period, colon, greater ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/cz(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/de b/dist/xkeyboard-config/symbols/sun_vndr/de index a80de66b5..bd13440b8 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/de +++ b/dist/xkeyboard-config/symbols/sun_vndr/de @@ -1,6 +1,6 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// Copyright 2010 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 @@ -28,44 +28,114 @@ // of the copyright holder. // +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Germany"; + key <TLDE> { [ asciicircum, degree ] }; + key <AE02> { [ 2, quotedbl, twosuperior ] }; + key <AE03> { [ 3, section, threesuperior ] }; + key <AE04> { [ 4, dollar ] }; + key <AE06> { [ 6, ampersand, section ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <AE11> { [ ssharp, question, backslash ] }; + key <AE12> { [ dead_acute, dead_grave ] }; + key <AD01> { [ q, Q, at ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD06> { [ z, Z ] }; + key <AD11> { [ udiaeresis, Udiaeresis ] }; + key <AD12> { [ plus, asterisk, asciitilde ] }; + key <AC10> { [ odiaeresis, Odiaeresis ] }; + key <AC11> { [ adiaeresis, Adiaeresis ] }; + key <AB01> { [ y, Y ] }; + key <AB07> { [ m, M, mu ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + key <BKSL> { [ numbersign, apostrophe, grave ] }; + key <LSGT> { [ less, greater, bar ] }; + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key <BKSL> { [ less, braceleft ] }; - - key <BRCR> { [ greater, braceright ] }; - key <DELE> { [ Delete ] }; - - key <AE01> { [ 1, plus ], [exclam ] }; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, asterisk ], [numbersign ] }; - key <AE04> { [ 4, ccedilla ], [cent ] }; - key <AE05> { [ 5, percent ], [asciitilde ] }; - key <AE06> { [ 6, ampersand ], [section ] }; - key <AE07> { [ 7, slash ], [bar ] }; - key <AE08> { [ 8, parenleft ], [degree ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [asciicircum ] }; - Key <AE11> { [ quoteright, question ], [quoteleft ] }; - key <AE12> { [ SunFA_Circum, SunFA_Grave ] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD06> { [ Z ] }; - key <AD11> { [ udiaeresis, egrave ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ] }; - key <AC10> { [ odiaeresis, eacute ] }; - key <AC11> { [ adiaeresis, agrave ] }; - key <TLDE> { [ dollar, SunFA_Tilde ], [sterling ] }; - key <LSGT> { [ bracketright, bracketleft ], [ backslash ] }; - key <AB01> { [ Y ] }; - key <AB07> { [ M, NoSymbol ], [mu ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <COMP> { [ SunAltGraph ] }; - key <ALGR> { [ SunCompose ] }; + name[Group1]="Germany - Sun type 4"; + + key <BKSL> { [ less, braceleft ] }; + key <BRCR> { [ greater, braceright ] }; + key <DELE> { [ Delete ] }; + + key <AE01> { [ 1, plus, exclam ] }; + key <AE02> { [ 2, quotedbl, at, oneeighth ] }; + key <AE03> { [ 3, asterisk, numbersign, sterling ] }; + key <AE04> { [ 4, ccedilla, cent ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, section ] }; + key <AE07> { [ 7, slash, bar ] }; + key <AE08> { [ 8, parenleft, degree ] }; + key <AE09> { [ 9, parenright, backslash ] }; + key <AE10> { [ 0, equal, asciicircum ] }; + Key <AE11> { [ quoteright, question, quoteleft ] }; + key <AE12> { [ dead_circumflex, dead_grave ] }; + + key <AD03> { [ e, E, EuroSign, EuroSign ] }; + key <AD06> { [ z, Z, leftarrow, yen ] }; + key <AD11> { [ udiaeresis, egrave, dead_diaeresis, dead_abovering ] }; + key <AD12> { [ dead_diaeresis, dead_acute ] }; + + key <AC02> { [ s, S ] }; + key <AC07> { [ j, J, dead_belowdot, dead_abovedot ] }; + key <AC10> { [ odiaeresis, eacute, dead_doubleacute, dead_belowdot ] }; + key <AC11> { [ adiaeresis, agrave, dead_circumflex, dead_caron ] }; + key <TLDE> { [ dollar, dead_tilde, sterling ] }; + key <AB01> { [ y, Y, guillemotright ] }; + key <AB02> { [ x, X, guillemotleft ] }; + key <AB04> { [ v, V, doublelowquotemark, singlelowquotemark ] }; + key <AB05> { [ b, B, leftdoublequotemark, leftsinglequotemark ] }; + key <AB06> { [ n, N, rightdoublequotemark, rightsinglequotemark ] }; + key <AB07> { [ m, M, mu ] }; + key <AB08> { [ comma, semicolon, periodcentered, multiply ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/de(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/dk b/dist/xkeyboard-config/symbols/sun_vndr/dk index 15f8603bc..fbef4e2d0 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/dk +++ b/dist/xkeyboard-config/symbols/sun_vndr/dk @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,50 +27,122 @@ // of the copyright holder. // +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Denmark"; + + key <TLDE> { [ onehalf, section ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, asciicircum ] }; + 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, bar ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key <BKSL> { [ apostrophe, asterisk, grave ] }; + key <AC10> { [ ae, AE ] }; + key <AC11> { [ oslash, Ooblique ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + key <LSGT> { [ less, greater, backslash ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key <BKSL> { [ onehalf, section ] }; - key <BRCR> { [ asciitilde, asciicircum ] }; - key <AE02> { [ 2, quotedbl ], [ at ] }; - key <AE03> { [ 3, numbersign ], [ sterling ] }; - key <AE04> { [ 4, currency ], [ dollar ] }; - 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> { [ SunFA_Acute, SunFA_Grave], [ bar ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <AD11> { [ Aring ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Circum], [SunFA_Tilde] }; - key <LCTL> { [ Caps_Lock ] }; - key <AC10> { [ AE ] }; - key <AC11> { [ Ooblique ] }; - key <TLDE> { [ quoteright, asterisk ], [ quoteleft ] }; - key <LSGT> { [ less, greater ], [ backslash ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <CAPS> { [ Control_L ] }; - key <COMP> { [ SunAltGraph ] }; - key <ALGR> { [ SunCompose ] }; + name[Group1]="Denmark - Sun type 4"; + key <BKSL> { [ onehalf, section ] }; + key <BRCR> { [ asciitilde, asciicircum ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + 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, bar ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key <LCTL> { [ Caps_Lock ] }; + key <AC10> { [ ae, AE ] }; + key <AC11> { [ ooblique, Ooblique ] }; + key <TLDE> { [ quoteright, asterisk, quoteleft ] }; + key <LSGT> { [ less, greater, backslash ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + key <CAPS> { [ Control_L ] }; + key <COMP> { [ SunAltGraph ] }; + key <ALGR> { [ SunCompose ] }; + include "level3(ralt_switch)" + include "kpdl(comma)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "dk" - - key <AE05> { [ 5, percent ], [asciitilde ]}; - key <AE06> { [ 6, ampersand ], [asciicircum ]}; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <BKSL> { [ quoteright, asterisk ], [ quoteleft ]}; - + + include "sun_vndr/dk(type4)" + + name[Group1]="Denmark - Sun type 5"; + + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, asciicircum ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <BKSL> { [ quoteright, asterisk, quoteleft ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/dk(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ee b/dist/xkeyboard-config/symbols/sun_vndr/ee new file mode 100644 index 000000000..863c2ad9e --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ee @@ -0,0 +1,118 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Estonia"; + + + key <TLDE> { [ dead_caron, dead_tilde, notsign, notsign ] }; + key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; + key <AE02> { [ 2, quotedbl, at, oneeighth ] }; + key <AE03> { [ 3, numbersign, sterling, sterling ] }; + key <AE04> { [ 4, currency, dollar, dollar ] }; + key <AE05> { [ 5, percent, onehalf, threeeighths ] }; + key <AE06> { [ 6, ampersand, notsign, fiveeighths ] }; + key <AE07> { [ 7, slash, braceleft, seveneighths ] }; + key <AE08> { [ 8, parenleft, bracketleft, trademark ] }; + key <AE09> { [ 9, parenright, bracketright, plusminus ] }; + key <AE10> { [ 0, equal, braceright, degree ] }; + key <AE11> { [ plus, question, backslash, questiondown ] }; + key <AE12> { [ dead_acute, dead_grave, grave, apostrophe ] }; + + key <AD01> { [ q, Q, at, Greek_OMEGA ] }; + key <AD02> { [ w, W, lstroke, Lstroke ] }; + key <AD03> { [ e, E, EuroSign, cent ] }; + key <AD04> { [ r, R, paragraph, registered ] }; + key <AD05> { [ t, T, tslash, Tslash ] }; + key <AD06> { [ y, Y, leftarrow, yen ] }; + key <AD07> { [ u, U, downarrow, uparrow ] }; + key <AD08> { [ i, I, rightarrow, idotless ] }; + key <AD09> { [ o, O, oslash, Ooblique ] }; + key <AD10> { [ p, P, thorn, THORN ] }; + key <AD11> { [ udiaeresis, Udiaeresis, dead_diaeresis,dead_abovering ] }; + key <AD12> { [ otilde, Otilde, section, dead_macron ] }; + + key <AC01> { [ a, A, ae, AE ] }; + key <AC02> { [ s, S, ssharp, section ] }; + key <AC03> { [ d, D, eth, ETH ] }; + key <AC04> { [ f, F, dstroke, ordfeminine ] }; + key <AC05> { [ g, G, eng, ENG ] }; + key <AC06> { [ h, H, hstroke, Hstroke ] }; + key <AC07> { [ j, J, j, J ] }; + key <AC08> { [ k, K, kra, ampersand ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AC10> { [ odiaeresis, Odiaeresis, dead_acute, dead_doubleacute ] }; + key <AC11> { [ adiaeresis, Adiaeresis, asciicircum, dead_caron ] }; + key <LSGT> { [ backslash, bar, degree, brokenbar ] }; + + key <BKSL> { [ apostrophe, asterisk, onehalf, dead_breve ] }; + key <AB01> { [ z, Z, zcaron, Zcaron ] }; + key <AB02> { [ x, X, guillemotright, greater ] }; + key <AB03> { [ c, C, cent, copyright ] }; + key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key <AB06> { [ n, N, ncedilla, Ncedilla ] }; + key <AB07> { [ m, M, mu, masculine ] }; + key <AB08> { [ comma, semicolon, less, multiply ] }; + key <AB09> { [ period, colon, greater, division ] }; + key <AB10> { [ minus, underscore, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ee(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/es b/dist/xkeyboard-config/symbols/sun_vndr/es index e863d6a97..3f8e032c1 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/es +++ b/dist/xkeyboard-config/symbols/sun_vndr/es @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -11,7 +10,7 @@ // 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 @@ -21,71 +20,127 @@ // 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. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { -partial + name[Group1]="Spain"; + + key <TLDE> { [ masculine, ordfeminine, backslash ] }; + key <LSGT> { [ less, greater ] }; + key <AE01> { [ 1, exclam, bar ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, periodcentered, numbersign ] }; + key <AE04> { [ 4, dollar, asciicircum ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, notsign ] }; + key <AE07> { [ 7, slash ] }; + key <AE08> { [ 8, parenleft ] }; + key <AE09> { [ 9, parenright ] }; + key <AE10> { [ 0, equal ] }; + key <AE11> { [ apostrophe, question, grave ] }; + key <AE12> { [ exclamdown, questiondown ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ dead_grave, dead_circumflex, bracketleft ] }; + key <AD12> { [ plus, asterisk, bracketright ] }; + key <AC10> { [ ntilde, Ntilde ] }; + key <AC11> { [ dead_acute, dead_diaeresis, braceleft ] }; + key <BKSL> { [ ccedilla, Ccedilla, braceright ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft ] }; - key <BRCR> { [ bracketright, braceright ], [ guillemotright ] }; - key <AE02> { [ 2, quotedbl ], [ at ] }; - key <AE03> { [ 3, periodcentered ], [ numbersign ] }; - key <AE05> { [ 5, percent ], [ degree ] }; - key <AE06> { [ 6, ampersand ], [ notsign ] }; + + name[Group1]="Spain - Sun type 4"; + + key <BKSL> { [ bracketleft, braceleft, guillemotleft ] }; + key <BRCR> { [ bracketright, braceright, guillemotright ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, periodcentered, numbersign ] }; + key <AE05> { [ 5, percent, degree ] }; + key <AE06> { [ 6, ampersand, notsign ] }; key <AE07> { [ 7, slash ] }; - key <AE08> { [ 8, parenleft ] }; - key <AE09> { [ 9, parenright ], [ backslash ] }; - key <AE10> { [ 0, equal ], [ bar ] }; - key <AE11> { [ quoteright, question ], [ quoteleft ] }; + key <AE08> { [ 8, parenleft ] }; + key <AE09> { [ 9, parenright, backslash ] }; + key <AE10> { [ 0, equal, bar ] }; + key <AE11> { [ quoteright, question, quoteleft ] }; key <AE12> { [ exclamdown, questiondown ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <AD09> { [ o, O ], [ masculine ] }; - key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ asciicircum ] }; - key <AD12> { [ plus, asterisk ], [ asciitilde ] }; - key <AC01> { [ a, A ], [ ordfeminine ] }; - key <AC10> { [ Ntilde ] }; - key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ] }; - key <TLDE> { [ Ccedilla ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD09> { [ o, O, masculine ] }; + key <AD11> { [ dead_grave, dead_circumflex, asciicircum ] }; + key <AD12> { [ plus, asterisk, asciitilde ] }; + key <AC01> { [ a, A, ordfeminine ] }; + key <AC10> { [ ntilde, Ntilde ] }; + key <AC11> { [ dead_acute, dead_diaeresis ] }; + key <TLDE> { [ ccedilla, Ccedilla ] }; key <RALT> { [ Alt_R ] }; key <LCTL> { [ Caps_Lock ] }; key <CAPS> { [ Control_L ] }; - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; + key <LSGT> { [ less, greater ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + }; + -partial +partial alphanumeric_keys xkb_symbols "type5" { - include "es" - - key <AE03> { [ 3, periodcentered ], [ numbersign ] }; - key <AE04> { [ 4, dollar ], [ asciicircum ] }; - key <AE05> { [ 5, percent ], [ asciitilde ] }; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <AE11> { [ quoteright, question ], [ quoteleft ] }; - - key <AD11> { [ SunFA_Grave, SunFA_Circum ], [ bracketleft ] }; + include "sun_vndr/es(type4)" - key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft ] }; + name[Group1]="Spain - Sun type 5"; + + key <AE03> { [ 3, periodcentered, numbersign ] }; + key <AE04> { [ 4, dollar, asciicircum ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE07> { [ 7, slash, braceleft ]}; + key <AE08> { [ 8, parenleft, bracketleft ]}; + key <AE09> { [ 9, parenright, bracketright ]}; + key <AE10> { [ 0, equal, braceright ]}; + key <AE11> { [ quoteright, question, quoteleft ] }; + key <AD11> { [ dead_grave, dead_circumflex, bracketleft ] }; + key <AD12> { [ dead_acute, dead_diaeresis, braceleft ] }; + + include "level3(ralt_switch)" }; -partial -xkb_symbols "type6" { - include "es(Sundeadkeys)" - key <AE04> { [ 4, dollar ], [ asciicircum ] }; - key <AE05> { [ 5, percent ], [ asciitilde ] }; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <AE11> { [ quoteright, question ], [ quoteleft ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/es(type6)" }; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/fi b/dist/xkeyboard-config/symbols/sun_vndr/fi index 2c524180e..2b203e1fc 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/fi +++ b/dist/xkeyboard-config/symbols/sun_vndr/fi @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -11,7 +10,7 @@ // 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 @@ -21,22 +20,71 @@ // 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. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Finland"; + + key <TLDE> { [ section, onehalf ] }; + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent ] }; + 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, backslash ] }; + key <AE12> { [ dead_acute, dead_grave ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, asciicircum, asciitilde ] }; + key <AC10> { [ odiaeresis, Odiaeresis ] }; + key <AC11> { [ adiaeresis, Adiaeresis ] }; + key <BKSL> { [ apostrophe, asterisk, quoteleft ] }; + key <LSGT> { [ less, greater, bar ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; -xkb_symbols "basic" { - include "fi" - // A few keys are different - key <AE11> { [ plus, question ], - [ backslash ] }; - key <AD12> { [ diaeresis, asciicircum ], - [ asciitilde ] }; - key <BKSL> { [ apostrophe, asterisk ], - [ quoteleft ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fi(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/fr b/dist/xkeyboard-config/symbols/sun_vndr/fr index 3517eed27..b705f1615 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/fr +++ b/dist/xkeyboard-config/symbols/sun_vndr/fr @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,66 +26,72 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -// NOTE: -// These are the French keyboard symbols -// French Swiss symbols are in sw -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - key <BKSL> { [ bracketleft, braceleft ] }; - key <BRCR> { [ bracketright, braceright ] }; - key <DELE> { [ Delete ] }; - - key <AE01> { [ ampersand, 1 ], [ ] }; - key <AE02> { [ eacute, 2 ], [ twosuperior ] }; - key <AE03> { [ quotedbl, 3 ], [ threesuperior ] }; - key <AE04> { [ quoteright, 4 ] }; - key <AE05> { [ parenleft, 5 ] }; - key <AE06> { [ section, 6 ], [ asciicircum ] }; - key <AE07> { [ egrave, 7 ] }; - key <AE08> { [ exclam, 8 ], [ sterling ] }; - key <AE09> { [ ccedilla, 9 ], [ backslash ] }; - key <AE10> { [ agrave, 0 ] }; - Key <AE11> { [ parenright, degree ], [ asciitilde ] }; - key <AE12> { [ minus, underscore ], [ numbersign ] }; - - key <AD01> { [ a, A ] }; - key <AD02> { [ z, Z ] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD11> { [ SunFA_Circum, SunFA_Diaeresis ] }; - key <AD12> { [ quoteleft, dollar ], [ at ] }; - - key <AC01> { [ q, Q ] }; - key <AC10> { [ m, M ], [ mu ] }; - key <AC11> { [ ugrave, percent ] }; - key <TLDE> { [ asterisk, bar ], [ currency ] }; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// - key <LSGT> { [ less, greater ] }; - key <AB01> { [ w, W ] }; +partial default alphanumeric_keys +xkb_symbols "type6" { - key <AB07> { [ comma, question ] }; - key <AB08> { [ semicolon, period ] }; - key <AB09> { [ colon, slash ] }; - key <AB10> { [ equal, plus ] }; + name[Group1]="France"; - key <CAPS> { [ SunAltGraph ] }; - key <ALGR> { [ Caps_Lock ] }; + key <TLDE> { [ twosuperior ] }; + key <AE01> { [ ampersand, 1 ] }; + key <AE02> { [ eacute, 2, asciitilde ] }; + key <AE03> { [ quotedbl, 3, numbersign ] }; + key <AE04> { [ apostrophe, 4, braceleft ] }; + key <AE05> { [ parenleft, 5, bracketleft ] }; + key <AE06> { [ minus, 6, bar ] }; + key <AE07> { [ egrave, 7, grave ] }; + key <AE08> { [ underscore, 8, backslash ] }; + key <AE09> { [ ccedilla, 9, asciicircum ] }; + key <AE10> { [ agrave, 0, at ] }; + key <AE11> { [ parenright, degree, bracketright ] }; + key <AE12> { [ equal, plus, braceright ] }; + key <AD01> { [ a, A ] }; + key <AD02> { [ z, Z ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ dead_circumflex, dead_diaeresis ] }; + key <AD12> { [ dollar, sterling, currency ] }; + key <AC01> { [ q, Q ] }; + key <AC10> { [ m, M ] }; + key <AC11> { [ ugrave, percent ] }; + key <BKSL> { [ asterisk, mu ] }; -}; + key <LSGT> { [ less, greater ] }; + key <AB01> { [ w, W ] }; + key <AB07> { [ comma, question ] }; + key <AB08> { [ semicolon, period ] }; + key <AB09> { [ colon, slash ] }; + key <AB10> { [ exclam, section ] }; -xkb_symbols "type5" { - include "fr" + include "level3(ralt_switch)" - key <LSGT> { [ less, greater ] }; }; -xkb_symbols "type6" { - include "sun_vndr/us(type6)" - include "fr" - key <LSGT> { [ less, greater ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fr(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/gb b/dist/xkeyboard-config/symbols/sun_vndr/gb index d2c21124d..8fa71456c 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/gb +++ b/dist/xkeyboard-config/symbols/sun_vndr/gb @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,27 +26,78 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key <AE01> { [ 1, exclam ], [brokenbar ] }; - key <AE03> { [ 3, sterling ], [numbersign ] }; - key <AE04> { [ 4, dollar ], [EuroSign ] }; - key <AE11> { [ minus, underscore ], [notsign ] }; - key <AD03> { [ e, E ], [EuroSign ] }; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="United Kingdom"; + + key <TLDE> { [ quoteleft, notsign, brokenbar ] }; + + key <AE02> { [ 2, quotedbl ] }; + key <AE03> { [ 3, sterling ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <BKSL> { [ numbersign, asciitilde ] }; + key <AC11> { [ apostrophe, at ] }; + key <LSGT> { [ backslash, bar ] }; + + include "level3(ralt_switch)" }; -partial + +partial alphanumeric_keys xkb_symbols "type5" { - include "gb(Sundeadkeys)" - key <TLDE> { [ quoteleft, notsign ], [ brokenbar ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; + name[Group1]="United Kingdom - Sun type 5"; + + key <TLDE> { [ quoteleft, notsign, brokenbar ] }; + key <AD03> { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + }; -partial -xkb_symbols "type6" { - include "sun_vndr/gb(type5)" + +partial alphanumeric_keys +xkb_symbols "type4" { + + name[Group1]="United Kingdom - Sun type 4"; + + key <AE01> { [ 1, exclam, brokenbar ] }; + key <AE03> { [ 3, sterling, numbersign ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <AE11> { [ minus, underscore, notsign ] }; + key <AD03> { [ e, E, EuroSign ] }; + + include "level3(ralt_switch)" + }; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gb(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/gr b/dist/xkeyboard-config/symbols/sun_vndr/gr index cce87510b..04fcdb0d3 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/gr +++ b/dist/xkeyboard-config/symbols/sun_vndr/gr @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,12 +27,92 @@ // of the copyright holder. // -xkb_symbols "type5" { - include "sun_vndr/us(type5basic)" - // A few keys are different - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AD03> { [ e, E], [ EuroSign ] }; - key <AC10> { [ dead_acute, dead_diaeresis ] }; - key <LSGT> { [ backslash, bar ] }; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Greece"; + + + key <TLDE> { [ grave, asciitilde, onehalf ] }; + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <AE05> { [ 5, percent, EuroSign ] }; + key <AE06> { [ 6, asciicircum, notsign ] }; + key <AE07> { [ 7, ampersand ] }; + key <AE08> { [ 8, asterisk ] }; + key <AE09> { [ 9, parenleft ] }; + key <AE10> { [ 0, parenright, degree ] }; + key <AE11> { [ minus, underscore, plusminus ] }; + key <AE12> { [ equal, plus ] }; + + key <AD01> { [ semicolon, colon, periodcentered ] }; + key <AD02> { [ Greek_finalsmallsigma, periodcentered, Greek_SIGMA ] }; + key <AD03> { [ Greek_epsilon, Greek_EPSILON, EuroSign ] }; + key <AD04> { [ Greek_rho, Greek_RHO, registered ] }; + key <AD05> { [ Greek_tau, Greek_TAU ] }; + key <AD06> { [ Greek_upsilon, Greek_UPSILON ] }; + key <AD07> { [ Greek_theta, Greek_THETA ] }; + key <AD08> { [ Greek_iota, Greek_IOTA ] }; + key <AD09> { [ Greek_omicron, Greek_OMICRON ] }; + key <AD10> { [ Greek_pi, Greek_PI ] }; + key <AD11> { [ bracketleft, braceleft, guillemotleft ] }; + key <AD12> { [ bracketright, braceright, guillemotright ] }; + + key <AC01> { [ Greek_alpha, Greek_ALPHA ] }; + key <AC02> { [ Greek_sigma, Greek_SIGMA ] }; + key <AC03> { [ Greek_delta, Greek_DELTA ] }; + key <AC04> { [ Greek_phi, Greek_PHI ] }; + key <AC05> { [ Greek_gamma, Greek_GAMMA ] }; + key <AC06> { [ Greek_eta, Greek_ETA ] }; + key <AC07> { [ Greek_xi, Greek_XI ] }; + key <AC08> { [ Greek_kappa, Greek_KAPPA ] }; + key <AC09> { [ Greek_lamda, Greek_LAMDA ] }; + key <AC10> { [ dead_acute, dead_diaeresis ] }; + key <AC11> { [ apostrophe, quotedbl ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; + + key <LSGT> { [ guillemotleft, guillemotright, brokenbar ] }; + key <AB01> { [ Greek_zeta, Greek_ZETA ] }; + key <AB02> { [ Greek_chi, Greek_CHI ] }; + key <AB03> { [ Greek_psi, Greek_PSI, copyright ] }; + key <AB04> { [ Greek_omega, Greek_OMEGA ] }; + key <AB05> { [ Greek_beta, Greek_BETA ] }; + key <AB06> { [ Greek_nu, Greek_NU ] }; + key <AB07> { [ Greek_mu, Greek_MU ] }; + key <AB08> { [ comma, less, guillemotleft ] }; + key <AB09> { [ period, greater, guillemotright ] }; + key <AB10> { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gr(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/hu b/dist/xkeyboard-config/symbols/sun_vndr/hu deleted file mode 100644 index 62eb551d9..000000000 --- a/dist/xkeyboard-config/symbols/sun_vndr/hu +++ /dev/null @@ -1,94 +0,0 @@ -// $XdotOrg: $ -// -// 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. -// -// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ -default partial alphanumeric_keys -xkb_symbols "type5" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Hungarian keyboard. - - // Alphanumeric section - - name[group1]="Hungarian"; - - key <TLDE> { [ 0, section ] }; - key <AE01> { [ 1, apostrophe ] }; - key <AE02> { [ 2, quotedbl ] }; - key <AE03> { [ 3, plus ], - [ numbersign ] }; - key <AE04> { [ 4, exclam ], - [ dollar ] }; - key <AE06> { [ 6, slash ], - [ asciicircum ] }; - key <AE07> { [ 7, equal ], - [ braceleft ] }; - key <AE08> { [ 8, parenleft ], - [ bracketleft ] }; - key <AE09> { [ 9, parenright ], - [ bracketright ] }; - key <AE10> { [ odiaeresis, Odiaeresis ], - [ braceright ] }; - key <AE11> { [ udiaeresis, Udiaeresis ], - [ backslash ] }; - key <AE12> { [ oacute, Oacute ], - [ asciitilde ] }; - - key <AD01> { [ q, Q ], - [ at ] }; - key <AD06> { [ z, Z ] }; - key <AD11> { [ odoubleacute, Odoubleacute ] }; - key <AD12> { [ uacute, Uacute ] }; - - key <AC02> { [ s, S ], - [ ssharp ] }; - key <AC08> { [ k, K ], - [ ampersand ] }; - key <AC10> { [ eacute, Eacute ], - [ semicolon ] }; - key <AC11> { [ aacute, Aacute ], - [ adiaeresis, Adiaeresis ] }; - key <BKSL> { [ udoubleacute, Udoubleacute ] }; - - key <LSGT> { [ iacute, Iacute ], - [ bar ] }; - key <AB01> { [ y, Y ], - [ less ] }; - key <AB02> { [ x, X ], - [ greater ] }; - key <AB03> { [ c, C ], - [ quoteleft ] }; - key <AB08> { [ comma, question ], - [ asterisk ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - - // End alphanumeric section -}; - diff --git a/dist/xkeyboard-config/symbols/sun_vndr/it b/dist/xkeyboard-config/symbols/sun_vndr/it index 6f42aa109..96482912b 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/it +++ b/dist/xkeyboard-config/symbols/sun_vndr/it @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,51 +26,116 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Italy"; + + key <LSGT> { [ less, greater ] }; + key <TLDE> { [ backslash, bar ] }; + key <AE02> { [ 2, quotedbl ] }; + key <AE03> { [ 3, sterling ] }; + key <AE06> { [ 6, ampersand ] }; + key <AE07> { [ 7, slash ] }; + key <AE08> { [ 8, parenleft, braceleft ] }; + key <AE09> { [ 9, parenright, braceright ] }; + key <AE10> { [ 0, equal ] }; + key <AE11> { [ apostrophe, question, grave ] }; + key <AE12> { [ igrave, asciicircum ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ egrave, eacute, bracketleft, dead_abovering ] }; + key <AD12> { [ plus, asterisk, bracketright ] }; + key <BKSL> { [ ugrave, section, asciitilde ] }; + key <AC10> { [ ograve, ccedilla, at ] }; + key <AC11> { [ agrave, degree, numbersign ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - key <BKSL> { [ bracketleft, braceleft ], [ guillemotleft ] }; - key <BRCR> { [ bracketright, braceright ], [ guillemotright ] }; - key <AE02> { [ 2, quotedbl ], [ twosuperior ] }; - key <AE03> { [ 3, sterling ], [ threesuperior ] }; - key <AE06> { [ 6, ampersand ], [ notsign ] }; - key <AE06> { [ 7, slash ] }; - key <AE06> { [ 8, parenleft ] }; - key <AE09> { [ 9, parenright ], [ backslash ] }; - key <AE10> { [ 0, equal ], [ bar ] }; - key <AE11> { [ quoteright, question ], [ quoteleft ] }; - key <AE12> { [ igrave, asciicircum ] }; - - key <AD11> { [ egrave, eacute ] }; - key <AD12> { [ plus, asterisk ], [ asciitilde ] }; - - key <AC10> { [ ograve, ccedilla ], [ at ] }; - key <AC11> { [ agrave, degree ], [ numbersign ] }; - key <TLDE> { [ ugrave, section ] }; - - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - - - key <LALT> { [ Alt_L ] }; - key <COMP> { [ SunCompose ] }; - key <RALT> { [ SunAltGraph ] }; - key <LCTL> { [ Caps_Lock ] }; - key <CAPS> { [ Control_L ] }; + name[Group1]="Italy - Sun type 4"; + + key <BKSL> { [ bracketleft, braceleft, guillemotleft ] }; + key <BRCR> { [ bracketright, braceright, guillemotright ] }; + key <AE02> { [ 2, quotedbl, twosuperior ] }; + key <AE03> { [ 3, sterling, threesuperior ] }; + key <AE06> { [ 6, ampersand, notsign ] }; + key <AE06> { [ 7, slash ] }; + key <AE06> { [ 8, parenleft ] }; + key <AE09> { [ 9, parenright, backslash ] }; + key <AE10> { [ 0, equal, bar ] }; + key <AE11> { [ quoteright, question, quoteleft ] }; + key <AE12> { [ igrave, asciicircum ] }; + + key <AD11> { [ egrave, eacute ] }; + key <AD12> { [ plus, asterisk, asciitilde ] }; + + key <AC10> { [ ograve, ccedilla, at ] }; + key <AC11> { [ agrave, degree, numbersign ] }; + key <TLDE> { [ ugrave, section ] }; + + key <LSGT> { [ less, greater ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + + key <LALT> { [ Alt_L ] }; + key <COMP> { [ SunCompose ] }; + key <RALT> { [ SunAltGraph ] }; + key <LCTL> { [ Caps_Lock ] }; + key <CAPS> { [ Control_L ] }; + + include "level3(ralt_switch)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "it" - key <AE08> { [ 8, parenleft ], [ braceleft ] }; - key <AE09> { [ 9, parenright ], [ braceright ] }; + name[Group1]="Italy - Sun type 5"; + + key <AE08> { [ 8, parenleft, braceleft ] }; + key <AE09> { [ 9, parenright, braceright ] }; + key <BKSL> { [ ugrave, section, asciitilde ] }; + + include "level3(ralt_switch)" - key <BKSL> { [ ugrave, section ], [ asciitilde ] }; }; + -partial -xkb_symbols "type6" { - include "sun_vndr/it(type5)" +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/it(type6)" }; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/jp b/dist/xkeyboard-config/symbols/sun_vndr/jp index dd06b8bd1..14f1971e3 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/jp +++ b/dist/xkeyboard-config/symbols/sun_vndr/jp @@ -1,6 +1,6 @@ // $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -51,6 +51,27 @@ // // US/ASCII layout for a Type 4 Sun keyboard +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + xkb_symbols "basic" { // Alphanumeric section key <AE01> { [ 1, exclam ], [ kana_NU ] }; @@ -791,8 +812,8 @@ partial xkb_symbols "type7" { include "sun_vndr/jp(type6)" key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ] }; - key <HZTG> { [ Henkan_Mode ] }; + key <TLDE> { [ Henkan_Mode ] }; key <HENK> { [ Kana_Lock, Mode_switch ] }; - key <ALGR> { [ Alt_R ] }; + key <ALGR> { [ Alt_R, Alt_R ] }; }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ko b/dist/xkeyboard-config/symbols/sun_vndr/kr index ba26c5159..57137219e 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/ko +++ b/dist/xkeyboard-config/symbols/sun_vndr/kr @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,36 +27,72 @@ // of the copyright holder. // // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +// Korean layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + + // A few keys are different + key <ALGR> { [ Hangul ] }; + key <COMP> { [ Hangul_Hanja ] }; + key <KANA> { [ Hangul ] }; + key <EISU> { [ Hangul_Hanja ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + +}; + + // Korean layout for a Type 4 Sun keyboard xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; key <LNFD> { [ Hangul ] }; key <RALT> { [ Linefeed ] }; key <COMP> { [ Hangul_Hanja ] }; + include "level3(ralt_switch)" + }; // Korean layout for a Type 5 Sun keyboard xkb_symbols "type5" { -// include "sun_vndr/us(type5basic)" // A few keys are different key <ALGR> { [ Hangul ] }; key <COMP> { [ Hangul_Hanja ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; + + include "level3(ralt_switch)" + }; -// Korean layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { -// include "sun_vndr/us(type5basic)" - // A few keys are different - key <ALGR> { [ Hangul ] }; - key <COMP> { [ Hangul_Hanja ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/kr(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/lt b/dist/xkeyboard-config/symbols/sun_vndr/lt index e9840a10e..bba964312 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/lt +++ b/dist/xkeyboard-config/symbols/sun_vndr/lt @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,55 +26,94 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ -default partial alphanumeric_keys -xkb_symbols "type5" { - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Hungarian keyboard. +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { - // Alphanumeric section + name[Group1]="Lithuania"; - name[group1]="Lithuanian"; - key <TLDE> { [ quoteright, asciitilde ], - [ quoteleft, caron ] }; - key <AE02> { [ 2, quotedbl ], - [ at ] }; - key <AE03> { [ 3, slash ], - [ numbersign ] }; - key <AE04> { [ 4, semicolon ], - [ dollar ] }; - key <AE05> { [ 5, colon ], - [ percent ] }; - key <AE06> { [ 6, comma ], - [ asciicircum ] }; - key <AE07> { [ 7, period ], - [ ampersand ] }; - key <AE08> { [ 8, question ], - [ asterisk ] }; - key <AE09> { [ 9, parenleft ], - [ bracketleft, braceleft ] }; - key <AE10> { [ 0, parenright ], - [ bracketright, braceright ] }; - key <AD01> { [ aogonek, Aogonek ], - [ q, Q ] }; - key <AD02> { [ zcaron, Zcaron ], - [ w, W ] }; - key <AD11> { [ iogonek, Iogonek ] }; - key <AD12> { [ ogonek ] }; - key <AC10> { [ uogonek, Uogonek ] }; - key <AC11> { [ eabovedot, Eabovedot ] }; - key <BKSL> { [ asciicircum, quoteright ] }; - key <LSGT> { [ backslash, bar ] }; - key <AB02> { [ umacron, Umacron ], - [ x, X ] }; - key <AB08> { [ ccaron, Ccaron ], - [ less ] }; - key <AB09> { [ scaron, Scaron ], - [ greater ] }; - key <AB10> { [ eogonek, Eogonek ] }; - // End alphanumeric section + key <TLDE> { [ quoteleft, asciitilde, notsign, brokenbar ] }; + 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> { [ doublelowquotemark, parenleft, 9, parenleft ] }; + key <AE10> { [ leftdoublequotemark, parenright, 0, parenright ] }; + key <AE11> { [ minus, underscore, backslash, questiondown ] }; + key <AE12> { [ zcaron, Zcaron, equal, plus ] }; + + key <AD01> { [ q, Q, at, Greek_OMEGA ] }; + key <AD02> { [ w, W, lstroke, Lstroke ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, paragraph, registered ] }; + key <AD05> { [ t, T, tslash, Tslash ] }; + key <AD06> { [ y, Y, leftarrow, yen ] }; + key <AD07> { [ u, U, downarrow, uparrow ] }; + key <AD08> { [ i, I, rightarrow, idotless ] }; + key <AD09> { [ o, O, oslash, Ooblique ] }; + key <AD10> { [ p, P, thorn, THORN ] }; + key <AD11> { [ bracketleft, braceleft, dead_diaeresis, dead_abovering ] }; + key <AD12> { [ bracketright, braceright, dead_tilde, dead_macron ] }; + + key <AC01> { [ a, A, ae, AE ] }; + key <AC02> { [ s, S, ssharp, section ] }; + key <AC03> { [ d, D, eth, ETH ] }; + key <AC04> { [ f, F, dstroke, ordfeminine ] }; + key <AC05> { [ g, G, eng, ENG ] }; + key <AC06> { [ h, H, hstroke, Hstroke ] }; + key <AC07> { [ j, J ] }; + key <AC08> { [ k, K, kra, ampersand ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AC10> { [ semicolon, colon, dead_acute, dead_doubleacute ] }; + key <AC11> { [ apostrophe, quotedbl, dead_circumflex, dead_caron ] }; + key <LSGT> { [ backslash, bar, dead_grave, dead_breve ] }; + + key <BKSL> { [ backslash, bar, dead_grave, dead_breve ] }; + key <AB01> { [ z, Z, guillemotleft, less ] }; + key <AB02> { [ x, X, guillemotright, greater ] }; + key <AB03> { [ c, C, cent, copyright ] }; + key <AB04> { [ v, V, leftdoublequotemark, leftsinglequotemark ] }; + key <AB05> { [ b, B, rightdoublequotemark, rightsinglequotemark ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M, mu, masculine ] }; + key <AB08> { [ comma, less, ampersand, multiply ] }; + key <AB09> { [ period, greater, periodcentered, division ] }; + key <AB10> { [ slash, question, dead_belowdot, dead_abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lt(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/lv b/dist/xkeyboard-config/symbols/sun_vndr/lv index 442242e53..f5508371d 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/lv +++ b/dist/xkeyboard-config/symbols/sun_vndr/lv @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,48 +27,92 @@ // of the copyright holder. // -default partial alphanumeric_keys -xkb_symbols "type5" { +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Latvian keyboard. +partial default alphanumeric_keys +xkb_symbols "type6" { - // Alphanumeric section + name[Group1]="Latvia"; - name[group1]="Latvian"; - key <AE04> { [ 4, dollar ], - [ section ] }; - key <AE08> { [ 8, asterisk ], - [ multiply ] }; - key <AD03> { [ e, E ], - [ emacron, Emacron ] }; - key <AD04> { [ r, R ], - [ rcedilla, Rcedilla ] }; - key <AD07> { [ u, U ], - [ umacron, Umacron ] }; - key <AD08> { [ i, I ], - [ imacron, Imacron ] }; - key <AD09> { [ o, O ], - [ omacron, Omacron ] }; - key <AC01> { [ a, A ], - [ amacron, Amacron ] }; - key <AC02> { [ s, S ], - [ scaron, Scaron ] }; - key <AC05> { [ g, G ], - [ gcedilla, Gcedilla ] }; - key <AC08> { [ k, K ], - [ kcedilla, Kcedilla ] }; - key <AC09> { [ l, L ], - [ lcedilla, Lcedilla ] }; - key <BKSL> { [ degree, bar ] }; - key <LSGT> { [ backslash, bar ] }; - key <AB01> { [ z, Z ], - [ zcaron, Zcaron ] }; - key <AB03> { [ c, C ], - [ ccaron, ccaron ] }; - key <AB06> { [ n, N ], - [ ncedilla, Ncedilla ] }; - // End alphanumeric section + key <TLDE> { [ grave, asciitilde, acute, asciitilde ] }; + key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; + key <AE02> { [ 2, at, twosuperior, oneeighth ] }; + key <AE03> { [ 3, numbersign, threesuperior, sterling ] }; + key <AE04> { [ 4, dollar, EuroSign, cent ] }; + key <AE05> { [ 5, percent, onehalf, threeeighths ] }; + key <AE06> { [ 6, asciicircum, threequarters, fiveeighths ] }; + key <AE07> { [ 7, ampersand, braceleft, seveneighths ] }; + key <AE08> { [ 8, asterisk, bracketleft, trademark ] }; + key <AE09> { [ 9, parenleft, bracketright, plusminus ] }; + key <AE10> { [ 0, parenright, braceright, degree ] }; + key <AE11> { [ minus, underscore, backslash, questiondown ] }; + key <AE12> { [ equal, plus, endash, emdash ] }; + + key <AD01> { [ q, Q, q, Q ] }; + key <AD02> { [ w, W, w, W ] }; + key <AD03> { [ e, E, emacron, Emacron ] }; + key <AD04> { [ r, R, rcedilla, Rcedilla ] }; + key <AD05> { [ t, T, t, T ] }; + key <AD06> { [ y, Y, y, Y ] }; + key <AD07> { [ u, U, umacron, Umacron ] }; + key <AD08> { [ i, I, imacron, Imacron ] }; + key <AD09> { [ o, O, omacron, Omacron ] }; + key <AD10> { [ p, P, p, P ] }; + key <AD11> { [ bracketleft, braceleft, guillemotleft, leftdoublequotemark ] }; + key <AD12> { [ bracketright, braceright, guillemotright, rightdoublequotemark ] }; + + key <AC01> { [ a, A, amacron, Amacron ] }; + key <AC02> { [ s, S, scaron, Scaron ] }; + key <AC03> { [ d, D, d, D ] }; + key <AC04> { [ f, F, f, F ] }; + key <AC05> { [ g, G, gcedilla, Gcedilla ] }; + key <AC06> { [ h, H, h, H ] }; + key <AC07> { [ j, J, j, J ] }; + key <AC08> { [ k, K, kcedilla, Kcedilla ] }; + key <AC09> { [ l, L, lcedilla, Lcedilla ] }; + key <AC10> { [ semicolon, colon, semicolon, colon ] }; + key <AC11> { [ apostrophe, quotedbl, leftdoublequotemark, doublelowquotemark ] }; + key <LSGT> { [ backslash, bar, degree, brokenbar ] }; + + key <BKSL> { [ backslash, bar, grave, breve ] }; + key <AB01> { [ z, Z, zcaron, Zcaron ] }; + key <AB02> { [ x, X, x, X ] }; + key <AB03> { [ c, C, ccaron, Ccaron ] }; + key <AB04> { [ v, V, v, V ] }; + key <AB05> { [ b, B, b, B ] }; + key <AB06> { [ n, N, ncedilla, Ncedilla ] }; + key <AB07> { [ m, M, m, M ] }; + key <AB08> { [ comma, less, horizconnector, multiply ] }; + key <AB09> { [ period, greater, periodcentered, division ] }; + key <AB10> { [ slash, question, slash, abovedot ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lv(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/nl b/dist/xkeyboard-config/symbols/sun_vndr/nl index 0feb57be7..42a5afb2c 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/nl +++ b/dist/xkeyboard-config/symbols/sun_vndr/nl @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,42 +26,124 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +default partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Netherlands"; + + key <TLDE> { [ at, section, notsign ] }; + key <AE01> { [ 1, exclam, onesuperior ] }; + key <AE02> { [ 2, quotedbl, twosuperior ] }; + key <AE03> { [ 3, numbersign, threesuperior ] }; + key <AE04> { [ 4, dollar, onequarter ] }; + key <AE05> { [ 5, percent, onehalf ] }; + key <AE06> { [ 6, ampersand, threequarters ] }; + key <AE07> { [ 7, underscore, sterling ] }; + key <AE08> { [ 8, parenleft, braceleft ] }; + key <AE09> { [ 9, parenright, braceright ] }; + key <AE10> { [ 0, quoteright, quoteleft ] }; + key <AE11> { [ slash, question, backslash ] }; + key <AE12> { [ degree, dead_tilde, dead_cedilla ] }; + + key <AD03> { [ e, E, EuroSign ] }; + key <AD05> { [ t, T ] }; + key <AD06> { [ y, Y ] }; + key <AD07> { [ u, U ] }; + key <AD08> { [ i, I ] }; + key <AD09> { [ o, O ] }; + key <AD10> { [ p, P ] }; + key <AD11> { [dead_diaeresis, dead_circumflex ] }; + key <AD12> { [ asterisk, bar, asciitilde ] }; + + key <AC01> { [ a, A ] }; + key <AC02> { [ s, S, ssharp ] }; + key <AC04> { [ f, F ] }; + key <AC10> { [ plus, plusminus ] }; + key <AC11> { [dead_acute, dead_grave ] }; + key <BKSL> { [ less, greater, asciicircum ] }; + + key <LSGT> { [bracketright, bracketleft, brokenbar ] }; + key <AB01> { [ z, Z, guillemotleft ] }; + key <AB02> { [ x, X, guillemotright ] }; + key <AB03> { [ c, C, cent ] }; + key <AB06> { [ n, N ] }; + key <AB07> { [ m, M, mu ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, equal ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - - key <BKSL> { [ at, section ], [notsign ] }; - key <BRCR> { [ backslash, bar ] }; - key <AE01> { [ 1, exclam ], [onesuperior ] }; - key <AE02> { [ 2, quotedbl ], [twosuperior ] }; - key <AE03> { [ 3, numbersign ], [threesuperior] }; - key <AE04> { [ 4, dollar ], [onequarter ] }; - key <AE05> { [ 5, percent ], [onehalf ] }; - key <AE06> { [ 6, ampersand ], [threequarters] }; - key <AE07> { [ 7, underscore ], [sterling ] }; - key <AE08> { [ 8, parenleft ], [braceleft ] }; - key <AE09> { [ 9, parenright ], [braceright ] }; - key <AE10> { [ 0, quoteright ], [quoteleft ] }; - key <AE11> { [ slash, question ] }; - key <AE12> { [ degree, SunFA_Tilde ], [SunFA_Cedilla] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD11> { [ SunFA_Diaeresis, asciicircum], [SunFA_Circum]}; - key <AD12> { [ asterisk, brokenbar ], [asciitilde ] }; - key <AC02> { [ S, NoSymbol ], [ssharp ] }; - key <AC10> { [ plus, plusminus ] }; - key <AC11> { [ SunFA_Acute, SunFA_Grave] }; - key <TLDE> { [ less, greater ] }; - key <LSGT> { [ bracketright, bracketleft] }; - key <AB01> { [ Z, NoSymbol ], [guillemotleft] }; - key <AB02> { [ X, NoSymbol ], [guillemotright] }; - key <AB03> { [ C, NoSymbol ], [cent ] }; - key <AB07> { [ M, NoSymbol ], [mu ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, equal ] }; - key <CAPS> { [ SunAltGraph ] }; -// key <COMP> { [ SunCompose ] }; - key <ALGR> { [ Caps_Lock ] }; - + + name[Group1]="Netherlands - Sun type 4"; + + key <BKSL> { [ at, section, notsign ] }; + key <BRCR> { [ backslash, bar ] }; + key <AE01> { [ 1, exclam, onesuperior ] }; + key <AE02> { [ 2, quotedbl, twosuperior ] }; + key <AE03> { [ 3, numbersign, threesuperior] }; + key <AE04> { [ 4, dollar, onequarter ] }; + key <AE05> { [ 5, percent, onehalf ] }; + key <AE06> { [ 6, ampersand, threequarters] }; + key <AE07> { [ 7, underscore, sterling ] }; + key <AE08> { [ 8, parenleft, braceleft ] }; + key <AE09> { [ 9, parenright, braceright ] }; + key <AE10> { [ 0, quoteright, quoteleft ] }; + key <AE11> { [ slash, question, backslash ] }; + key <AE12> { [ degree, dead_tilde, dead_cedilla] }; + key <AD03> { [ e, E, EuroSign, Eacute ]}; + key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]}; + key <AD12> { [ asterisk, bar, asciitilde ] }; + key <AC02> { [ S, S, ssharp ] }; + key <AC10> { [ plus, plusminus ] }; + key <AC11> { [ dead_acute, dead_grave ] }; + key <TLDE> { [ less, greater, asciicircum ] }; + key <LSGT> { [ bracketleft, bracketright, brokenbar ] }; + key <AB01> { [ z, Z, guillemotleft] }; + key <AB02> { [ x, X, guillemotright] }; + key <AB03> { [ c, C, cent ] }; + key <AB07> { [ m, M, Greek_mu, masculine ] }; + key <AB08> { [ comma, semicolon, cedilla, guillemotleft] }; + key <AB09> { [ period, colon, periodcentered, guillemotright ] }; + key <AB10> { [ minus, equal, hyphen ] }; + key <CAPS> { [ SunAltGraph ] }; +// key <COMP> { [ SunCompose ] }; + key <ALGR> { [ Caps_Lock ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/nl(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/no b/dist/xkeyboard-config/symbols/sun_vndr/no index 471e5e13d..cc8419c39 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/no +++ b/dist/xkeyboard-config/symbols/sun_vndr/no @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,50 +27,119 @@ // of the copyright holder. // +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Norway"; + + key <TLDE> { [ bar, section ] }; + key <LSGT> { [ less, greater ] }; + key <BKSL> { [ apostrophe, asterisk, grave ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, asciicircum ] }; + 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> { [ backslash, dead_grave, dead_acute ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key <AC10> { [ oslash, Oslash ] }; + key <AC11> { [ ae, AE ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // A few keys are different - - key <BKSL> { [ bar, section ] }; - key <BRCR> { [ asciitilde, asciicircum] }; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, numbersign ], [sterling ] }; - key <AE04> { [ 4, currency ], [dollar ] }; - 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> { [ backslash, SunFA_Grave], [SunFA_Acute] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD11> { [ Aring ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Circum],[SunFA_Tilde] }; - key <LCTL> { [ Caps_Lock ] }; - key <AC10> { [ Ooblique ] }; - key <AC11> { [ AE ] }; - key <TLDE> { [ quoteright, asterisk ], [quoteleft ] }; - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <CAPS> { [ Control_L ] }; + + name[Group1]="Norway - Sun type 4"; + + key <BKSL> { [ bar, section ] }; + key <BRCR> { [ asciitilde, asciicircum] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + 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> { [ backslash, dead_grave, dead_acute ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde ] }; + key <LCTL> { [ Caps_Lock ] }; + key <AC10> { [ Ooblique ] }; + key <AC11> { [ ae, AE ] }; + key <TLDE> { [ quoteright, asterisk, quoteleft ] }; + key <LSGT> { [ less, greater ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + key <CAPS> { [ Control_L ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "no" + + name[Group1]="Norway - Sun type 5"; + + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, asciicircum ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketright ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; - key <AE05> { [ 5, percent ], [asciitilde ]}; - key <AE06> { [ 6, ampersand ], [asciicircum ]}; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketright ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; + key <BKSL> { [ quoteright, asterisk, quoteleft ] }; + key <LSGT> { [ less, greater ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" - key <BKSL> { [ quoteright, asterisk ], [ quoteleft ]}; - key <LSGT> { [ less, greater ] }; }; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/no(type6)" +}; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/pl b/dist/xkeyboard-config/symbols/sun_vndr/pl index 7c5362020..e4d13b38d 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/pl +++ b/dist/xkeyboard-config/symbols/sun_vndr/pl @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,30 +27,76 @@ // of the copyright holder. // -xkb_symbols "type5" { - include "sun_vndr/us(type5basic)" - // A few keys are different - key <TLDE> { [ quoteleft, asciitilde], [ degree, degree ] }; - key <AE02> { [ 2, quotedbl ], [ at ] }; - key <AE03> { [ 3, colon ], [ numbersign ] }; - key <AE04> { [ 4, question ], [ dollar ] }; - key <AE06> { [ 6, plus ], [ asciicircum ] }; - key <AE07> { [ 7, underscore ], [ ampersand ] }; - key <AE08> { [ 8, parenleft ], [ asterisk ] }; - key <AE09> { [ 9, parenright ] }; - key <AE10> { [ 0, equal ] }; - key <AE11> { [ zabovedot, Zabovedot ] }; - key <AE12> { [ dead_ogonek, Aacute ] }; - key <AD11> { [ oacute, zacute ], [ bracketleft, braceleft ] }; - key <AD12> { [ slash, section ], [ bracketright, braceright ] }; - key <AC02> { [ s, S ], [ ssharp ] }; - key <AC08> { [ k, K ], [ ampersand ] }; - key <AC10> { [ lstroke, Lstroke ] }; - key <AC11> { [ aogonek, eogonek ], [ quoteright ] }; - key <BKSL> { [ backslash, semicolon ], [ currency, bar ] }; - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, sacute ], [ less ] }; - key <AB09> { [ period, nacute ], [ greater ] }; - key <AB10> { [ minus, cacute ] }; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Polish Developers"; + + key <TLDE> { [ grave, asciitilde ] }; + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, at ] }; + key <AE03> { [ 3, numbersign ] }; + key <AE04> { [ 4, dollar ] }; + key <AE05> { [ 5, percent ] }; + key <AE06> { [ 6, asciicirum ] }; + key <AE07> { [ 7, ampersand ] }; + key <AE08> { [ 8, asterisk ] }; + key <AE09> { [ 9, parenleft ] }; + key <AE10> { [ 0, parenright ] }; + key <AE11> { [ minus, underscore ] }; + key <AE12> { [ equal, plus ] }; + + key <AD03> { [ e, E, eogonek, Eogonek ] }; + key <AD07> { [ u, U, EuroSign ] }; + key <AD09> { [ o, O, oacute, Oacute ] }; + key <AD11> { [ bracketleft, braceleft ] }; + key <AD12> { [ bracketright, braceright ] }; + + key <AC01> { [ a, A, aogonek, Aogonek ] }; + key <AC02> { [ s, S, sacute, Sacute ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AC10> { [ semicolon, colon ] }; + key <AC11> { [ apostrophe, quotedbl ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; + + key <LSGT> { [ less, greater, bar, brokenbar ] }; + key <AB01> { [ z, Z, zabovedot, Zabovedot ] }; + key <AB02> { [ x, X, zacute, Zacute ] }; + key <AB03> { [ c, C, cacute, Cacute ] }; + key <AB06> { [ n, N, nacute, Nacute ] }; + key <AB08> { [ comma, less ] }; + key <AB09> { [ period, greater ] }; + key <AB10> { [ slash, question ] }; + + include "level3(ralt_switch)" + +}; + + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pl(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/pt b/dist/xkeyboard-config/symbols/sun_vndr/pt index 8fdf8549d..8d21d765b 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/pt +++ b/dist/xkeyboard-config/symbols/sun_vndr/pt @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,62 +26,118 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Portugal"; + + key <LSGT> { [ less, greater ] }; + key <TLDE> { [ backslash, bar ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, dollar, section ] }; + key <AE05> { [ 5, percent, asciitilde ] }; + key <AE06> { [ 6, ampersand, asciicircum ] }; + key <AE07> { [ 7, slash, braceleft ] }; + key <AE08> { [ 8, parenleft, bracketleft ] }; + key <AE09> { [ 9, parenright, bracketright ] }; + key <AE10> { [ 0, equal, braceright ] }; + key <AE11> { [ quoteright, question, quoteleft ] }; + key <AE12> { [ guillemotleft, guillemotright ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ plus, asterisk, dead_diaeresis ] }; + key <AD12> { [ dead_acute, dead_grave ] }; + key <BKSL> { [ dead_tilde, dead_circumflex ] }; + key <AC10> { [ ccedilla, Ccedilla ] }; + key <AC11> { [ masculine, ordfeminine ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys xkb_symbols "type4" { - //this is a Portugal4 keyboard - - key <BKSL> { [ bracketleft, braceleft], [guillemotleft] }; - key <BRCR> { [ bracketright, braceright], [guillemotright] }; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, numbersign ], [sterling ] }; - key <AE04> { [ 4, dollar ], [section ] }; - key <AE06> { [ 6, ampersand ], [notsign ] }; - key <AE07> { [ 7, slash ] }; - key <AE08> { [ 8, parenleft ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [bar ] }; - key <AE11> { [ quoteright, question ], [quoteleft ] }; - key <AE12> { [ exclamdown, questiondown] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD11> { [ SunFA_Diaeresis, asterisk], [plus ] }; - key <AD12> { [ SunFA_Acute, SunFA_Grave], [asciitilde] }; - key <LCTL> { [ Caps_Lock ] }; - key <AC10> { [ Ccedilla ] }; - key <AC11> { [ masculine, ordfeminine] }; - key <TLDE> { [ SunFA_Tilde, SunFA_Circum], [asciicircum] }; - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <CAPS> { [ Control_L ] }; + + name[Group1]="Portugal - Sun type 4"; + + key <BKSL> { [ bracketleft, braceleft, guillemotleft] }; + key <BRCR> { [ bracketright, braceright, guillemotright] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, dollar, section ] }; + key <AE06> { [ 6, ampersand, notsign ] }; + key <AE07> { [ 7, slash ] }; + key <AE08> { [ 8, parenleft ] }; + key <AE09> { [ 9, parenright, backslash ] }; + key <AE10> { [ 0, equal, bar ] }; + key <AE11> { [ quoteright, question, quoteleft ] }; + key <AE12> { [ exclamdown, questiondown ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ dead_diaeresis, asterisk, plus ] }; + key <AD12> { [ dead_acute, dead_grave, asciitilde ] }; + key <LCTL> { [ Caps_Lock ] }; + key <AC10> { [ ccedilla, Ccedilla ] }; + key <AC11> { [ masculine, ordfeminine] }; + key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ] }; + key <LSGT> { [ less, greater ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + key <CAPS> { [ Control_L ] }; + + include "level3(ralt_switch)" }; + +partial alphanumeric_keys xkb_symbols "type5" { - include "pt" + + name[Group1]="Portugal - Sun type 5"; - key <TLDE> { [ backslash, bar ] }; - key <AE05> { [ 5, percent ], [asciitilde ]}; - key <AE06> { [ 6, ampersand ], [asciicircum ]}; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <AE11> { [ quoteright, question ], [quoteleft ]}; + key <TLDE> { [ backslash, bar ] }; + key <AE05> { [ 5, percent, asciitilde ]}; + key <AE06> { [ 6, ampersand, asciicircum ]}; + key <AE07> { [ 7, slash, braceleft ]}; + key <AE08> { [ 8, parenleft, bracketleft ]}; + key <AE09> { [ 9, parenright, bracketright ]}; + key <AE10> { [ 0, equal, braceright ]}; + key <AE11> { [ quoteright, question, quoteleft ]}; - key <AD11> { [ plus, asterisk ], [SunFA_Diaeresis ]}; + key <AD11> { [ plus, asterisk, dead_diaeresis ]}; -}; + include "level3(ralt_switch)" -partial -xkb_symbols "type6" { - include "pt(sundeadkeys)" +}; - key <AE05> { [ 5, percent ], [asciitilde ]}; - key <AE06> { [ 6, ampersand ], [asciicircum ]}; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <AE11> { [ quoteright, question ], [quoteleft ]}; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pt(type6)" }; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ro b/dist/xkeyboard-config/symbols/sun_vndr/ro new file mode 100644 index 000000000..df4026fff --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ro @@ -0,0 +1,118 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Romania"; + + + key <TLDE> { [ grave, asciitilde, grave, asciitilde ] }; + key <AE01> { [ 1, exclam, dead_tilde ] }; + key <AE02> { [ 2, at, dead_caron ] }; + key <AE03> { [ 3, numbersign, dead_circumflex ] }; + key <AE04> { [ 4, dollar, dead_breve ] }; + key <AE05> { [ 5, percent, dead_abovering ] }; + key <AE06> { [ 6, asciicircum, dead_ogonek ] }; + key <AE07> { [ 7, ampersand, dead_grave ] }; + key <AE08> { [ 8, asterisk, dead_abovedot ] }; + key <AE09> { [ 9, parenleft, dead_acute ] }; + key <AE10> { [ 0, parenright, dead_doubleacute ] }; + key <AE11> { [ minus, underscore, dead_diaeresis, endash ] }; + key <AE12> { [ equal, plus, dead_cedilla, plusminus ] }; + + key <AD01> { [ q, Q, acircumflex, Acircumflex ] }; + key <AD02> { [ w, W, ssharp ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD04> { [ r, R, r, R ] }; + key <AD05> { [ t, T, 0x100021b, 0x100021a ] }; + key <AD06> { [ y, Y, y, Y ] }; + key <AD07> { [ u, U, u, U ] }; + key <AD08> { [ i, I, icircumflex, Icircumflex ] }; + key <AD09> { [ o, O, o, O ] }; + key <AD10> { [ p, P, section ] }; + key <AD11> { [ bracketleft, braceleft, doublelowquotemark ] }; + key <AD12> { [ bracketright, braceright, rightdoublequotemark ] }; + + key <AC01> { [ a, A, abreve, Abreve ] }; + key <AC02> { [ s, S, 0x1000219, 0x1000218 ] }; + key <AC03> { [ d, D, dstroke, Dstroke ] }; + key <AC04> { [ f, F, f, F ] }; + key <AC05> { [ g, G, g, G ] }; + key <AC06> { [ h, H, h, H ] }; + key <AC07> { [ j, J, j, J ] }; + key <AC08> { [ k, K, k, K ] }; + key <AC09> { [ l, L, lstroke, Lstroke ] }; + key <AC10> { [ semicolon, colon, semicolon, colon ] }; + key <AC11> { [ apostrophe, quotedbl, apostrophe, quotedbl ] }; + key <LSGT> { [ backslash, bar, backslash, brokenbar ] }; + + key <BKSL> { [ backslash, bar, backslash, brokenbar ] }; + key <AB01> { [ z, Z, z, Z ] }; + key <AB02> { [ x, X, x, X ] }; + key <AB03> { [ c, C, copyright ] }; + key <AB04> { [ v, V, v, V ] }; + key <AB05> { [ b, B, b, B ] }; + key <AB06> { [ n, N, n, N ] }; + key <AB07> { [ m, M, m, M ] }; + key <AB08> { [ comma, less, guillemotleft, multiply ] }; + key <AB09> { [ period, greater, guillemotright, division ] }; + key <AB10> { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ro(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ru b/dist/xkeyboard-config/symbols/sun_vndr/ru index 97bd42df4..5c3320931 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/ru +++ b/dist/xkeyboard-config/symbols/sun_vndr/ru @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -28,25 +27,86 @@ // of the copyright holder. // -xkb_symbols "basic" { - include "ru" - // A few keys are different - key <BKSL> { [ backslash, bar ], - [ slash, question ] }; - key <AB10> { [ slash, question ], - [ ediaeresis, Ediaeresis ] }; - -}; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// -// layout for a Sun Type 6 Russian keyboard -partial +partial alphanumeric_keys xkb_symbols "type6" { - include "sun_vndr/ru(basic)" - key <AE03> { [ 3, numbersign ], - [ 3, numerosign ] }; - key <AE04> { [ 4, dollar ], - [ 4, percent ] }; + name[Group1]= "Russia"; + + key.type[group1]="FOUR_LEVEL"; + + + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, quotedbl, 2, at ] }; + key <AE03> { [ 3, numerosign, 3, numbersign ] }; + key <AE04> { [ 4, percent, 4, dollar ] }; + key <AE05> { [ 5, colon, 5, percent ] }; + key <AE07> { [ 7, period, 7, ampersand ] }; + key <AE08> { [ 8, semicolon, 8, asterisk ] }; + key <BKSL> { [ slash, question, backslash, bar ] }; + key <AB10> { [ ediaeresis, Ediaeresis, slash, question ] }; + key <LSGT> { [ backslash, bar ] }; + + 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 ] }; + + include "level3(ralt_switch)" - key <LSGT> { [ backslash, bar ] }; }; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ru(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/se b/dist/xkeyboard-config/symbols/sun_vndr/se index 38e530afa..169b30c4f 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/se +++ b/dist/xkeyboard-config/symbols/sun_vndr/se @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,55 +26,255 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -xkb_symbols "type4" { - key <BKSL> { [ section, onehalf ] }; - key <BRCR> { [ asciitilde, asciicircum ] }; - key <AE02> { [ 2, quotedbl ], [ at ] }; - key <AE03> { [ 3, numbersign ], [ sterling ] }; - key <AE04> { [ 4, currency ], [ dollar ] }; - key <AE05> { [ 5, percent ], [ degree ] }; - key <AE06> { [ 6, ampersand ], [ notsign ] }; - key <AE07> { [ 7, slash ], [ braceleft ] }; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ] }; - key <AE10> { [ 0, equal ], [ braceright ] }; - key <AE11> { [ plus, question ], [ backslash ] }; - key <AE12> { [ SunFA_Acute, SunFA_Grave ] }; - - key <AD03> { [ e, E ], [ EuroSign ] }; - key <AD11> { [ Aring ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] }; - - key <AC10> { [ Odiaeresis ] }; - key <AC11> { [ Adiaeresis ] }; - key <TLDE> { [ quoteright, asterisk ], [ quoteleft ]}; - - key <LCTL> { [ Caps_Lock ] }; - key <CAPS> { [ Control_L ] }; - key <LSGT> { [ less, greater ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; -}; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + +partial alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Sweden"; + key <TLDE> { [ section, onehalf ] }; + key <LSGT> { [ less, greater, bar ] }; + key <AE02> { [ 2, quotedbl, at ] }; + key <AE03> { [ 3, numbersign, sterling ] }; + key <AE04> { [ 4, currency, dollar ] }; + 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, backslash ] }; + key <AE12> { [ dead_acute, dead_grave ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD11> { [ aring, Aring ] }; + key <AD12> { [ dead_diaeresis, asciicircum, asciitilde ] }; + key <AC10> { [ odiaeresis, Odiaeresis ] }; + key <AC11> { [ adiaeresis, Adiaeresis ] }; + key <BKSL> { [ apostrophe, asterisk, grave ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; + + include "level3(ralt_switch)" + include "kpdl(comma)" + +}; + +// Swedish layout for a Type 5/5c Sun keyboard xkb_symbols "type5" { - include "se" + include "sun_vndr/us(type5)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key <AC12> { [ apostrophe, asterisk ], [ grave ] }; + key <AD12> { [ ], [ asciitilde ] }; + + key <RTSH> { [ Shift_R ] }; + + key <LALT> { [ Alt_L ] }; + key <ALGR> { [ Mode_switch ] }; + key <LMTA> { [ Meta_L ] }; + key <RMTA> { [ Meta_R ] }; + key <COMP> { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + 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 ], [ SunF36] }; + key <FK12> { [ F12 ], [ SunF37] }; + key <STOP> { [ Cancel ], [ F11 ] }; + key <AGAI> { [ Redo ], [ F12 ] }; + key <PROP> { [ SunProps ], [ F13 ] }; + key <UNDO> { [ Undo ], [ F14 ] }; + key <FRNT> { [ SunFront ], [ F15 ] }; + key <COPY> { [ SunCopy ], [ F16 ] }; + key <OPEN> { [ SunOpen ], [ F17 ] }; + key <PAST> { [ SunPaste ], [ F18 ] }; + key <FIND> { [ Find ], [ F19 ] }; + key <CUT> { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key <PRSC> { [ Print ], [ Sys_Req, SunSys_Req ] }; + key <SCLK> { [ Scroll_Lock ] }; + key <PAUS> { [ Pause ], [ Break ] }; + key <LEFT> { [ Left ] }; + key <RGHT> { [ Right ] }; + key <UP> { [ Up ] }; + key <DOWN> { [ Down ] }; + + key <DELE> { [ Delete ] }; + key <INS> { [ Insert ] }; + key <PGUP> { [ Prior ] }; + key <PGDN> { [ Next ] }; + key <HOME> { [ Home ] }; + key <END> { [ End ] }; + key <HELP> { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key <NMLK> { [ Num_Lock ] }; + key <KPDV> { [ KP_Divide ], [ F25 ] }; + key <KPMU> { [ KP_Multiply ], [ F26 ] }; + key <KPSU> { [ KP_Subtract ] }; - key <TLDE> { [ section, onehalf ] }; - key <AE07> { [ 7, slash ], [ braceleft ] }; - key <AE08> { [ 8, parenleft ], [ bracketleft ]}; - key <AE09> { [ 9, parenright ], [ bracketright ] }; - key <AE10> { [ 0, equal ], [ braceright ] }; - key <AE11> { [ plus, question ], [ backslash ] }; + key <KP7> { [ KP_Home, KP_7 ], [ F27 ] }; + key <KP8> { [ KP_Up, KP_8 ], [ F28 ] }; + key <KP9> { [ KP_Prior, KP_9 ], [ F29 ] }; + key <KPAD> { [ KP_Add ] }; - key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] }; - key <BKSL> { [ quoteright, asterisk ], [ quoteleft ]}; + key <KP4> { [ KP_Left, KP_4 ], [ F30 ] }; + key <KP5> { [ KP_Begin, KP_5 ], [ F31 ] }; + key <KP6> { [ KP_Right, KP_6 ], [ F32 ] }; + + key <KP1> { [ KP_End, KP_1 ], [ F33 ] }; + key <KP2> { [ KP_Down, KP_2 ], [ F34 ] }; + key <KP3> { [ KP_Next, KP_3 ], [ F35 ] }; + key <KPEN> { [ KP_Enter ] }; + + key <KP0> { [ KP_Insert, KP_0 ] }; + key <KPDL> { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin "four keys up on the right" + key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; + key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; + key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; + key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; + // End "four keys up on the right" + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Alt_L }; + // End modifier mappings }; - -partial -xkb_symbols "type6" { - include "se(Sundeadkeys)" - key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] }; +// Swedish layout for a Type 4 Sun keyboard +xkb_symbols "type4" { + include "sun_vndr/us(type4basic)+se(basic)" + + // Begin alphanumeric section + // These two are not supposed to be dead. + // A few others supposedly ARE dead, but don't care for now. + key <AC12> { [ apostrophe, asterisk ], [ grave ] }; + key <AD12> { [ ], [ asciitilde ] }; + + key <AF14> { [ asciitilde, asciicircum ] }; + + key <RTSH> { [ Shift_R ] }; + + key <LALT> { [ Alt_L ] }; + key <ALGR> { [ Mode_switch ] }; + key <LMTA> { [ Meta_L ] }; + key <RMTA> { [ Meta_R ] }; + key <COMP> { [ Multi_key ] }; + // End alphanumeric section + + // Begin "Function" section + 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 ], [ SunF36] }; + key <FK12> { [ F12 ], [ SunF37] }; + key <STOP> { [ Cancel ], [ F11 ] }; + key <AGAI> { [ Redo ], [ F12 ] }; + key <PROP> { [ SunProps ], [ F13 ] }; + key <UNDO> { [ Undo ], [ F14 ] }; + key <FRNT> { [ SunFront ], [ F15 ] }; + key <COPY> { [ SunCopy ], [ F16 ] }; + key <OPEN> { [ SunOpen ], [ F17 ] }; + key <PAST> { [ SunPaste ], [ F18 ] }; + key <FIND> { [ Find ], [ F19 ] }; + key <CUT> { [ SunCut ], [ F20 ] }; + // End "Function" section + + // Begin "Editing" section + key <LNFD> { [ Linefeed ] }; + key <DELE> { [ Delete ] }; + key <PRSC> { [ Print ], [ Sys_Req, SunSys_Req ] }; + key <SCLK> { [ Scroll_Lock ] }; + key <PAUS> { [ Pause ], [ Break ] }; + key <HELP> { [ Help ] }; + // End "Editing" section + + // Begin "Keypad" section + key <NMLK> { [ Num_Lock ] }; + key <KPEQ> { [ KP_Equal ] }; + key <KPDV> { [ KP_Divide ], [ F25 ] }; + key <KPMU> { [ KP_Multiply ], [ F26 ] }; + key <KPSU> { [ KP_Subtract ] }; + + key <KP7> { [ KP_Home, KP_7 ], [ F27 ] }; + key <KP8> { [ KP_Up, KP_8 ], [ F28 ] }; + key <KP9> { [ KP_Prior, KP_9 ], [ F29 ] }; + key <KPAD> { [ KP_Add ] }; + + key <KP4> { [ KP_Left, KP_4 ], [ F30 ] }; + key <KP5> { [ KP_Begin, KP_5 ], [ F31 ] }; + key <KP6> { [ KP_Right, KP_6 ], [ F32 ] }; + + key <KP1> { [ KP_End, KP_1 ], [ F33 ] }; + key <KP2> { [ KP_Down, KP_2 ], [ F34 ] }; + key <KP3> { [ KP_Next, KP_3 ], [ F35 ] }; + key <KPEN> { [ KP_Enter ] }; + + key <KP0> { [ KP_Insert, KP_0 ] }; + key <KPDL> { [ KP_Delete, KP_Decimal ] }; + // End "Keypad" section, + + // Begin modifier mappings + modifier_map Shift { Shift_R }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; + modifier_map Mod4 { Meta_L }; + modifier_map Mod5 { Meta_R }; + // End modifier mappings }; + + +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/se(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/sk b/dist/xkeyboard-config/symbols/sun_vndr/sk new file mode 100644 index 000000000..ca8aa7d96 --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/sk @@ -0,0 +1,110 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Slovakia"; + + + key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; + key <AE01> { [ plus, 1, exclam, asciitilde ] }; + key <AE02> { [ lcaron, 2, at, dead_caron ] }; + key <AE03> { [ scaron, 3, numbersign, dead_circumflex ] }; + key <AE04> { [ ccaron, 4, dollar, dead_breve ] }; + key <AE05> { [ tcaron, 5, percent, dead_abovering ] }; + key <AE06> { [ zcaron, 6, asciicircum, dead_ogonek ] }; + key <AE07> { [ yacute, 7, ampersand, grave ] }; + key <AE08> { [ aacute, 8, asterisk, dead_abovedot ] }; + key <AE09> { [ iacute, 9, parenleft, apostrophe ] }; + key <AE10> { [ eacute, 0, parenright, dead_doubleacute ] }; + key <AE11> { [ equal, percent, dead_diaeresis, backslash ] }; + key <AE12> { [ dead_acute, dead_caron, dead_cedilla, minus ] }; + + key <AD01> { [ q, Q, backslash ] }; + key <AD02> { [ w, W, bar ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD06> { [ z, Z ] }; + key <AD10> { [ p, P, apostrophe ] }; + key <AD11> { [ uacute, slash, division ] }; + key <AD12> { [ adiaeresis, parenleft, multiply ] }; + + key <AC02> { [ s, S, dstroke ] }; + key <AC03> { [ d, D, Dstroke ] }; + key <AC04> { [ f, F, bracketleft ] }; + key <AC05> { [ g, G, bracketright ] }; + key <AC08> { [ k, K, lstroke ] }; + key <AC09> { [ l, L, Lstroke ] }; + key <AC10> { [ ocircumflex, quotedbl, dollar ] }; + key <AC11> { [ section, exclam, ssharp ] }; + key <AC12> { [ ncaron, parenright, currency, currency ] }; + key <BKSL> { [ ncaron, parenright, backslash, bar ] }; + + key <LSGT> { [ backslash, bar, slash, brokenbar ] }; + key <AB01> { [ y, Y, less ] }; + key <AB02> { [ x, X, greater, numbersign ] }; + key <AB03> { [ c, C, ampersand ] }; + key <AB04> { [ v, V, at ] }; + key <AB05> { [ b, B, braceleft ] }; + key <AB06> { [ n, N, braceright ] }; + key <AB08> { [ comma, question, less ] }; + key <AB09> { [ period, colon, greater ] }; + key <AB10> { [ minus, underscore, asterisk ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/sk(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/solaris b/dist/xkeyboard-config/symbols/sun_vndr/solaris index 11a738143..c435744ee 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/solaris +++ b/dist/xkeyboard-config/symbols/sun_vndr/solaris @@ -1,6 +1,6 @@ //------------------------------------------------------------------------- // -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -29,14 +29,33 @@ // //------------------------------------------------------------------------- // -// ident "@(#)solaris 1.7 05/11/08 SMI" + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END // // Default map provides backwards compatibility with Sun keyboards from // long ago and the key mappings still used in Solaris Xsun today partial default -xkb_symbols "defaults" { +xkb_symbols "defaults_common" { // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards // and the names have stuck (you can spot a longtime Sun admin when you @@ -87,22 +106,37 @@ xkb_symbols "defaults" { key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; + key <POWR> { [ XF86Sleep, XF86Hibernate ] }; - key <LALT> { [ Alt_L ] }; - // key <RALT> { [ Mode_switch ] }; - // key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; +// key <LALT> { [ Alt_L ] }; +// key <LMTA> { [ Meta_L ] }; +// key <RMTA> { [ Meta_R ] }; +// key <COMP> { [ Multi_key ] }; +}; + +partial default +xkb_symbols "defaults" { + include "sun_vndr/solaris(defaults_common)" +// key <RALT> { [ Mode_switch ] }; +// key <ALGR> { [ Mode_switch ] }; // begin modifier mappings +// modifier_map Shift { Shift_R, Shift_L }; +// modifier_map Mod1 { Alt_L }; +// modifier_map Mod2 { Num_Lock }; +// modifier_map Mod3 { Alt_R, Mode_switch }; +// modifier_map Mod4 { Meta_L, Meta_R }; +}; + +partial default +xkb_symbols "defaults_type7jp" { + include "sun_vndr/solaris(defaults_common)" + // begin modifier mappings modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Alt_L }; - modifier_map Mod2 { Alt_R, Mode_switch }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod1 { Alt_L , Alt_R}; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; modifier_map Mod4 { Meta_L, Meta_R }; - }; // Map the keys to the actual key names instead of the ancient Sun function diff --git a/dist/xkeyboard-config/symbols/sun_vndr/sw b/dist/xkeyboard-config/symbols/sun_vndr/sw deleted file mode 100644 index 11a1b4774..000000000 --- a/dist/xkeyboard-config/symbols/sun_vndr/sw +++ /dev/null @@ -1,173 +0,0 @@ -// $XdotOrg: $ -// -// 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. -// -xkb_symbols "type4de" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key <BKSL> { [ less, braceleft ] }; - - key <BRCR> { [ greater, braceright ] }; - key <DELE> { [ Delete ] }; - - key <AE01> { [ 1, plus ], [exclam ] }; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, asterisk ], [numbersign ] }; - key <AE04> { [ 4, ccedilla ], [cent ] }; - key <AE05> { [ 5, percent ], [asciitilde ] }; - key <AE06> { [ 6, ampersand ], [section ] }; - key <AE07> { [ 7, slash ], [bar ] }; - key <AE08> { [ 8, parenleft ], [degree ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [asciicircum ] }; - Key <AE11> { [ quoteright, question ], [quoteleft ] }; - key <AE12> { [ SunFA_Circum, SunFA_Grave ] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD06> { [ Z ] }; - key <AD11> { [ udiaeresis, egrave ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ] }; - key <AC10> { [ odiaeresis, eacute ] }; - key <AC11> { [ adiaeresis, agrave ] }; - key <TLDE> { [ dollar, SunFA_Tilde ], [sterling ] }; - key <LSGT> { [ bracketright, bracketleft ], [ backslash ] }; - key <AB01> { [ Y ] }; - key <AB07> { [ M, NoSymbol ], [mu ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <COMP> { [ SunAltGraph ] }; - key <ALGR> { [ SunCompose ] }; - -}; - -xkb_symbols "type4fr" { - include "sun_vndr/us(type4basic)" - // A few keys are different - key <BKSL> { [ less, braceleft ] }; - - key <BRCR> { [ greater, braceright ] }; - key <DELE> { [ Delete ] }; - - key <AE01> { [ 1, plus ], [exclam ] }; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, asterisk ], [numbersign ] }; - key <AE04> { [ 4, ccedilla ], [cent ] }; - key <AE05> { [ 5, percent ], [asciitilde ] }; - key <AE06> { [ 6, ampersand ], [section ] }; - key <AE07> { [ 7, slash ], [bar ] }; - key <AE08> { [ 8, parenleft ], [degree ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [asciicircum ] }; - Key <AE11> { [ quoteright, question ], [quoteleft ] }; - key <AE12> { [ SunFA_Circum, SunFA_Grave ] }; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD06> { [ Z ] }; - key <AD11> { [ egrave, udiaeresis ] }; - key <AD12> { [ SunFA_Diaeresis, SunFA_Acute ] }; - key <AC10> { [ eacute, odiaeresis ] }; - key <AC11> { [ agrave, adiaeresis ] }; - key <TLDE> { [ dollar, SunFA_Tilde ], [sterling ] }; - key <LSGT> { [ bracketright, bracketleft ], [ backslash ] }; - key <AB01> { [ Y ] }; - key <AB07> { [ M, NoSymbol ], [mu ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - key <COMP> { [ SunAltGraph ] }; - key <ALGR> { [ SunCompose ] }; - - - -}; - -xkb_symbols "type5fr" { - - key <TLDE> { [ section, degree ] }; - - key <AE01> { [ 1, plus ], [bar ]}; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, asterisk ], [numbersign ] }; - key <AE04> { [ 4, ccedilla ], [asciicircum ] }; - key <AE05> { [ 5, percent ], [asciitilde ] }; - key <AE06> { [ 6, ampersand ], [section ] }; - key <AE07> { [ 7, slash ], [bar ] }; - key <AE08> { [ 8, parenleft ], [degree ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [quoteleft ] }; - Key <AE11> { [ quoteright, question ], [SunFA_Acute ] }; - key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde ]}; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD06> { [ z, Z ] }; - key <AD11> { [ egrave, udiaeresis ], [ bracketleft ]}; - key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright ]}; - - key <AC10> { [ eacute, odiaeresis ] }; - key <AC11> { [ agrave, adiaeresis ], [ braceleft ]}; - key <BKSL> { [ dollar, sterling ], [ braceright ]}; - - key <LSGT> { [ less, greater ], [ backslash ]}; - key <AB01> { [ y, Y ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - -}; - -xkb_symbols "type5de" { - - key <TLDE> { [ section, degree ] }; - - key <AE01> { [ 1, plus ], [bar ]}; - key <AE02> { [ 2, quotedbl ], [at ] }; - key <AE03> { [ 3, asterisk ], [numbersign ] }; - key <AE04> { [ 4, ccedilla ], [asciicircum ] }; - key <AE05> { [ 5, percent ], [asciitilde ] }; - key <AE06> { [ 6, ampersand ], [section ] }; - key <AE07> { [ 7, slash ], [bar ] }; - key <AE08> { [ 8, parenleft ], [degree ] }; - key <AE09> { [ 9, parenright ], [backslash ] }; - key <AE10> { [ 0, equal ], [quoteleft ] }; - Key <AE11> { [ quoteright, question ], [SunFA_Acute ] }; - key <AE12> { [ SunFA_Circum, SunFA_Grave], [ SunFA_Tilde ]}; - key <AD03> { [ e, E ], [EuroSign ] }; - key <AD06> { [ z, Z ] }; - key <AD11> { [ udiaeresis, egrave ], [ bracketleft ]}; - key <AD12> { [ SunFA_Diaeresis, exclam], [ bracketright ]}; - - key <AC10> { [ odiaeresis, eacute ] }; - key <AC11> { [ adiaeresis, agrave ], [ braceleft ]}; - key <BKSL> { [ dollar, sterling ], [ braceright ]}; - - key <LSGT> { [ less, greater ], [ backslash ]}; - key <AB01> { [ y, Y ] }; - key <AB08> { [ comma, semicolon ] }; - key <AB09> { [ period, colon ] }; - key <AB10> { [ minus, underscore ] }; - -}; - diff --git a/dist/xkeyboard-config/symbols/sun_vndr/tr b/dist/xkeyboard-config/symbols/sun_vndr/tr index f70396e0e..5096e04f5 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/tr +++ b/dist/xkeyboard-config/symbols/sun_vndr/tr @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,93 +26,68 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -xkb_symbols "basic" { - include "sun_vndr/tr(type6Q)" -}; - -xkb_symbols "type6Q" { - - key <TLDE> { [ quotedbl, eacute ], [ asciitilde ]}; - key <AE02> { [ 2, quoteright ] }; - key <AE03> { [ 3, asciicircum ], [ numbersign ]}; - key <AE04> { [ 4, plus ], [ dollar ]}; - key <AE06> { [ 6, ampersand ] }; - key <AE07> { [ 7, slash ], [ braceleft ]}; - key <AE08> { [ 8, parenleft ], [ bracketright ]}; - key <AE09> { [ 9, parenright ], [ bracketright ]}; - key <AE10> { [ 0, equal ], [ braceright ]}; - key <AE11> { [ asterisk, question ], [ backslash ]}; - key <AE12> { [ minus, underscore ] }; - key <AD01> { [ q, Q ], [ at ]}; - key <AD11> { [ gbreve, Gbreve ], [ gbreve, Gbreve ]}; - key <AD12> { [ udiaeresis, Udiaeresis], [ asciitilde, Udiaeresis ]}; +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// - key <AC10> { [ scedilla, Scedilla ], [ comma ]}; - key <AC11> { [ Iabovedot, Iabovedot ], [ Iabovedot, Iabovedot ]}; - key <BKSL> { [ comma, semicolon ], [ quoteleft ]}; - key <LSGT> { [ less, greater ], [ bar ]}; - key <AB08> { [ odiaeresis, Odiaeresis], [ odiaeresis, Odiaeresis ]}; - key <AB09> { [ ccedilla, Ccedilla ], [ ccedilla, Ccedilla ]}; - key <AB10> { [ period, colon ], [ quotedbl ]}; - -}; +partial alphanumeric_keys +xkb_symbols "type6" { -xkb_symbols "type6F" { + name[Group1]="Turkey - (Q)"; + key <TLDE> { [ quotedbl, eacute ] }; + key <AE01> { [ 1, exclam ] }; + key <AE02> { [ 2, apostrophe ] }; + key <AE03> { [ 3, asciicircum, numbersign ] }; + key <AE04> { [ 4, plus, dollar ] }; + 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> { [ asterisk, question, backslash ] }; + key <AE12> { [ minus, underscore ] }; - key <TLDE> { [ plus ,asterisk ], [plusminus ]}; - key <AE01> { [ 1 ,exclam ], [onesuperior ]}; - key <AE02> { [ 2 ,quotedbl ], [twosuperior ]}; - key <AE03> { [ 3 ,asciicircum ], [numbersign ]}; - key <AE04> { [ 4 ,dollar ], [onequarter ]}; - key <AE05> { [ 5 ,percent ], [onehalf ]}; - key <AE06> { [ 6 ,ampersand ], [threequarters ]}; - key <AE07> { [ 7 ,quoteright ], [braceleft ]}; - key <AE08> { [ 8 ,parenleft ], [bracketleft ]}; - key <AE09> { [ 9 ,parenright ], [bracketright ]}; - key <AE10> { [ 0 ,equal ], [braceright ]}; - key <AE11> { [ slash ,question ], [backslash ]}; - key <AE12> { [ minus ,underscore ], [bar ]}; + key <AD01> { [ q, Q, at ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <AD08> { [ idotless, I ] }; + key <AD11> { [ gbreve, Gbreve ] }; + key <AD12> { [udiaeresis, Udiaeresis, asciitilde ] }; - key <AD01> { [ f ,F ], [at ]}; - key <AD02> { [ g ,G ]}; - key <AD03> { [ gbreve ,Gbreve ], [gbreve, Gbreve ]}; - key <AD04> { [ idotless ,I ], [paragraph ]}; - key <AD05> { [ o ,O ]}; - key <AD06> { [ d ,D ], [yen ]}; - key <AD07> { [ r ,R ]}; - key <AD08> { [ n ,N ]}; - key <AD09> { [ h ,H ], [degree ]}; - key <AD10> { [ p ,P ], [sterling ]}; - key <AD11> { [ q ,Q ], [diaeresis ]}; - key <AD12> { [ w ,W ], [asciitilde ]}; - key <BKSL> { [ x ,X ], [quoteleft ]}; + key <AC10> { [ scedilla, Scedilla, acute ] }; + key <AC11> { [ i, Iabovedot ] }; + key <BKSL> { [ comma, semicolon, grave ] }; - key <AC01> { [ u ,U ], [AE ]}; - key <AC02> { [ i ,Iabovedot ], [ssharp ]}; - key <AC03> { [ e ,E ]}; - key <AC04> { [ a ,A ]}; - key <AC05> { [ udiaeresis,Udiaeresis]}; - key <AC06> { [ t ,T ]}; - key <AC07> { [ k ,K ]}; - key <AC08> { [ m ,M ]}; - key <AC10> { [ y ,Y ], [quoteright ]}; - key <AC11> { [ scedilla ,Scedilla ], [numbersign, Scedilla ]}; + key <LSGT> { [ less, greater, bar ] }; + key <AB08> { [odiaeresis, Odiaeresis ] }; + key <AB09> { [ ccedilla, Ccedilla ] }; + key <AB10> { [ period, colon ] }; - key <LSGT> { [ less, greater ], [bar ]}; - key <AB01> { [ j ,J ], [less ]}; - key <AB02> { [ odiaeresis ,Odiaeresis ], [greater ]}; - key <AB03> { [ v ,V ], [cent ]}; - key <AB04> { [ c ,C ]}; - key <AB05> { [ ccedilla ,Ccedilla ], [ccedilla, Ccedilla ]}; - key <AB06> { [ z ,Z ]}; - key <AB07> { [ s ,S ], [mu ]}; - key <AB08> { [ b ,B ], [multiply ]}; - key <AB09> { [ period ,colon ], [division ]}; - key <AB10> { [ comma ,semicolon ]}; + include "level3(ralt_switch)" +}; +partial default alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/tr(type6)" }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/tuv b/dist/xkeyboard-config/symbols/sun_vndr/tuv index cda512ecc..941e8e1fc 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/tuv +++ b/dist/xkeyboard-config/symbols/sun_vndr/tuv @@ -1,6 +1,6 @@ // $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -50,6 +50,29 @@ //from The Open Group. // // US/ASCII layout for a Type 4 Sun keyboard + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + xkb_symbols "type4basic" { include "us(basic)" @@ -123,8 +146,8 @@ xkb_symbols "type4basic" { // begin modifier mappings modifier_map Shift { Shift_R, Shift_L }; modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Mode_switch }; modifier_map Mod4 { Alt_L }; }; @@ -224,8 +247,8 @@ xkb_symbols "type5basic" { // begin modifier mappings modifier_map Shift { Shift_R }; modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_R }; - modifier_map Mod3 { Num_Lock }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod3 { Alt_R }; modifier_map Mod4 { Alt_L }; }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/tw b/dist/xkeyboard-config/symbols/sun_vndr/tw index 212c9fb57..fca6f3c5b 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/tw +++ b/dist/xkeyboard-config/symbols/sun_vndr/tw @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,15 +26,44 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END // + +// Taiwanese layout for a Type 6 Sun keyboard +partial +xkb_symbols "type6" { + // A few keys are different from US layout - only those are shown here + key <ALGR> { [ Henkan_Mode ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; + +}; + + // Taiwanese layout for a Type 4 Sun keyboard + xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; -// key <LNFD> { [ Hangul ] }; -// key <RALT> { [ Linefeed ] }; key <COMP> { [ Henkan_Mode ] }; }; @@ -45,15 +73,7 @@ xkb_symbols "type5" { // A few keys are different key <ALGR> { [ Henkan_Mode ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; - -}; + key <BKSL> { [ backslash, bar, brokenbar ] }; -// Taiwanese layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { - // A few keys are different from US layout - only those are shown here - key <ALGR> { [ Henkan_Mode ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/ua b/dist/xkeyboard-config/symbols/sun_vndr/ua new file mode 100644 index 000000000..09c5f44f6 --- /dev/null +++ b/dist/xkeyboard-config/symbols/sun_vndr/ua @@ -0,0 +1,118 @@ +// +// Copyright 2010 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. +// + +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + + +partial default alphanumeric_keys +xkb_symbols "type6" { + + name[Group1]="Ukraine"; + + + key <TLDE> { [ grave, asciitilde, apostrophe, asciitilde ] }; + key <AE01> { [ 1, exclam, 1, exclam ] }; + key <AE02> { [ 2, at, 2, quotedbl ] }; + key <AE03> { [ 3, numbersign, 3, numbersign ] }; + key <AE04> { [ 4, dollar, 4, asterisk ] }; + key <AE05> { [ 5, percent, 5, colon ] }; + key <AE06> { [ 6, asciicircum, 6, comma ] }; + key <AE07> { [ 7, ampersand, 7, period ] }; + key <AE08> { [ 8, asterisk, 8, semicolon ] }; + key <AE09> { [ 9, parenleft, 9, parenleft ] }; + key <AE10> { [ 0, parenright, 0, parenright ] }; + key <AE11> { [ minus, underscore, minus, underscore ] }; + key <AE12> { [ equal, plus, equal, plus ] }; + + key <AD01> { [ q, Q, Cyrillic_shorti, Cyrillic_SHORTI ] }; + key <AD02> { [ w, W, Cyrillic_tse, Cyrillic_TSE ] }; + key <AD03> { [ e, E, Cyrillic_u, Cyrillic_U ] }; + key <AD04> { [ r, R, Cyrillic_ka, Cyrillic_KA ] }; + key <AD05> { [ t, T, Cyrillic_ie, Cyrillic_IE ] }; + key <AD06> { [ y, Y, Cyrillic_en, Cyrillic_EN ] }; + key <AD07> { [ u, U, Cyrillic_ghe, Cyrillic_GHE ] }; + key <AD08> { [ i, I, Cyrillic_sha, Cyrillic_SHA ] }; + key <AD09> { [ o, O, Cyrillic_shcha, Cyrillic_SHCHA ] }; + key <AD10> { [ p, P, Cyrillic_ze, Cyrillic_ZE ] }; + key <AD11> { [ bracketleft, braceleft, Cyrillic_ha, Cyrillic_HA ] }; + key <AD12> { [ bracketright, braceright, Ukrainian_yi, Ukrainian_YI ] }; + + key <AC01> { [ a, A, Cyrillic_ef, Cyrillic_EF ] }; + key <AC02> { [ s, S, Ukrainian_i, Ukrainian_I ] }; + key <AC03> { [ d, D, Cyrillic_ve, Cyrillic_VE ] }; + key <AC04> { [ f, F, Cyrillic_a, Cyrillic_A ] }; + key <AC05> { [ g, G, Cyrillic_pe, Cyrillic_PE ] }; + key <AC06> { [ h, H, Cyrillic_er, Cyrillic_ER ] }; + key <AC07> { [ j, J, Cyrillic_o, Cyrillic_O ] }; + key <AC08> { [ k, K, Cyrillic_el, Cyrillic_EL ] }; + key <AC09> { [ l, L, Cyrillic_de, Cyrillic_DE ] }; + key <AC10> { [ semicolon, colon, Cyrillic_zhe, Cyrillic_ZHE ] }; + key <AC11> { [ apostrophe, quotedbl, Ukrainian_ie, Ukrainian_IE ] }; + key <BKSL> { [ backslash, bar, Ukrainian_ghe_with_upturn, Ukrainian_GHE_WITH_UPTURN ] }; + + key <LSGT> { [ less, greater, slash, bar ] }; + key <AB01> { [ z, Z, Cyrillic_ya, Cyrillic_YA ] }; + key <AB02> { [ x, X, Cyrillic_che, Cyrillic_CHE ] }; + key <AB03> { [ c, C, Cyrillic_es, Cyrillic_ES ] }; + key <AB04> { [ v, V, Cyrillic_em, Cyrillic_EM ] }; + key <AB06> { [ n, N, Cyrillic_te, Cyrillic_TE ] }; + key <AB05> { [ b, B, Cyrillic_i, Cyrillic_I ] }; + key <AB07> { [ m, M, Cyrillic_softsign,Cyrillic_SOFTSIGN ] }; + key <AB08> { [ comma, less, Cyrillic_be, Cyrillic_BE ] }; + key <AB09> { [ period, greater, Cyrillic_yu, Cyrillic_YU ] }; + key <AB10> { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" + +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ua(type6)" +}; + diff --git a/dist/xkeyboard-config/symbols/sun_vndr/us b/dist/xkeyboard-config/symbols/sun_vndr/us index 5378cf888..bb0fa35ad 100644 --- a/dist/xkeyboard-config/symbols/sun_vndr/us +++ b/dist/xkeyboard-config/symbols/sun_vndr/us @@ -1,6 +1,5 @@ -// $XdotOrg: $ // -// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// Copyright 2010 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 @@ -27,8 +26,6 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ -// Sun: @(#)us 1.5 03/04/21 SMI // //Copyright 1996, 1998 The Open Group // @@ -51,8 +48,28 @@ //from The Open Group. // +// +// CDDL HEADER START +// +// The contents of this file are subject to the terms of the +// Common Development and Distribution License (the "License"). +// You may not use this file except in compliance with the License. +// +// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE +// or http://www.opensolaris.org/os/licensing. +// See the License for the specific language governing permissions +// and limitations under the License. +// +// When distributing Covered Code, include this CDDL HEADER in each +// file and include the License file at src/OPENSOLARIS.LICENSE. +// If applicable, add the following below this CDDL HEADER, with the +// fields enclosed by brackets "[]" replaced with your own identifying +// information: Portions Copyright [yyyy] [name of copyright owner] +// +// CDDL HEADER END +// + // Symbols shared by all Sun Keyboard layouts -hidden xkb_symbols "sunbasic" { include "srvr_ctrl(xfree86)" @@ -66,128 +83,178 @@ xkb_symbols "sunbasic" { include "pc(editing)" include "keypad(x11)" + key <ESC> { [ Escape ] }; + + // the extra key on most European keyboards + key <LSGT> { [ less, greater, bar, brokenbar ] }; + + // these keys are common to almost all layouts + key <BKSL> { [ backslash, bar ] }; + key <SPCE> { [ space ] }; + + key <BKSP> { [ BackSpace ] }; + key <TAB> { [ Tab, ISO_Left_Tab ] }; + key <RTRN> { [ Return ] }; + + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + + key <COMP> { [ Multi_key ] }; + // End alphanumeric section + + key <LFSH> { [ Shift_L ] }; + key <LCTL> { [ Control_L ] }; + + key <RTSH> { [ Shift_R ] }; + key <RCTL> { [ Control_R ] }; + + + // 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 ] }; + key <LALT> { [ Alt_L, Alt_L ] }; + key <LWIN> { [ Meta_L ] }; + key <RWIN> { [ Meta_R ] }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod4 { Meta_L, Meta_R }; + +// key <LALT> { [ Alt_L ] }; +// key <ALGR> { [ Mode_switch ] }; +// key <LMTA> { [ Meta_L ] }; +// key <RMTA> { [ Meta_R ] }; + include "sun_vndr/us(left_funkeys)" include "capslock(capslock)" //include "capslock(shiftlock)" - key <LFSH> { [ Shift_L ] }; - key <RTSH> { [ Shift_R ] }; - key <LALT> { [ Alt_L ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <LCTL> { [ Control_L ] }; - key <RCTL> { [ Control_R ] }; - key <COMP> { [ Multi_key ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <RTRN> { [ Return ] }; - - key <ESC> { [ Escape ] }; - - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; - key <SPCE> { [ space ] }; - - // 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 - // Sun Type 2 keyboard, in which the right side numpad were "R" function - // keys. To restore the original behavior, uncomment the section below - // that lists the R key mappings. -// key <KP7> { [ R7, R7 ], [ KP_7, Home ] }; + +// This default section uses 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 +// Sun Type 2 keyboard, in which the right side numpad were "R" function +// keys. To restore the original behavior, comment out this section and +// uncomment the section below that lists the R key mappings. + key <KPDV> { [ KP_Divide ] }; + key <KPMU> { [ KP_Multiply ] }; + key <KPSU> { [ KP_Subtract ] }; + + key <KP7> { [ KP_Home, KP_7 ] }; + key <KP8> { [ KP_Up, KP_8 ] }; + key <KP9> { [ KP_Prior, KP_9 ] }; + key <KPAD> { [ KP_Add ] }; + + key <KP4> { [ KP_Left, KP_4 ] }; + key <KP5> { [ KP_Begin, KP_5 ] }; + key <KP6> { [ KP_Right, KP_6 ] }; + + key <KP1> { [ KP_End, KP_1 ] }; + key <KP2> { [ KP_Down, KP_2 ] }; + key <KP3> { [ KP_Next, KP_3 ] }; + key <KPEN> { [ KP_Enter ] }; + + key <KP0> { [ KP_Insert, KP_0 ] }; + key <KPDL> { [ KP_Delete, KP_Decimal ] }; + +// End New Keypad section - Begin Sun traditional Keypad section + +// key <KP7> { [ R7, R7 ], [ KP_7, Home ] }; // key <KP8> { [ Up, R8 ], [ KP_8 ] }; -// key <KP9> { [ R9, R9 ], [ KP_9, Prior ] }; -// key <KPAD> { [ KP_Add ] }; +// key <KP9> { [ R9, R9 ], [ KP_9, Prior ] }; +// key <KPAD> { [ KP_Add ] }; // -// key <KP4> { [ Left, R10 ], [ KP_4 ] }; -// key <KP5> { [ R11, R11 ], [ KP_5 ] }; -// key <KP6> { [ Right, R12 ], [ KP_6 ] }; +// key <KP4> { [ Left, R10 ], [ KP_4 ] }; +// key <KP5> { [ R11, R11 ], [ KP_5 ] }; +// key <KP6> { [ Right, R12 ], [ KP_6 ] }; // -// key <KP1> { [ R13, R13 ], [ KP_1, End ] }; -// key <KP2> { [ Down, R14 ], [ KP_2 ] }; -// key <KP3> { [ R15, R15 ], [ KP_3, Next ] }; -// key <KPEN> { [ KP_Enter ] }; -// key <KP0> { [ KP_Insert, KP_Insert], [ KP_0 ] }; -// key <KPDL> { [ Delete, Delete ], [ KP_Decimal ] }; - - // End "Keypad" section - - modifier_map Control { Control_L, Control_R }; - modifier_map Shift { Shift_R, Shift_L }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Mode_switch }; - modifier_map Mod3 { Num_Lock }; - modifier_map Mod4 { Alt_L }; +// key <KP1> { [ R13, R13 ], [ KP_1, End ] }; +// key <KP2> { [ Down, R14 ], [ KP_2 ] }; +// key <KP3> { [ R15, R15 ], [ KP_3, Next ] }; +// key <KPEN> { [ KP_Enter ] }; +// key <KP0> { [ KP_Insert, KP_Insert], [ KP_0 ] }; +// key <KPDL> { [ Delete, Delete ], [ KP_Decimal ] }; + +// End "Keypad" section + }; -hidden + xkb_symbols "left_funkeys" { // Suppliment to inet(evdev) for added functionality of left-funkeys - key <STOP> { [ NoSymbol ], [ L1, L1 ] }; - key <AGAI> { [ NoSymbol ], [ L2, L2 ] }; - key <PROP> { [ NoSymbol ], [ L3, L3 ] }; - key <UNDO> { [ NoSymbol ], [ L4, L4 ] }; - key <FRNT> { [ NoSymbol ], [ L5, L5 ] }; - key <COPY> { [ NoSymbol ], [ L6, L6 ] }; - key <OPEN> { [ NoSymbol ], [ L7, L7 ] }; - key <PAST> { [ NoSymbol ], [ L8, L8 ] }; - key <FIND> { [ NoSymbol ], [ L9, L9 ] }; - key <CUT> { [ NoSymbol ], [ L10, L10 ] }; + //key <STOP> { [ NoSymbol ], [ L1, L1 ] }; + //key <AGAI> { [ NoSymbol ], [ L2, L2 ] }; + //key <PROP> { [ NoSymbol ], [ L3, L3 ] }; + //key <UNDO> { [ NoSymbol ], [ L4, L4 ] }; + //key <FRNT> { [ NoSymbol ], [ L5, L5 ] }; + //key <COPY> { [ NoSymbol ], [ L6, L6 ] }; + //key <OPEN> { [ NoSymbol ], [ L7, L7 ] }; + //key <PAST> { [ NoSymbol ], [ L8, L8 ] }; + //key <FIND> { [ NoSymbol ], [ L9, L9 ] }; + //key <CUT> { [ NoSymbol ], [ L10, L10 ] }; // The above symbols were chosen for better compatibility withother xkb // mappings. The old mappings are kepy below in case someone needs them - //key <STOP> { [ L1, L1 ], [ SunStop ] }; - //key <AGAI> { [ L2, L2 ], [ SunAgain ] }; - //key <PROP> { [ L3, L3 ], [ SunProps ] }; - //key <UNDO> { [ L4, L4 ], [ SunUndo ] }; - //key <FRNT> { [ L5, L5 ], [ SunFront ] }; - //key <COPY> { [ L6, L6 ], [ SunCopy ] }; - //key <OPEN> { [ L7, L7 ], [ SunOpen ] }; - //key <PAST> { [ L8, L8 ], [ SunPaste ] }; - //key <FIND> { [ L9, L9 ], [ SunFind ] }; - //key <CUT> { [ L10, L10 ], [ SunCut ] }; + key <STOP> { [ L1, L1, SunStop ] }; + key <AGAI> { [ L2, L2, SunAgain ] }; + key <PROP> { [ L3, L3, SunProps ] }; + key <UNDO> { [ L4, L4, SunUndo ] }; + key <FRNT> { [ L5, L5, SunFront ] }; + key <COPY> { [ L6, L6, SunCopy ] }; + key <OPEN> { [ L7, L7, SunOpen ] }; + key <PAST> { [ L8, L8, SunPaste ] }; + key <FIND> { [ L9, L9, SunFind ] }; + key <CUT> { [ L10, L10, SunCut ] }; }; hidden xkb_symbols "volumekeys" { // Suppliment to inet(evdev) for added functionality of audio keys - key <MUTE> { [ NoSymbol, SunVideoDegauss ] }; - key <VOL-> { [ NoSymbol, XF86MonBrightnessDown ] }; - key <VOL+> { [ NoSymbol, XF86MonBrightnessUp ] }; + key <MUTE> { [ NoSymbol, SunVideoDegauss ] }; + key <VOL-> { [ NoSymbol, XF86MonBrightnessDown ] }; + key <VOL+> { [ NoSymbol, XF86MonBrightnessUp ] }; // The above symbols were chosen for better compatibility withother xkb // mappings. The old mappings are kepy below in case someone needs them - //key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; - //key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - //key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - //key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; + //key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; + //key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; + //key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; + //key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; }; + // US/ASCII layout for a Type 4 Sun keyboard xkb_symbols "type4basic" { include "sun_vndr/us(sunbasic)" // A few alphanumeric keys are different - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <AE05> { [ 5, percent, EuroSign ] }; + key <AD03> { [ e, E, EuroSign ] }; key <LNFD> { [ Linefeed ] }; // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key <PAUS> { [ R1, R1 ], [ Pause ] }; + key <PRSC> { [ R2, R2, Print ] }; + key <SCLK> { [ R3, R3, Scroll_Lock, Break ] }; + key <PAUS> { [ R1, R1, Pause ] }; // End "Editing" section, begin "Keypad" - key <KPEQ> { [ R4, KP_Equal ], [ KP_Equal ] }; + key <KPEQ> { [ R4, KP_Equal, KP_Equal ] }; + }; xkb_symbols "type4" { include "sun_vndr/us(type4basic)" - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; }; // US/ASCII layout for a Type 5 Sun keyboard @@ -196,9 +263,9 @@ xkb_symbols "type5basic" { include "sun_vndr/us(volumekeys)" // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] }; - key <PAUS> { [ R1, R1 ], [ Pause, Break ] }; + key <PRSC> { [ R2, R2, Print, SunSys_Req ] }; + key <SCLK> { [ R3, R3, Scroll_Lock ] }; + key <PAUS> { [ R1, R1, Pause, Break ] }; // End "Editing" section }; @@ -206,10 +273,10 @@ xkb_symbols "type5" { include "sun_vndr/us(type5basic)" // A few alphanumeric keys are different - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <AE05> { [ 5, percent, EuroSign ] }; + key <AD03> { [ e, E , EuroSign ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; }; // US/ASCII layout for a Type 5 Sun keyboard @@ -221,44 +288,48 @@ xkb_symbols "type5hobo" { include "sun_vndr/us(type5hobobasic)" // A few alphanumeric keys are different - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; + key <AE04> { [ 4, dollar, EuroSign ] }; + key <AE05> { [ 5, percent, EuroSign ] }; + key <AD03> { [ e, E, EuroSign ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; // Here is the hobo keypad: - key <AE07> { [ 7, ampersand ], [ NoSymbol, NoSymbol ], [ KP_7 ] }; - key <AE08> { [ 8, asterisk ], [ NoSymbol, NoSymbol ], [ KP_8 ] }; - key <AE09> { [ 9, parenleft ], [ NoSymbol, NoSymbol ], [ KP_9 ] }; - key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol ], [ KP_Multiply] }; + key <AE07> { [ 7, ampersand, NoSymbol, NoSymbol, KP_7 ] }; + key <AE08> { [ 8, asterisk, NoSymbol, NoSymbol, KP_8 ] }; + key <AE09> { [ 9, parenleft, NoSymbol, NoSymbol, KP_9 ] }; + key <AE10> { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] }; - key <AD07> { [ u, U ], [ NoSymbol, NoSymbol ], [ KP_4 ] }; - key <AD08> { [ i, I ], [ NoSymbol, NoSymbol ], [ KP_5 ] }; - key <AD09> { [ o, O ], [ NoSymbol, NoSymbol ], [ KP_6 ] }; - key <AD10> { [ p, P ], [ NoSymbol, NoSymbol ], [ KP_Subtract]}; + key <AD07> { [ u, U, NoSymbol, NoSymbol, KP_4 ] }; + key <AD08> { [ i, I, NoSymbol, NoSymbol, KP_5 ] }; + key <AD09> { [ o, O, NoSymbol, NoSymbol, KP_6 ] }; + key <AD10> { [ p, P, NoSymbol, NoSymbol, KP_Subtract] }; - key <AC07> { [ j, J ], [ NoSymbol, NoSymbol ], [ KP_1 ] }; - key <AC08> { [ k, K ], [ NoSymbol, NoSymbol ], [ KP_2 ] }; - key <AC09> { [ l, L ], [ NoSymbol, NoSymbol ], [ KP_3 ] }; - key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add ] }; + key <AC07> { [ j, J, NoSymbol, NoSymbol, KP_1 ] }; + key <AC08> { [ k, K, NoSymbol, NoSymbol, KP_2 ] }; + key <AC09> { [ l, L, NoSymbol, NoSymbol, KP_3 ] }; + key <AC10> { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add ] }; - key <RTRN> { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; + key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter ] }; - key <AB07> { [ m, M ], [ NoSymbol, NoSymbol ], [ KP_0 ] }; + key <AB07> { [ m, M, NoSymbol, NoSymbol, KP_0 ] }; - key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] }; - key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide ] }; + key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] }; + key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] }; }; + xkb_symbols "type6" { include "sun_vndr/us(sunbasic)" include "sun_vndr/us(volumekeys)" include "eurosign(4)" + include "level3(ralt_switch)" - key <SYRQ> { [ SunSys_Req ]}; + key <SYRQ> { [ SunSys_Req ]}; }; + + xkb_symbols "pc101" { include "us(pc101)" key <RALT> { [ Mode_switch, Meta_R ] }; diff --git a/dist/xkeyboard-config/symbols/sun_vndr/usb b/dist/xkeyboard-config/symbols/sun_vndr/usb deleted file mode 100644 index 84648dd06..000000000 --- a/dist/xkeyboard-config/symbols/sun_vndr/usb +++ /dev/null @@ -1,26 +0,0 @@ -// Additional keys for Sun USB keyboard - -xkb_symbols "sun_usb" { - - key <STOP> { [ Cancel ], [ F11 ] }; - key <AGAI> { [ Redo ], [ F12 ] }; - key <PROP> { [ SunProps ], [ F13 ] }; - key <UNDO> { [ Undo ], [ F14 ] }; - key <FRNT> { [ SunFront ], [ F15 ] }; - key <COPY> { [ SunCopy ], [ F16 ] }; - key <OPEN> { [ SunOpen ], [ F17 ] }; - key <PAST> { [ SunPaste ], [ F18 ] }; - key <FIND> { [ Find ], [ F19 ] }; - key <CUT> { [ SunCut ], [ F20 ] }; - key <HELP> { [ Help ] }; - - key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; - key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; -}; - |