diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-28 20:02:05 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-28 20:02:05 +0000 |
| commit | 9370f043060a1d08bb51484a58c52db85a4ea656 (patch) | |
| tree | 565341da769f2c77058ca0fb482ac39979fa0de3 /xorg-server/xkbdata.src/symbols/sun_vndr | |
| parent | 1ad46cbf3a9963f3d6d8c687480a80d359ec15f8 (diff) | |
| download | vcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.tar.gz vcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.tar.bz2 vcxsrv-9370f043060a1d08bb51484a58c52db85a4ea656.zip | |
Git update xkeyboard-config 28-2-2010
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/sun_vndr')
34 files changed, 5249 insertions, 2781 deletions
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am b/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am index db036de67..00692e334 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/Makefile.am +++ b/xorg-server/xkbdata.src/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 +symbolsdir = $(xkb_base)/symbols/sun_vndr
+
+dist_symbols_DATA = \
+ 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/xorg-server/xkbdata.src/symbols/sun_vndr/ara b/xorg-server/xkbdata.src/symbols/sun_vndr/ara new file mode 100644 index 000000000..ea54207b8 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/be b/xorg-server/xkbdata.src/symbols/sun_vndr/be new file mode 100644 index 000000000..d6ce057d4 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/br b/xorg-server/xkbdata.src/symbols/sun_vndr/br new file mode 100644 index 000000000..4d966f551 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/ca b/xorg-server/xkbdata.src/symbols/sun_vndr/ca new file mode 100644 index 000000000..0f0aa2923 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/ch b/xorg-server/xkbdata.src/symbols/sun_vndr/ch new file mode 100644 index 000000000..c952fc559 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/cz b/xorg-server/xkbdata.src/symbols/sun_vndr/cz index ed46dcf7c..6f6b198c5 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/cz +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/cz @@ -1,53 +1,106 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type5" { - 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 ] }; - -}; - +//
+// 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]="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/xorg-server/xkbdata.src/symbols/sun_vndr/de b/xorg-server/xkbdata.src/symbols/sun_vndr/de index 230e0ca29..3b1301687 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/de +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/de @@ -1,65 +1,141 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - - - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // 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 ] }; - - - -}; +//
+//
+// 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]="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" {
+
+ 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/xorg-server/xkbdata.src/symbols/sun_vndr/dk b/xorg-server/xkbdata.src/symbols/sun_vndr/dk index 87c099781..4f43112ab 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/dk +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/dk @@ -1,71 +1,148 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // 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 ] }; - - - - -}; - -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 ]}; - -}; +//
+// 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]="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" {
+
+ 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 "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/xorg-server/xkbdata.src/symbols/sun_vndr/ee b/xorg-server/xkbdata.src/symbols/sun_vndr/ee new file mode 100644 index 000000000..1070719a5 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/es b/xorg-server/xkbdata.src/symbols/sun_vndr/es index fc2b4420b..789df5519 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/es +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/es @@ -1,85 +1,146 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -partial -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 ] }; - 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 <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 <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 ] }; -}; - -partial -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 ] }; - - key <AC11> { [ SunFA_Acute, SunFA_Diaeresis ], [ braceleft ] }; -}; - -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 ] }; -}; +//
+// 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]="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" {
+
+ 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 <AE12> { [ exclamdown, questiondown ] };
+ 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 ] };
+
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "type5" {
+ include "sun_vndr/es(type4)"
+
+ 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 alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/es(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fi b/xorg-server/xkbdata.src/symbols/sun_vndr/fi index 84756d4a1..817423968 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/fi +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fi @@ -1,36 +1,90 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "basic" { - include "fi" - // A few keys are different - key <AE11> { [ plus, question ], - [ backslash ] }; - key <AD12> { [ diaeresis, asciicircum ], - [ asciitilde ] }; - key <BKSL> { [ apostrophe, asterisk ], - [ quoteleft ] }; - -}; - +//
+// 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]="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)"
+
+};
+
+
+partial alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/fi(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/fr b/xorg-server/xkbdata.src/symbols/sun_vndr/fr index 7aa23a71b..f52d1956b 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/fr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/fr @@ -1,86 +1,97 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// NOTE: -// These are the French keyboard symbols -// 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 ] }; - - key <LSGT> { [ less, greater ] }; - key <AB01> { [ w, W ] }; - - key <AB07> { [ comma, question ] }; - key <AB08> { [ semicolon, period ] }; - key <AB09> { [ colon, slash ] }; - key <AB10> { [ equal, plus ] }; - - key <CAPS> { [ SunAltGraph ] }; - key <ALGR> { [ Caps_Lock ] }; - - - -}; - -xkb_symbols "type5" { - include "fr" - - key <LSGT> { [ less, greater ] }; -}; - -xkb_symbols "type6" { - include "sun_vndr/us(type6)" - include "fr" - - key <LSGT> { [ less, greater ] }; -}; - +//
+// 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]="France";
+
+ 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 ] };
+
+ include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/fr(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/gb b/xorg-server/xkbdata.src/symbols/sun_vndr/gb index 3cb25fc1d..d21a116cf 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/gb +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gb @@ -1,47 +1,103 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // 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 ] }; - - -}; - -partial -xkb_symbols "type5" { - include "gb(Sundeadkeys)" - - key <TLDE> { [ quoteleft, notsign ], [ brokenbar ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; -}; - -partial -xkb_symbols "type6" { - include "sun_vndr/gb(type5)" -}; +//
+// 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]="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 alphanumeric_keys
+xkb_symbols "type5" {
+
+ name[Group1]="United Kingdom - Sun type 5";
+
+ key <TLDE> { [ quoteleft, notsign, brokenbar ] };
+ key <AD03> { [ e, E, EuroSign ] };
+
+ include "level3(ralt_switch)"
+
+};
+
+
+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/xorg-server/xkbdata.src/symbols/sun_vndr/gr b/xorg-server/xkbdata.src/symbols/sun_vndr/gr index ba781752b..aa5fecbfa 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/gr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/gr @@ -1,33 +1,118 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type5" { - 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 ] }; -}; - +//
+// 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]="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/xorg-server/xkbdata.src/symbols/sun_vndr/it b/xorg-server/xkbdata.src/symbols/sun_vndr/it index 9be87ced9..960bcfc32 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/it +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/it @@ -1,71 +1,141 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "type4" { - - key <BKSL> { [ 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 ] }; - -}; - -xkb_symbols "type5" { - include "it" - - key <AE08> { [ 8, parenleft ], [ braceleft ] }; - key <AE09> { [ 9, parenright ], [ braceright ] }; - - key <BKSL> { [ ugrave, section ], [ asciitilde ] }; -}; - -partial -xkb_symbols "type6" { - include "sun_vndr/it(type5)" -}; +//
+// 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]="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" {
+
+ 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" {
+
+ 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)"
+
+};
+
+
+partial alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/it(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/jp b/xorg-server/xkbdata.src/symbols/sun_vndr/jp index b3a6859bf..5be8647d2 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/jp +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/jp @@ -1,792 +1,819 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ -// -//Copyright 1996, 1998 The Open Group -// -//All Rights Reserved. -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -//OTHER DEALINGS IN THE SOFTWARE. -// -//Except as contained in this notice, the name of The Open Group shall -//not be used in advertising or otherwise to promote the sale, use or -//other dealings in this Software without prior written authorization -//from The Open Group. -// -// US/ASCII layout for a Type 4 Sun keyboard - -xkb_symbols "basic" { - // Alphanumeric section - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - key <BKSP> { [ BackSpace ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ] }; - key <AD08> { [ i, I ], [ kana_NI ] }; - key <AD09> { [ o, O ], [ kana_RA ] }; - key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key <RTRN> { [ Return ] }; - - key <CAPS> { [ Caps_Lock ] }; - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ] }; - key <AC08> { [ k, K ], [ kana_NO ] }; - key <AC09> { [ l, L ], [ kana_RI ] }; - key <AC10> { [ semicolon, plus ], [ kana_RE ] }; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ] }; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - - key <SPCE> { [ space ] }; - key <KANJ> { [ Kanji ] }; - key <HENK> { [ Henkan_Mode ] }; -// key <LNFD> { [ backslash, underscore], [ kana_RO ]}; - // End alphanumeric section - - // Begin "Function" section - key <ESC> { [ Escape ] }; - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - key <BKSL> { [ backslash, bar ], [ prolongedsound ] }; -// key <BRCR> { [ Linefeed ] }; - key <EXEC> { [ Execute ] }; -}; -xkb_symbols "type4" { - - // Alphanumeric section - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - key <BKSP> { [ BackSpace ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ] }; - key <AD08> { [ i, I ], [ kana_NI ] }; - key <AD09> { [ o, O ], [ kana_RA ] }; - key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key <RTRN> { [ Return ] }; - - key <CAPS> { [ Caps_Lock ] }; - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ] }; - key <AC08> { [ k, K ], [ kana_NO ] }; - key <AC09> { [ l, L ], [ kana_RI ] }; - key <AC10> { [ semicolon, plus ], [ kana_RE ] }; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <LFSH> { [ Shift_L ] }; - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ] }; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - key <RTSH> { [ Shift_R ] }; - - key <LCTL> { [ Control_L ] }; - key <SPCE> { [ space ] }; - key <KANJ> { [ Kanji ] }; - key <HENK> { [ Henkan_Mode ] }; - key <LALT> { [ Alt_L ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <LNFD> { [ backslash, underscore], [ kana_RO ]}; - key <COMP> { [ Multi_key ] }; - key <EXEC> { [ Execute ] }; -// key <TLFD> { [ Linefeed ] }; - // End alphanumeric section - - // Begin "Function" section - key <ESC> { [ Escape ] }; - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - key <BKSL> { [ backslash, bar ], [ prolongedsound ] }; - key <BRCR> { [ Linefeed ] }; - - 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 ] }; - // End "Function" section - - // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key <PAUS> { [ R1, R1 ], [ Pause ] }; - key <DELE> { [ Delete ] }; - key <HELP> { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key <NMLK> { [ Num_Lock ] }; - key <KPEQ> { [ R4, R4 ], [ KP_Equal ] }; - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; - key <KPSU> { [ KP_Subtract ] }; - - 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 <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 - - - // 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 Mod4 { Alt_L }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5" { - - // Alphanumeric section - key <TLDE> { [ backslash, bar ], [ prolongedsound ] }; - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - key <BKSP> { [ BackSpace ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ] }; - key <AD08> { [ i, I ], [ kana_NI ] }; - key <AD09> { [ o, O ], [ kana_RA ] }; - key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key <RTRN> { [ Return ] }; - - key <CAPS> { [ Caps_Lock ] }; - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ] }; - key <AC08> { [ k, K ], [ kana_NO ] }; - key <AC09> { [ l, L ], [ kana_RI ] }; - key <AC10> { [ semicolon, plus ], [ kana_RE ] }; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <LFSH> { [ Shift_L ] }; - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ] }; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - key <RTSH> { [ Shift_R ] }; - - key <LCTL> { [ Control_L ] }; -// key <RCTL> { [ Control_R ] }; - key <EXEC> { [ Execute ] }; - key <SPCE> { [ space ] }; - key <KANJ> { [ Kanji ] }; - key <HENK> { [ Henkan_Mode ] }; - 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 <ESC> { [ Escape ] }; - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - 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 ] }; - // End "Function" section - - // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] }; - key <PAUS> { [ R1, R1 ], [ 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" - key <NMLK> { [ Num_Lock ] }; - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; - key <KPSU> { [ R4, R4 ], [ KP_Subtract ] }; - - 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 <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 ] }; - key <KPEN> { [ KP_Enter ] }; - - key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] }; - key <KPDL> { [ KP_Delete, 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 ] }; - - // 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 Mod4 { Alt_L }; -}; - -xkb_symbols "type5hobo" { - - // Alphanumeric section - key <TLDE> { [ backslash, bar ], [ prolongedsound ] }; - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ], [ KP_7 ]}; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ], [ KP_8 ]}; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ], [ KP_9 ]}; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ], [ KP_Multiply]}; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - key <BKSP> { [ BackSpace ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ], [ KP_4 ] }; - key <AD08> { [ i, I ], [ kana_NI ], [ KP_5 ] }; - key <AD09> { [ o, O ], [ kana_RA ], [ KP_6 ] }; - key <AD10> { [ p, P ], [ kana_SE ], [ KP_Subtract]}; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key <RTRN> { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; - - key <CAPS> { [ Caps_Lock ] }; - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ], [ KP_1 ]}; - key <AC08> { [ k, K ], [ kana_NO ], [ KP_2 ]}; - key <AC09> { [ l, L ], [ kana_RI ], [ KP_3 ]}; - key <AC10> { [ semicolon, plus], [ kana_RE ], [ KP_Add ]}; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <LFSH> { [ Shift_L ] }; - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ], [ KP_0 ]}; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ], [ KP_Decimal ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ], [ KP_Divide ]}; - key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - key <RTSH> { [ Shift_R ] }; - - key <LCTL> { [ Control_L ] }; - key <EXEC> { [ Execute ] }; - key <SPCE> { [ space ] }; - key <KANJ> { [ Kanji ] }; - key <HENK> { [ Henkan_Mode ] }; - 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 <ESC> { [ Escape ] }; - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - 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 ] }; - // End "Function" section - - // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] }; - key <PAUS> { [ R1, R1 ], [ 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" - key <NMLK> { [ Num_Lock ] }; -// key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; -// key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; -// key <KPSU> { [ R4, R4 ], [ KP_Subtract ] }; - -// 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 <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 ] }; -// key <KPEN> { [ KP_Enter ] }; - -// key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] }; -// key <KPDL> { [ KP_Delete, 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 ] }; - - // 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 Mod4 { Alt_L }; -}; - -// layout for a Japanese Type 6 Sun keyboard -// Just shows differences from Type 6 US layout -partial -xkb_symbols "type6" { - - // Alphanumeric section - // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash. - key <AE13> { [ backslash, bar ], [ prolongedsound ] }; - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ] }; - key <AD08> { [ i, I ], [ kana_NI ] }; - key <AD09> { [ o, O ], [ kana_RA ] }; - key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ] }; - key <AC08> { [ k, K ], [ kana_NO ] }; - key <AC09> { [ l, L ], [ kana_RI ] }; - key <AC10> { [ semicolon, plus ], [ kana_RE ] }; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ] }; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]}; - key <AB11> { [ backslash, underscore], [ kana_RO ] }; - key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - - key <EXEC> { [ Execute ] }; - key <KANJ> { [ Kanji ] }; - key <HENK> { [ Henkan_Mode ] }; - key <ALGR> { [ Kana_Lock, Mode_switch ] }; - // End alphanumeric section -}; - -xkb_symbols "x86" { - include "sun_vndr/us(pc101)" - include "sun_vndr/jp(basic)" - key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] }; - - key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ]}; - key <AE13> { [ backslash, bar ], [ prolongedsound ]}; - - - key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ]}; - - key <ALGR> { [ Mode_switch ] }; - key <RALT> { [ Alt_R ] }; - -}; - -xkb_symbols "J3100" { - include "sun_vndr/us(pc101)" - - // Alphanumeric section - key <AE01> { [ 1, exclam ], [ kana_NU ] }; - key <AE02> { [ 2, quotedbl ], [ kana_FU ] }; - key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] }; - key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] }; - key <AE05> { [ 5, percent ], [ kana_E, kana_e ] }; - key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] }; - key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] }; - key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] }; - key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] }; - key <AE10> { [ 0 ], [ kana_WA, kana_WO ] }; - key <AE11> { [ minus, equal ], [ kana_HO ] }; - key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] }; - key <BKSP> { [ BackSpace ] }; - - key <TAB> { [ Tab, ISO_Left_Tab ] }; - key <AD01> { [ q, Q ], [ kana_TA ] }; - key <AD02> { [ w, W ], [ kana_TE ] }; - key <AD03> { [ e, E ], [ kana_I, kana_i ] }; - key <AD04> { [ r, R ], [ kana_SU ] }; - key <AD05> { [ t, T ], [ kana_KA ] }; - key <AD06> { [ y, Y ], [ kana_N ] }; - key <AD07> { [ u, U ], [ kana_NA ] }; - key <AD08> { [ i, I ], [ kana_NI ] }; - key <AD09> { [ o, O ], [ kana_RA ] }; - key <AD10> { [ p, P ], [ kana_SE ] }; - key <AD11> { [ at, quoteleft ], [ voicedsound ] }; - key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] }; - key <RTRN> { [ Return ] }; - - key <CAPS> { [ Caps_Lock ] }; - key <AC01> { [ a, A ], [ kana_CHI ] }; - key <AC02> { [ s, S ], [ kana_TO ] }; - key <AC03> { [ d, D ], [ kana_SHI ] }; - key <AC04> { [ f, F ], [ kana_HA ] }; - key <AC05> { [ g, G ], [ kana_KI ] }; - key <AC06> { [ h, H ], [ kana_KU ] }; - key <AC07> { [ j, J ], [ kana_MA ] }; - key <AC08> { [ k, K ], [ kana_NO ] }; - key <AC09> { [ l, L ], [ kana_RI ] }; - key <AC10> { [ semicolon, plus ], [ kana_RE ] }; - key <AC11> { [ colon, asterisk ], [ kana_KE ] }; - key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] }; - - key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] }; - key <AB02> { [ x, X ], [ kana_SA ] }; - key <AB03> { [ c, C ], [ kana_SO ] }; - key <AB04> { [ v, V ], [ kana_HI ] }; - key <AB05> { [ b, B ], [ kana_KO ] }; - key <AB06> { [ n, N ], [ kana_MI ] }; - key <AB07> { [ m, M ], [ kana_MO ] }; - key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] }; - key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] }; - key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]}; -// key <UNDR> { [ backslash, underscore], [ kana_RO ] }; - - key <SPCE> { [ space ] }; -// key <KANJ> { [ Kanji ] }; -// key <HENK> { [ Henkan_Mode ] }; -// key <LNFD> { [ backslash, underscore], [ kana_RO ]}; - // End alphanumeric section - - // Begin "Function" section - key <ESC> { [ Escape ] }; - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - key <BKSL> { [ backslash, bar ], [ prolongedsound ] }; -// key <BRCR> { [ Linefeed ] }; -// key <EXEC> { [ Execute ] }; - - key <ESC> { [ Escape, 3 ] }; - - key <AE02> { [ 2, at ], [ kana_FU ]}; - key <AE06> { [ 6, asciicircum ], [ kana_O, kana_o ]}; - key <AE07> { [ 7, ampersand ], [ kana_YA, kana_ya ]}; - key <AE08> { [ 8, asterisk ], [ kana_YU, kana_yu ]}; - key <AE09> { [ 9, parenleft ], [ kana_YO, kana_yo ]}; - key <AE10> { [ 0, parenright ], [ kana_WA, kana_WO ]}; - key <AE11> { [ minus, underscore ], [ kana_HO ]}; - key <AE12> { [ equal, plus ], [ kana_HE ]}; - - key <BKSL> { [ backslash, bar ], [ prolongedsound ]}; - key <AE12> { [ equal, plus ], [ kana_HE ]}; - - key <AD11> { [ bracketleft, braceleft ], [ voicedsound ]}; - key <AD12> { [ bracketright, braceright ], [ semivoicedsound, kana_openingbracket ]}; - - key <AC10> { [ semicolon, colon ], [ kana_RE ]}; - key <AC11> { [ quoteright, quotedbl ], [ kana_KE ]}; - - key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket ]}; - key <LSGT> { [ backslash, bar ], [ kana_RO ]}; -// key <ALGR> { [ Mode_switch ] }; - key <RALT> { [ Henkan_Mode ] }; - key <RCTL> { [ Mode_switch ] }; - -}; - -xkb_symbols "Muhenkan_x86" { - include "sun_vndr/jp(x86)" - - key <EXEC> { [ Muhenkan ] }; -}; - - - -partial -xkb_symbols "type7" { - include "sun_vndr/jp(type6)" - key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ] }; - key <HZTG> { [ Henkan_Mode ] }; - key <HENK> { [ Kana_Lock, Mode_switch ] }; - key <ALGR> { [ Alt_R ] }; -}; - +// $XdotOrg: $
+//
+// 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.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998 The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//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 "basic" {
+ // Alphanumeric section
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] };
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] };
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+ key <BKSP> { [ BackSpace ] };
+
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ] };
+ key <AD08> { [ i, I ], [ kana_NI ] };
+ key <AD09> { [ o, O ], [ kana_RA ] };
+ key <AD10> { [ p, P ], [ kana_SE ] };
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+ key <RTRN> { [ Return ] };
+
+ key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ] };
+ key <AC08> { [ k, K ], [ kana_NO ] };
+ key <AC09> { [ l, L ], [ kana_RI ] };
+ key <AC10> { [ semicolon, plus ], [ kana_RE ] };
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ] };
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+ key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+
+ key <SPCE> { [ space ] };
+ key <KANJ> { [ Kanji ] };
+ key <HENK> { [ Henkan_Mode ] };
+// key <LNFD> { [ backslash, underscore], [ kana_RO ]};
+ // End alphanumeric section
+
+ // Begin "Function" section
+ key <ESC> { [ Escape ] };
+ key <FK01> { [ F1 ] };
+ key <FK02> { [ F2 ] };
+ key <FK03> { [ F3 ] };
+ key <FK04> { [ F4 ] };
+ key <FK05> { [ F5 ] };
+ key <FK06> { [ F6 ] };
+ key <FK07> { [ F7 ] };
+ key <FK08> { [ F8 ] };
+ key <FK09> { [ F9 ] };
+ key <FK10> { [ F10 ] };
+ key <FK11> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ key <BKSL> { [ backslash, bar ], [ prolongedsound ] };
+// key <BRCR> { [ Linefeed ] };
+ key <EXEC> { [ Execute ] };
+};
+xkb_symbols "type4" {
+
+ // Alphanumeric section
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] };
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] };
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+ key <BKSP> { [ BackSpace ] };
+
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ] };
+ key <AD08> { [ i, I ], [ kana_NI ] };
+ key <AD09> { [ o, O ], [ kana_RA ] };
+ key <AD10> { [ p, P ], [ kana_SE ] };
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+ key <RTRN> { [ Return ] };
+
+ key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ] };
+ key <AC08> { [ k, K ], [ kana_NO ] };
+ key <AC09> { [ l, L ], [ kana_RI ] };
+ key <AC10> { [ semicolon, plus ], [ kana_RE ] };
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <LFSH> { [ Shift_L ] };
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ] };
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+ key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+ key <RTSH> { [ Shift_R ] };
+
+ key <LCTL> { [ Control_L ] };
+ key <SPCE> { [ space ] };
+ key <KANJ> { [ Kanji ] };
+ key <HENK> { [ Henkan_Mode ] };
+ key <LALT> { [ Alt_L ] };
+ key <ALGR> { [ Mode_switch ] };
+ key <LMTA> { [ Meta_L ] };
+ key <RMTA> { [ Meta_R ] };
+ key <LNFD> { [ backslash, underscore], [ kana_RO ]};
+ key <COMP> { [ Multi_key ] };
+ key <EXEC> { [ Execute ] };
+// key <TLFD> { [ Linefeed ] };
+ // End alphanumeric section
+
+ // Begin "Function" section
+ key <ESC> { [ Escape ] };
+ key <FK01> { [ F1 ] };
+ key <FK02> { [ F2 ] };
+ key <FK03> { [ F3 ] };
+ key <FK04> { [ F4 ] };
+ key <FK05> { [ F5 ] };
+ key <FK06> { [ F6 ] };
+ key <FK07> { [ F7 ] };
+ key <FK08> { [ F8 ] };
+ key <FK09> { [ F9 ] };
+ key <FK10> { [ F10 ] };
+ key <FK11> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ key <BKSL> { [ backslash, bar ], [ prolongedsound ] };
+ key <BRCR> { [ Linefeed ] };
+
+ 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 ] };
+ // End "Function" section
+
+ // Begin "Editing" section
+ key <PRSC> { [ R2, R2 ], [ Print ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] };
+ key <PAUS> { [ R1, R1 ], [ Pause ] };
+ key <DELE> { [ Delete ] };
+ key <HELP> { [ Help ] };
+
+ // End "Editing" section, begin "Keypad"
+ key <NMLK> { [ Num_Lock ] };
+ key <KPEQ> { [ R4, R4 ], [ KP_Equal ] };
+ key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+ key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+ key <KPSU> { [ KP_Subtract ] };
+
+ 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 <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
+
+
+ // 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 Mod4 { Alt_L };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+ // Alphanumeric section
+ key <TLDE> { [ backslash, bar ], [ prolongedsound ] };
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] };
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] };
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+ key <BKSP> { [ BackSpace ] };
+
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ] };
+ key <AD08> { [ i, I ], [ kana_NI ] };
+ key <AD09> { [ o, O ], [ kana_RA ] };
+ key <AD10> { [ p, P ], [ kana_SE ] };
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+ key <RTRN> { [ Return ] };
+
+ key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ] };
+ key <AC08> { [ k, K ], [ kana_NO ] };
+ key <AC09> { [ l, L ], [ kana_RI ] };
+ key <AC10> { [ semicolon, plus ], [ kana_RE ] };
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <LFSH> { [ Shift_L ] };
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ] };
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+ key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+ key <RTSH> { [ Shift_R ] };
+
+ key <LCTL> { [ Control_L ] };
+// key <RCTL> { [ Control_R ] };
+ key <EXEC> { [ Execute ] };
+ key <SPCE> { [ space ] };
+ key <KANJ> { [ Kanji ] };
+ key <HENK> { [ Henkan_Mode ] };
+ 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 <ESC> { [ Escape ] };
+ key <FK01> { [ F1 ] };
+ key <FK02> { [ F2 ] };
+ key <FK03> { [ F3 ] };
+ key <FK04> { [ F4 ] };
+ key <FK05> { [ F5 ] };
+ key <FK06> { [ F6 ] };
+ key <FK07> { [ F7 ] };
+ key <FK08> { [ F8 ] };
+ key <FK09> { [ F9 ] };
+ key <FK10> { [ F10 ] };
+ key <FK11> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ 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 ] };
+ // End "Function" section
+
+ // Begin "Editing" section
+ key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] };
+ key <PAUS> { [ R1, R1 ], [ 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"
+ key <NMLK> { [ Num_Lock ] };
+ key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+ key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+ key <KPSU> { [ R4, R4 ], [ KP_Subtract ] };
+
+ 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 <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 ] };
+ key <KPEN> { [ KP_Enter ] };
+
+ key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] };
+ key <KPDL> { [ KP_Delete, 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 ] };
+
+ // 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 Mod4 { Alt_L };
+};
+
+xkb_symbols "type5hobo" {
+
+ // Alphanumeric section
+ key <TLDE> { [ backslash, bar ], [ prolongedsound ] };
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ], [ KP_7 ]};
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ], [ KP_8 ]};
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ], [ KP_9 ]};
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ], [ KP_Multiply]};
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+ key <BKSP> { [ BackSpace ] };
+
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ], [ KP_4 ] };
+ key <AD08> { [ i, I ], [ kana_NI ], [ KP_5 ] };
+ key <AD09> { [ o, O ], [ kana_RA ], [ KP_6 ] };
+ key <AD10> { [ p, P ], [ kana_SE ], [ KP_Subtract]};
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+ key <RTRN> { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] };
+
+ key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ], [ KP_1 ]};
+ key <AC08> { [ k, K ], [ kana_NO ], [ KP_2 ]};
+ key <AC09> { [ l, L ], [ kana_RI ], [ KP_3 ]};
+ key <AC10> { [ semicolon, plus], [ kana_RE ], [ KP_Add ]};
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <LFSH> { [ Shift_L ] };
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ], [ KP_0 ]};
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ], [ KP_Decimal ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
+ key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+ key <RTSH> { [ Shift_R ] };
+
+ key <LCTL> { [ Control_L ] };
+ key <EXEC> { [ Execute ] };
+ key <SPCE> { [ space ] };
+ key <KANJ> { [ Kanji ] };
+ key <HENK> { [ Henkan_Mode ] };
+ 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 <ESC> { [ Escape ] };
+ key <FK01> { [ F1 ] };
+ key <FK02> { [ F2 ] };
+ key <FK03> { [ F3 ] };
+ key <FK04> { [ F4 ] };
+ key <FK05> { [ F5 ] };
+ key <FK06> { [ F6 ] };
+ key <FK07> { [ F7 ] };
+ key <FK08> { [ F8 ] };
+ key <FK09> { [ F9 ] };
+ key <FK10> { [ F10 ] };
+ key <FK11> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ 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 ] };
+ // End "Function" section
+
+ // Begin "Editing" section
+ key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] };
+ key <PAUS> { [ R1, R1 ], [ 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"
+ key <NMLK> { [ Num_Lock ] };
+// key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+// key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+// key <KPSU> { [ R4, R4 ], [ KP_Subtract ] };
+
+// 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 <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 ] };
+// key <KPEN> { [ KP_Enter ] };
+
+// key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] };
+// key <KPDL> { [ KP_Delete, 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 ] };
+
+ // 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 Mod4 { Alt_L };
+};
+
+// layout for a Japanese Type 6 Sun keyboard
+// Just shows differences from Type 6 US layout
+partial
+xkb_symbols "type6" {
+
+ // Alphanumeric section
+ // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
+ key <AE13> { [ backslash, bar ], [ prolongedsound ] };
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] };
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] };
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ] };
+ key <AD08> { [ i, I ], [ kana_NI ] };
+ key <AD09> { [ o, O ], [ kana_RA ] };
+ key <AD10> { [ p, P ], [ kana_SE ] };
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ] };
+ key <AC08> { [ k, K ], [ kana_NO ] };
+ key <AC09> { [ l, L ], [ kana_RI ] };
+ key <AC10> { [ semicolon, plus ], [ kana_RE ] };
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ] };
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+ key <AB11> { [ backslash, underscore], [ kana_RO ] };
+ key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+
+ key <EXEC> { [ Execute ] };
+ key <KANJ> { [ Kanji ] };
+ key <HENK> { [ Henkan_Mode ] };
+ key <ALGR> { [ Kana_Lock, Mode_switch ] };
+ // End alphanumeric section
+};
+
+xkb_symbols "x86" {
+ include "sun_vndr/us(pc101)"
+ include "sun_vndr/jp(basic)"
+ key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+
+ key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ]};
+ key <AE13> { [ backslash, bar ], [ prolongedsound ]};
+
+
+ key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ]};
+
+ key <ALGR> { [ Mode_switch ] };
+ key <RALT> { [ Alt_R ] };
+
+};
+
+xkb_symbols "J3100" {
+ include "sun_vndr/us(pc101)"
+
+ // Alphanumeric section
+ key <AE01> { [ 1, exclam ], [ kana_NU ] };
+ key <AE02> { [ 2, quotedbl ], [ kana_FU ] };
+ key <AE03> { [ 3, numbersign ], [ kana_A, kana_a ] };
+ key <AE04> { [ 4, dollar ], [ kana_U, kana_u ] };
+ key <AE05> { [ 5, percent ], [ kana_E, kana_e ] };
+ key <AE06> { [ 6, ampersand ], [ kana_O, kana_o ] };
+ key <AE07> { [ 7, apostrophe ], [ kana_YA, kana_ya ] };
+ key <AE08> { [ 8, parenleft ], [ kana_YU, kana_yu ] };
+ key <AE09> { [ 9, parenright ], [ kana_YO, kana_yo ] };
+ key <AE10> { [ 0 ], [ kana_WA, kana_WO ] };
+ key <AE11> { [ minus, equal ], [ kana_HO ] };
+ key <AE12> { [ asciicircum, asciitilde], [ kana_HE ] };
+ key <BKSP> { [ BackSpace ] };
+
+ key <TAB> { [ Tab, ISO_Left_Tab ] };
+ key <AD01> { [ q, Q ], [ kana_TA ] };
+ key <AD02> { [ w, W ], [ kana_TE ] };
+ key <AD03> { [ e, E ], [ kana_I, kana_i ] };
+ key <AD04> { [ r, R ], [ kana_SU ] };
+ key <AD05> { [ t, T ], [ kana_KA ] };
+ key <AD06> { [ y, Y ], [ kana_N ] };
+ key <AD07> { [ u, U ], [ kana_NA ] };
+ key <AD08> { [ i, I ], [ kana_NI ] };
+ key <AD09> { [ o, O ], [ kana_RA ] };
+ key <AD10> { [ p, P ], [ kana_SE ] };
+ key <AD11> { [ at, quoteleft ], [ voicedsound ] };
+ key <AD12> { [ bracketleft, braceleft ], [ semivoicedsound, kana_openingbracket ] };
+ key <RTRN> { [ Return ] };
+
+ key <CAPS> { [ Caps_Lock ] };
+ key <AC01> { [ a, A ], [ kana_CHI ] };
+ key <AC02> { [ s, S ], [ kana_TO ] };
+ key <AC03> { [ d, D ], [ kana_SHI ] };
+ key <AC04> { [ f, F ], [ kana_HA ] };
+ key <AC05> { [ g, G ], [ kana_KI ] };
+ key <AC06> { [ h, H ], [ kana_KU ] };
+ key <AC07> { [ j, J ], [ kana_MA ] };
+ key <AC08> { [ k, K ], [ kana_NO ] };
+ key <AC09> { [ l, L ], [ kana_RI ] };
+ key <AC10> { [ semicolon, plus ], [ kana_RE ] };
+ key <AC11> { [ colon, asterisk ], [ kana_KE ] };
+ key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+
+ key <AB01> { [ z, Z ], [ kana_TSU, kana_tsu ] };
+ key <AB02> { [ x, X ], [ kana_SA ] };
+ key <AB03> { [ c, C ], [ kana_SO ] };
+ key <AB04> { [ v, V ], [ kana_HI ] };
+ key <AB05> { [ b, B ], [ kana_KO ] };
+ key <AB06> { [ n, N ], [ kana_MI ] };
+ key <AB07> { [ m, M ], [ kana_MO ] };
+ key <AB08> { [ comma, less ], [ kana_NE, kana_comma ] };
+ key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ] };
+ key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+// key <UNDR> { [ backslash, underscore], [ kana_RO ] };
+
+ key <SPCE> { [ space ] };
+// key <KANJ> { [ Kanji ] };
+// key <HENK> { [ Henkan_Mode ] };
+// key <LNFD> { [ backslash, underscore], [ kana_RO ]};
+ // End alphanumeric section
+
+ // Begin "Function" section
+ key <ESC> { [ Escape ] };
+ key <FK01> { [ F1 ] };
+ key <FK02> { [ F2 ] };
+ key <FK03> { [ F3 ] };
+ key <FK04> { [ F4 ] };
+ key <FK05> { [ F5 ] };
+ key <FK06> { [ F6 ] };
+ key <FK07> { [ F7 ] };
+ key <FK08> { [ F8 ] };
+ key <FK09> { [ F9 ] };
+ key <FK10> { [ F10 ] };
+ key <FK11> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ key <BKSL> { [ backslash, bar ], [ prolongedsound ] };
+// key <BRCR> { [ Linefeed ] };
+// key <EXEC> { [ Execute ] };
+
+ key <ESC> { [ Escape, 3 ] };
+
+ key <AE02> { [ 2, at ], [ kana_FU ]};
+ key <AE06> { [ 6, asciicircum ], [ kana_O, kana_o ]};
+ key <AE07> { [ 7, ampersand ], [ kana_YA, kana_ya ]};
+ key <AE08> { [ 8, asterisk ], [ kana_YU, kana_yu ]};
+ key <AE09> { [ 9, parenleft ], [ kana_YO, kana_yo ]};
+ key <AE10> { [ 0, parenright ], [ kana_WA, kana_WO ]};
+ key <AE11> { [ minus, underscore ], [ kana_HO ]};
+ key <AE12> { [ equal, plus ], [ kana_HE ]};
+
+ key <BKSL> { [ backslash, bar ], [ prolongedsound ]};
+ key <AE12> { [ equal, plus ], [ kana_HE ]};
+
+ key <AD11> { [ bracketleft, braceleft ], [ voicedsound ]};
+ key <AD12> { [ bracketright, braceright ], [ semivoicedsound, kana_openingbracket ]};
+
+ key <AC10> { [ semicolon, colon ], [ kana_RE ]};
+ key <AC11> { [ quoteright, quotedbl ], [ kana_KE ]};
+
+ key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket ]};
+ key <LSGT> { [ backslash, bar ], [ kana_RO ]};
+// key <ALGR> { [ Mode_switch ] };
+ key <RALT> { [ Henkan_Mode ] };
+ key <RCTL> { [ Mode_switch ] };
+
+};
+
+xkb_symbols "Muhenkan_x86" {
+ include "sun_vndr/jp(x86)"
+
+ key <EXEC> { [ Muhenkan ] };
+};
+
+
+
+partial
+xkb_symbols "type7" {
+ include "sun_vndr/jp(type6)"
+ key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ] };
+ key <TLDE> { [ Henkan_Mode ] };
+ key <HENK> { [ Kana_Lock, Mode_switch ] };
+ key <ALGR> { [ Alt_R, Alt_R ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/kr b/xorg-server/xkbdata.src/symbols/sun_vndr/kr new file mode 100644 index 000000000..51959b23f --- /dev/null +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/kr @@ -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
+//
+
+// 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" {
+
+ 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" {
+
+ // A few keys are different
+ key <ALGR> { [ Hangul ] };
+ key <COMP> { [ Hangul_Hanja ] };
+ key <BKSL> { [ backslash, bar, brokenbar ] };
+
+ include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/kr(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/lt b/xorg-server/xkbdata.src/symbols/sun_vndr/lt index 8a8d54a64..6e51cb342 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/lt +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lt @@ -1,75 +1,119 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// $TOG: hu /main/2 1997/06/13 06:25:05 kaleb $ -default partial alphanumeric_keys -xkb_symbols "type5" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Hungarian keyboard. - - // Alphanumeric section - - 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 -}; - +//
+// 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]="Lithuania";
+
+
+
+ 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/xorg-server/xkbdata.src/symbols/sun_vndr/lv b/xorg-server/xkbdata.src/symbols/sun_vndr/lv index cb5f97c6f..6661afddf 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/lv +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/lv @@ -1,69 +1,118 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -default partial alphanumeric_keys -xkb_symbols "type5" { - - // Describes the differences between a very simple US/ASCII - // keyboard and a very simple Latvian keyboard. - - // Alphanumeric section - - 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 -}; - +//
+// 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]="Latvia";
+
+
+ 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/xorg-server/xkbdata.src/symbols/sun_vndr/nl b/xorg-server/xkbdata.src/symbols/sun_vndr/nl index f6564d132..703614277 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/nl +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/nl @@ -1,62 +1,149 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // 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 ] }; - -}; - +//
+// 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
+//
+
+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" {
+
+ 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/xorg-server/xkbdata.src/symbols/sun_vndr/no b/xorg-server/xkbdata.src/symbols/sun_vndr/no index aad44cc20..1d1d43449 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/no +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/no @@ -1,71 +1,145 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - // 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 ] }; - -}; - -xkb_symbols "type5" { - include "no" - - 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 ] }; -}; - - - +//
+// 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 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" {
+
+ 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" {
+
+ 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 <BKSL> { [ quoteright, asterisk, quoteleft ] };
+ key <LSGT> { [ less, greater ] };
+
+ include "level3(ralt_switch)"
+ include "kpdl(comma)"
+
+};
+
+
+partial default alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/no(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/pl b/xorg-server/xkbdata.src/symbols/sun_vndr/pl index deb58190d..684b54911 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/pl +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pl @@ -1,51 +1,102 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "type5" { - 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 ] }; -}; - +//
+// 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]="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/xorg-server/xkbdata.src/symbols/sun_vndr/pt b/xorg-server/xkbdata.src/symbols/sun_vndr/pt index a88c68270..561abb594 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/pt +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/pt @@ -1,82 +1,143 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "type4" { - //this is a Portugal4 keyboard - - 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 ] }; - -}; - -xkb_symbols "type5" { - include "pt" - - 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 ]}; - -}; - -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 ]}; - -}; +//
+// 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 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" {
+
+ 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" {
+
+ 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 <AD11> { [ plus, asterisk, dead_diaeresis ]};
+
+ include "level3(ralt_switch)"
+
+};
+
+
+partial default alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/pt(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ro b/xorg-server/xkbdata.src/symbols/sun_vndr/ro new file mode 100644 index 000000000..df87262ed --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/ru b/xorg-server/xkbdata.src/symbols/sun_vndr/ru index 101cad72d..833576dcc 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/ru +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/ru @@ -1,46 +1,112 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// - -xkb_symbols "basic" { - include "ru" - // A few keys are different - key <BKSL> { [ backslash, bar ], - [ slash, question ] }; - key <AB10> { [ slash, question ], - [ ediaeresis, Ediaeresis ] }; - -}; - -// layout for a Sun Type 6 Russian keyboard -partial -xkb_symbols "type6" { - include "sun_vndr/ru(basic)" - - key <AE03> { [ 3, numbersign ], - [ 3, numerosign ] }; - key <AE04> { [ 4, dollar ], - [ 4, percent ] }; - - key <LSGT> { [ backslash, bar ] }; -}; +//
+// 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 alphanumeric_keys
+xkb_symbols "type6" {
+
+ 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)"
+
+};
+
+
+partial default alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/ru(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/se b/xorg-server/xkbdata.src/symbols/sun_vndr/se index 3daf12525..ec41629cb 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/se +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/se @@ -1,75 +1,280 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "type4" { - key <BKSL> { [ section, onehalf ] }; - 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 ] }; -}; - - -xkb_symbols "type5" { - include "se" - - 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 <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] }; - key <BKSL> { [ quoteright, asterisk ], [ quoteleft ]}; -}; - -partial -xkb_symbols "type6" { - include "se(Sundeadkeys)" - - key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] }; -}; +//
+// 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 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 "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 <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 "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
+};
+
+// 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/xorg-server/xkbdata.src/symbols/sun_vndr/sk b/xorg-server/xkbdata.src/symbols/sun_vndr/sk new file mode 100644 index 000000000..f27726013 --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/solaris b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris index c99f04f3e..d07b150d1 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/solaris +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/solaris @@ -1,173 +1,213 @@ -//------------------------------------------------------------------------- -// -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -//------------------------------------------------------------------------- -// -// ident "@(#)solaris 1.7 05/11/08 SMI" -// - -// 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" { - - // 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 - // hear them say to hit "L1-A" to enter the OpenBoot PROM) - // These names get mapped to the keysyms F11-F20 - 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 ] }; - - // And on the right side, the function keys were labeled R1-R15, - // which get mapped to the keysyms F21-F35 - // This includes the keys that became the numeric keypad - key <PAUS> { [ R1, R1 ], [ Pause ] }; - key <PRSC> { [ R2, R2 ], [ Print ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] }; - - key <KPEQ> { [ KP_Equal ], [ R4, KP_Equal ] }; - key <KPDV> { [ KP_Divide ], [ R5, KP_Divide ] }; - key <KPMU> { [ KP_Multiply ], [ R6, KP_Multiply ] }; - - key <KP7> { [ KP_Home, KP_7, R7 ], [ R7, KP_7, Home ] }; - key <KP8> { [ KP_Up, KP_8, R8 ], [ R8, KP_8, Up ] }; - key <KP9> { [ KP_Prior, KP_9, R9 ], [ R9, KP_9, Prior ] }; - - key <KP4> { [ KP_Left, KP_4, R10 ], [ R10, KP_4, Left ] }; - key <KP5> { [ KP_Begin, KP_5, R11 ], [ R11, KP_5 ] }; - key <KP6> { [ KP_Right, KP_6, R12 ], [ R12, KP_6, Right ] }; - - key <KP1> { [ KP_End, KP_1, R13 ], [ R13, KP_1, End ] }; - key <KP2> { [ KP_Down, KP_2, R14 ], [ R14, KP_2, Down ] }; - key <KP3> { [ KP_Next, KP_3, R15 ], [ R15, KP_3, Next ] }; - - // F11 & F12 are mapped to SunF36 and SunF37 since they were added - // after F11-F35 were already assigned on Sun keyboards - key <FK11> { [ SunF36 ], [ F11 ] }; - key <FK12> { [ SunF37 ], [ F12 ] }; - - // These were added to the keyboard much later and simply got mapped - // to their logical names - key <HELP> { [ Help ] }; - key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; - key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key <LALT> { [ Alt_L ] }; - // key <RALT> { [ Mode_switch ] }; - // key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; - - // 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 Mod4 { Meta_L, Meta_R }; - -}; - -// Map the keys to the actual key names instead of the ancient Sun function -// keys -partial -xkb_symbols "keynames" { - 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 ] }; - - key <HELP> { [ Help ] }; - - key <PAUS> { [ Pause ] }; - key <PRSC> { [ Print ] }; - key <SCLK> { [ Scroll_Lock, Break ] }; - - key <KP7> { [ KP_Home, KP_7 ] }; - key <KP8> { [ KP_Up, KP_8 ] }; - key <KP9> { [ KP_Prior, KP_9 ] }; - - 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 <KPEQ> { [ KP_Equal ] }; - - key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; - key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] }; - key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] }; - key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - key <LALT> { [ Alt_L ] }; - key <RALT> { [ Mode_switch ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; - -}; - -// Map the keys to the XFree86 key names instead of the Sun key names -partial -xkb_symbols "xf86keynames" { - key <STOP> { [ XF86Stop ], [ F11 ] }; - key <AGAI> { [ Redo ], [ F12 ] }; - key <PROP> { [ SunProps ], [ F13 ] }; - key <UNDO> { [ Undo ], [ F14 ] }; - key <FRNT> { [ SunFront ], [ F15 ] }; - key <COPY> { [ XF86Copy ], [ F16 ] }; - key <OPEN> { [ XF86Open ], [ F17 ] }; - key <PAST> { [ XF86Paste ], [ F18 ] }; - key <FIND> { [ Find ], [ F19 ] }; - key <CUT> { [ XF86Cut ], [ F20 ] }; - - key <MUTE> { [ XF86AudioMute, SunVideoDegauss ] }; - key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ] }; - key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness ] }; - key <POWR> { [ XF86Sleep, XF86PowerDown ] }; -}; +//-------------------------------------------------------------------------
+//
+// 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
+//
+
+// 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_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
+ // hear them say to hit "L1-A" to enter the OpenBoot PROM)
+ // These names get mapped to the keysyms F11-F20
+ 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 ] };
+
+ // And on the right side, the function keys were labeled R1-R15,
+ // which get mapped to the keysyms F21-F35
+ // This includes the keys that became the numeric keypad
+ key <PAUS> { [ R1, R1 ], [ Pause ] };
+ key <PRSC> { [ R2, R2 ], [ Print ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] };
+
+ key <KPEQ> { [ KP_Equal ], [ R4, KP_Equal ] };
+ key <KPDV> { [ KP_Divide ], [ R5, KP_Divide ] };
+ key <KPMU> { [ KP_Multiply ], [ R6, KP_Multiply ] };
+
+ key <KP7> { [ KP_Home, KP_7, R7 ], [ R7, KP_7, Home ] };
+ key <KP8> { [ KP_Up, KP_8, R8 ], [ R8, KP_8, Up ] };
+ key <KP9> { [ KP_Prior, KP_9, R9 ], [ R9, KP_9, Prior ] };
+
+ key <KP4> { [ KP_Left, KP_4, R10 ], [ R10, KP_4, Left ] };
+ key <KP5> { [ KP_Begin, KP_5, R11 ], [ R11, KP_5 ] };
+ key <KP6> { [ KP_Right, KP_6, R12 ], [ R12, KP_6, Right ] };
+
+ key <KP1> { [ KP_End, KP_1, R13 ], [ R13, KP_1, End ] };
+ key <KP2> { [ KP_Down, KP_2, R14 ], [ R14, KP_2, Down ] };
+ key <KP3> { [ KP_Next, KP_3, R15 ], [ R15, KP_3, Next ] };
+
+ // F11 & F12 are mapped to SunF36 and SunF37 since they were added
+ // after F11-F35 were already assigned on Sun keyboards
+ key <FK11> { [ SunF36 ], [ F11 ] };
+ key <FK12> { [ SunF37 ], [ F12 ] };
+
+ // These were added to the keyboard much later and simply got mapped
+ // to their logical names
+ key <HELP> { [ Help ] };
+ key <MUTE> { [ SunAudioMute, SunVideoDegauss ] };
+ key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] };
+ key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] };
+ key <POWR> { [ XF86Sleep, XF86Hibernate ] };
+
+// 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 , 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
+// keys
+partial
+xkb_symbols "keynames" {
+ 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 ] };
+
+ key <HELP> { [ Help ] };
+
+ key <PAUS> { [ Pause ] };
+ key <PRSC> { [ Print ] };
+ key <SCLK> { [ Scroll_Lock, Break ] };
+
+ key <KP7> { [ KP_Home, KP_7 ] };
+ key <KP8> { [ KP_Up, KP_8 ] };
+ key <KP9> { [ KP_Prior, KP_9 ] };
+
+ 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 <KPEQ> { [ KP_Equal ] };
+
+ key <MUTE> { [ SunAudioMute, SunVideoDegauss ] };
+ key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ] };
+ key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness ] };
+ key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] };
+
+ key <LALT> { [ Alt_L ] };
+ key <RALT> { [ Mode_switch ] };
+ key <ALGR> { [ Mode_switch ] };
+ key <LMTA> { [ Meta_L ] };
+ key <RMTA> { [ Meta_R ] };
+ key <COMP> { [ Multi_key ] };
+
+};
+
+// Map the keys to the XFree86 key names instead of the Sun key names
+partial
+xkb_symbols "xf86keynames" {
+ key <STOP> { [ XF86Stop ], [ F11 ] };
+ key <AGAI> { [ Redo ], [ F12 ] };
+ key <PROP> { [ SunProps ], [ F13 ] };
+ key <UNDO> { [ Undo ], [ F14 ] };
+ key <FRNT> { [ SunFront ], [ F15 ] };
+ key <COPY> { [ XF86Copy ], [ F16 ] };
+ key <OPEN> { [ XF86Open ], [ F17 ] };
+ key <PAST> { [ XF86Paste ], [ F18 ] };
+ key <FIND> { [ Find ], [ F19 ] };
+ key <CUT> { [ XF86Cut ], [ F20 ] };
+
+ key <MUTE> { [ XF86AudioMute, SunVideoDegauss ] };
+ key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ] };
+ key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness ] };
+ key <POWR> { [ XF86Sleep, XF86PowerDown ] };
+};
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tr b/xorg-server/xkbdata.src/symbols/sun_vndr/tr index 7e6d4bf74..3c95110a1 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tr +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tr @@ -1,113 +1,93 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -xkb_symbols "basic" { - include "sun_vndr/tr(type6Q)" -}; - -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 ]}; - - 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 ]}; - -}; - -xkb_symbols "type6F" { - - - 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> { [ 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 <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 <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 ]}; - - -}; - +//
+// 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 alphanumeric_keys
+xkb_symbols "type6" {
+
+ 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 <AD01> { [ q, Q, at ] };
+ key <AD03> { [ e, E, EuroSign ] };
+ key <AD08> { [ idotless, I ] };
+ key <AD11> { [ gbreve, Gbreve ] };
+ key <AD12> { [udiaeresis, Udiaeresis, asciitilde ] };
+
+ key <AC10> { [ scedilla, Scedilla, acute ] };
+ key <AC11> { [ i, Iabovedot ] };
+ key <BKSL> { [ comma, semicolon, grave ] };
+
+ key <LSGT> { [ less, greater, bar ] };
+ key <AB08> { [odiaeresis, Odiaeresis ] };
+ key <AB09> { [ ccedilla, Ccedilla ] };
+ key <AB10> { [ period, colon ] };
+
+ include "level3(ralt_switch)"
+
+};
+
+partial default alphanumeric_keys
+ xkb_symbols "basic" {
+ include "sun_vndr/tr(type6)"
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv index d047f33b8..0eda715d8 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tuv +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tuv @@ -1,235 +1,264 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ -// -//Copyright 1996, 1998 The Open Group -// -//All Rights Reserved. -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -//OTHER DEALINGS IN THE SOFTWARE. -// -//Except as contained in this notice, the name of The Open Group shall -//not be used in advertising or otherwise to promote the sale, use or -//other dealings in this Software without prior written authorization -//from The Open Group. -// -// US/ASCII layout for a Type 4 Sun keyboard -xkb_symbols "type4basic" { - include "us(basic)" - - key <RTSH> { [ Shift_R ] }; - key <LALT> { [ Alt_L ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <LNFD> { [ Linefeed ] }; - 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> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - 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 ] }; - // End "Function" section - - // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] }; - key <PAUS> { [ R1, R1 ], [ Pause ] }; - key <DELE> { [ Delete ] }; - key <HELP> { [ Help ] }; - - // End "Editing" section, begin "Keypad" - key <NMLK> { [ Num_Lock ] }; - key <KPEQ> { [ R4, R4 ], [ KP_Equal ] }; - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; - key <KPSU> { [ KP_Subtract ] }; - - key <KP7> { [ R7, R7 ], [ KP_7, Home ] }; - key <KP8> { [ Up, R8 ], [ KP_8 ] }; -// key <KP8> { [ R8, R8 ], [ KP_8 ] }; - 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 <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 - - - // 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 Mod4 { Alt_L }; -}; - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - // A few alphanumeric keys are different - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5basic" { - include "us(basic)" - - 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> { [ SunF36 ] }; - key <FK12> { [ SunF37 ] }; - 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 ] }; - // End "Function" section - - // Begin "Editing" section - key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] }; - key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] }; - key <PAUS> { [ R1, R1 ], [ 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" - key <NMLK> { [ Num_Lock ] }; - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; - key <KPSU> { [ R4, R4 ], [ KP_Subtract ] }; - - 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 <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 ] }; - key <KPEN> { [ KP_Enter ] }; - - key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] }; - key <KPDL> { [ KP_Delete, 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 ] }; - - // 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 Mod4 { Alt_L }; -}; - -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 ] }; -}; - +// $XdotOrg: $
+//
+// 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.
+//
+// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $
+//
+//Copyright 1996, 1998 The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//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)"
+
+ key <RTSH> { [ Shift_R ] };
+ key <LALT> { [ Alt_L ] };
+ key <ALGR> { [ Mode_switch ] };
+ key <LMTA> { [ Meta_L ] };
+ key <RMTA> { [ Meta_R ] };
+ key <LNFD> { [ Linefeed ] };
+ 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> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ 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 ] };
+ // End "Function" section
+
+ // Begin "Editing" section
+ key <PRSC> { [ R2, R2 ], [ Print ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock, Break ] };
+ key <PAUS> { [ R1, R1 ], [ Pause ] };
+ key <DELE> { [ Delete ] };
+ key <HELP> { [ Help ] };
+
+ // End "Editing" section, begin "Keypad"
+ key <NMLK> { [ Num_Lock ] };
+ key <KPEQ> { [ R4, R4 ], [ KP_Equal ] };
+ key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+ key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+ key <KPSU> { [ KP_Subtract ] };
+
+ key <KP7> { [ R7, R7 ], [ KP_7, Home ] };
+ key <KP8> { [ Up, R8 ], [ KP_8 ] };
+// key <KP8> { [ R8, R8 ], [ KP_8 ] };
+ 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 <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
+
+
+ // begin modifier mappings
+ modifier_map Shift { Shift_R, Shift_L };
+ modifier_map Mod1 { Meta_L, Meta_R };
+ modifier_map Mod2 { Num_Lock };
+ modifier_map Mod3 { Mode_switch };
+ modifier_map Mod4 { Alt_L };
+};
+
+xkb_symbols "type4" {
+ include "sun_vndr/us(type4basic)"
+
+ // A few alphanumeric keys are different
+ key <AE04> { [ 4, dollar ], [ EuroSign ] };
+ key <AE05> { [ 5, percent ], [ EuroSign ] };
+ key <AD03> { [ e, E ], [ EuroSign ] };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+ include "us(basic)"
+
+ 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> { [ SunF36 ] };
+ key <FK12> { [ SunF37 ] };
+ 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 ] };
+ // End "Function" section
+
+ // Begin "Editing" section
+ key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] };
+ key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] };
+ key <PAUS> { [ R1, R1 ], [ 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"
+ key <NMLK> { [ Num_Lock ] };
+ key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+ key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+ key <KPSU> { [ R4, R4 ], [ KP_Subtract ] };
+
+ 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 <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 ] };
+ key <KPEN> { [ KP_Enter ] };
+
+ key <KP0> { [ KP_Insert, KP_Insert ], [ KP_0 ] };
+ key <KPDL> { [ KP_Delete, 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 ] };
+
+ // begin modifier mappings
+ modifier_map Shift { Shift_R };
+ modifier_map Mod1 { Meta_L, Meta_R };
+ modifier_map Mod2 { Num_Lock };
+ modifier_map Mod3 { Alt_R };
+ modifier_map Mod4 { Alt_L };
+};
+
+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 ] };
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/tw b/xorg-server/xkbdata.src/symbols/sun_vndr/tw index 736c242eb..a4c011d45 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/tw +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/tw @@ -1,53 +1,79 @@ -// $XdotOrg: $ -// -// Copyright 2005 Sun Microsystems, Inc. All rights reserved. -// -// Permission is hereby granted, free of charge, to any person obtaining a -// copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// -// Taiwanese layout for a Type 4 Sun keyboard -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; - -// key <LNFD> { [ Hangul ] }; -// key <RALT> { [ Linefeed ] }; - key <COMP> { [ Henkan_Mode ] }; - -}; - -// Taiwanese layout for a Type 5 Sun keyboard -xkb_symbols "type5" { - - // A few keys are different - key <ALGR> { [ Henkan_Mode ] }; - 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 ] }; -}; - +//
+// 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
+//
+
+// 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" {
+
+ key <BKSL> { [ backslash, bar, brokenbar ] };
+
+ key <COMP> { [ Henkan_Mode ] };
+
+};
+
+// Taiwanese layout for a Type 5 Sun keyboard
+xkb_symbols "type5" {
+
+ // A few keys are different
+ key <ALGR> { [ Henkan_Mode ] };
+ key <BKSL> { [ backslash, bar, brokenbar ] };
+
+};
+
diff --git a/xorg-server/xkbdata.src/symbols/sun_vndr/ua b/xorg-server/xkbdata.src/symbols/sun_vndr/ua new file mode 100644 index 000000000..c49b21bce --- /dev/null +++ b/xorg-server/xkbdata.src/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/xorg-server/xkbdata.src/symbols/sun_vndr/us b/xorg-server/xkbdata.src/symbols/sun_vndr/us index f85cec950..8a857a5ab 100644 --- a/xorg-server/xkbdata.src/symbols/sun_vndr/us +++ b/xorg-server/xkbdata.src/symbols/sun_vndr/us @@ -1,328 +1,401 @@ -// $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, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the -// Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice (including the next -// paragraph) shall be included in all copies or substantial portions of the -// Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// DEALINGS IN THE SOFTWARE. -// -// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ -// Sun: @(#)us 1.5 03/04/21 SMI -// -//Copyright 1996, 1998 The Open Group -// -//All Rights Reserved. -// -//The above copyright notice and this permission notice shall be -//included in all copies or substantial portions of the Software. -// -//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -//OTHER DEALINGS IN THE SOFTWARE. -// -//Except as contained in this notice, the name of The Open Group shall -//not be used in advertising or otherwise to promote the sale, use or -//other dealings in this Software without prior written authorization -//from The Open Group. -// - -// Symbols shared by all Sun Keyboard layouts -hidden -xkb_symbols "sunbasic" { - include "srvr_ctrl(xfree86)" - - // Needed for left function keys and volume keys - // Need to include this before us(basic) otherwise tilde is mapped to - // a jp key - include "inet(evdev)" - - include "us(basic)" - include "pc(function)" - include "pc(editing)" - include "keypad(x11)" - - 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 ] }; - - key <BKSP> { [ BackSpace ] }; - - // By default, we use the same symbols as other XKB implementations - // for greater compatibility & AccessX MouseKeys support, but it is - // different than the traditional Sun key mappings that date back to the - // 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 ] }; -// key <KP8> { [ Up, R8 ], [ KP_8 ] }; -// 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 <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 }; -}; - -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 ] }; - - // 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 ] }; -}; - -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 ] }; - - // 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 ] }; -}; - -// 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 <LNFD> { [ Linefeed ] }; - - // Begin "Editing" section - 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 ] }; -}; - -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" - - key <BKSL> { [ backslash, bar ], [ brokenbar ] }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5basic" { - include "sun_vndr/us(sunbasic)" - 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 ] }; - // End "Editing" section -}; - -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 ] }; -}; - -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5hobobasic" { - include "sun_vndr/us(type5basic)" -}; - -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 ] }; - - // 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 <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 <RTRN> { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; - - key <AB07> { [ m, M ], [ NoSymbol, NoSymbol ], [ KP_0 ] }; - - 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)" - - key <SYRQ> { [ SunSys_Req ]}; - key <LSGT> { [ less, greater, bar, brokenbar ] }; - -}; - -xkb_symbols "pc101" { - include "us(pc101)" - key <RALT> { [ Mode_switch, Meta_R ] }; -}; - -xkb_symbols "pc102" { - include "us(pc102)" - key <RALT> { [ Mode_switch, Meta_R ] }; -}; - -xkb_symbols "pc104" { - include "us(pc104)" -}; - -xkb_symbols "pc101currency" { - - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ]}; -}; - -xkb_symbols "US101A_Sun" { - - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ]}; - - // Begin "Editing" section - key <PRSC> { [ L5, L5 ], [ Print, SunSys_Req ]}; - key <SCLK> { [ L7, L7 ], [ Scroll_Lock ]}; - key <PAUS> { [ L1, L1 ], [ Pause, Break ]}; - key <INS> { [ L8, L8 ], [ Insert ]}; - key <HOME> { [ L6, L6 ], [ Home ]}; - key <PGUP> { [ L3, L3 ], [ Prior ]}; - - - key <DELE> { [ L10, L10 ], [ Delete ]}; - key <END> { [ L9, L9 ], [ End ]}; - key <PGDN> { [ L4, L4 ], [ Next ]}; - - key <UP> { [ Up ] }; - key <LEFT> { [ Left ] }; - key <DOWN> { [ Down ] }; - key <RGHT> { [ Right ] }; - - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; - - key <KP7> { [ R7, KP_7 ], [ KP_7, Home ] }; - key <KP8> { [ KP_Up, KP_8 ], [ KP_8 ] }; - key <KP9> { [ R9, KP_9 ], [ KP_9, Prior ] }; - key <KPAD> { [ KP_Add ] }; - - key <KP4> { [ KP_Left, KP_4 ], [ KP_4 ] }; - key <KP5> { [ R11, KP_5 ], [ KP_5 ] }; - key <KP6> { [ KP_Right, KP_6 ], [ KP_6 ] }; - - key <KP1> { [ R13, KP_1 ], [ KP_1, End ] }; - key <KP2> { [ KP_Down, KP_2 ], [ KP_2 ] }; - key <KP3> { [ R15, KP_3 ], [ KP_3, Next ] }; - key <KPEN> { [ KP_Enter ] }; - - key <LALT> { [ Meta_L ] }; - key <RALT> { [ Alt_L ] }; - key <RCTL> { [ Multi_key ] }; -}; - +//
+// 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.
+//
+//
+//Copyright 1996, 1998 The Open Group
+//
+//All Rights Reserved.
+//
+//The above copyright notice and this permission notice shall be
+//included in all copies or substantial portions of the Software.
+//
+//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//OTHER DEALINGS IN THE SOFTWARE.
+//
+//Except as contained in this notice, the name of The Open Group shall
+//not be used in advertising or otherwise to promote the sale, use or
+//other dealings in this Software without prior written authorization
+//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
+xkb_symbols "sunbasic" {
+ include "srvr_ctrl(xfree86)"
+
+ // Needed for left function keys and volume keys
+ // Need to include this before us(basic) otherwise tilde is mapped to
+ // a jp key
+ include "inet(evdev)"
+
+ include "us(basic)"
+ include "pc(function)"
+ 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)"
+
+
+// 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 <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
+
+};
+
+
+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 ] };
+
+ // 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 ] };
+};
+
+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 ] };
+
+ // 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 ] };
+};
+
+
+// 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 <LNFD> { [ Linefeed ] };
+
+ // Begin "Editing" section
+ 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 ] };
+
+};
+
+xkb_symbols "type4" {
+ include "sun_vndr/us(type4basic)"
+
+ key <BKSL> { [ backslash, bar, brokenbar ] };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5basic" {
+ include "sun_vndr/us(sunbasic)"
+ 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 ] };
+ // End "Editing" section
+};
+
+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 ] };
+};
+
+// US/ASCII layout for a Type 5 Sun keyboard
+xkb_symbols "type5hobobasic" {
+ include "sun_vndr/us(type5basic)"
+};
+
+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 ] };
+
+ // 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 <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 <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter ] };
+
+ key <AB07> { [ m, M, NoSymbol, NoSymbol, KP_0 ] };
+
+ 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 ]};
+};
+
+
+
+xkb_symbols "pc101" {
+ include "us(pc101)"
+ key <RALT> { [ Mode_switch, Meta_R ] };
+};
+
+xkb_symbols "pc102" {
+ include "us(pc102)"
+ key <RALT> { [ Mode_switch, Meta_R ] };
+};
+
+xkb_symbols "pc104" {
+ include "us(pc104)"
+};
+
+xkb_symbols "pc101currency" {
+
+ key <AE04> { [ 4, dollar ], [ EuroSign ] };
+ key <AE05> { [ 5, percent ], [ EuroSign ] };
+ key <AD03> { [ e, E ], [ EuroSign ] };
+ key <BKSL> { [ backslash, bar ], [ brokenbar ]};
+};
+
+xkb_symbols "US101A_Sun" {
+
+ key <AE04> { [ 4, dollar ], [ EuroSign ] };
+ key <AE05> { [ 5, percent ], [ EuroSign ] };
+ key <AD03> { [ e, E ], [ EuroSign ] };
+ key <BKSL> { [ backslash, bar ], [ brokenbar ]};
+
+ // Begin "Editing" section
+ key <PRSC> { [ L5, L5 ], [ Print, SunSys_Req ]};
+ key <SCLK> { [ L7, L7 ], [ Scroll_Lock ]};
+ key <PAUS> { [ L1, L1 ], [ Pause, Break ]};
+ key <INS> { [ L8, L8 ], [ Insert ]};
+ key <HOME> { [ L6, L6 ], [ Home ]};
+ key <PGUP> { [ L3, L3 ], [ Prior ]};
+
+
+ key <DELE> { [ L10, L10 ], [ Delete ]};
+ key <END> { [ L9, L9 ], [ End ]};
+ key <PGDN> { [ L4, L4 ], [ Next ]};
+
+ key <UP> { [ Up ] };
+ key <LEFT> { [ Left ] };
+ key <DOWN> { [ Down ] };
+ key <RGHT> { [ Right ] };
+
+ key <KPDV> { [ R5, R5 ], [ KP_Divide ] };
+ key <KPMU> { [ R6, R6 ], [ KP_Multiply ] };
+
+ key <KP7> { [ R7, KP_7 ], [ KP_7, Home ] };
+ key <KP8> { [ KP_Up, KP_8 ], [ KP_8 ] };
+ key <KP9> { [ R9, KP_9 ], [ KP_9, Prior ] };
+ key <KPAD> { [ KP_Add ] };
+
+ key <KP4> { [ KP_Left, KP_4 ], [ KP_4 ] };
+ key <KP5> { [ R11, KP_5 ], [ KP_5 ] };
+ key <KP6> { [ KP_Right, KP_6 ], [ KP_6 ] };
+
+ key <KP1> { [ R13, KP_1 ], [ KP_1, End ] };
+ key <KP2> { [ KP_Down, KP_2 ], [ KP_2 ] };
+ key <KP3> { [ R15, KP_3 ], [ KP_3, Next ] };
+ key <KPEN> { [ KP_Enter ] };
+
+ key <LALT> { [ Meta_L ] };
+ key <RALT> { [ Alt_L ] };
+ key <RCTL> { [ Multi_key ] };
+};
+
|