diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-16 08:45:43 +0100 |
| commit | b8219a4680768e14b7fe4930adf86e9be261b31f (patch) | |
| tree | 193855ef8d48765d67cc11153a15e3c1e2568e50 /xorg-server | |
| parent | 15cdb95b194cb051a5d469cc9eb73eb0eed4db41 (diff) | |
| parent | 811d1bcf6d61ea49551abdd7f2294c5af2776913 (diff) | |
| download | vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.gz vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.tar.bz2 vcxsrv-b8219a4680768e14b7fe4930adf86e9be261b31f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Switched to xcalc-1.0.5
Switched to bdftopcf-1.0.4
libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config
Diffstat (limited to 'xorg-server')
87 files changed, 2553 insertions, 5985 deletions
diff --git a/xorg-server/xkeyboard-config/configure.ac b/xorg-server/xkeyboard-config/configure.ac index c92d8d557..e3d2abfe4 100644 --- a/xorg-server/xkeyboard-config/configure.ac +++ b/xorg-server/xkeyboard-config/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(xkeyboard-config, 2.7) +AC_INIT(xkeyboard-config, 2.7.99) AC_CONFIG_SRCDIR(rules/base.xml.in) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE diff --git a/xorg-server/xkeyboard-config/geometry/sun b/xorg-server/xkeyboard-config/geometry/sun index 4b7126d45..23bd3bf02 100644 --- a/xorg-server/xkeyboard-config/geometry/sun +++ b/xorg-server/xkeyboard-config/geometry/sun @@ -1,3 +1,4 @@ +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // //Copyright 1996, 1998 The Open Group // @@ -23,2262 +24,6 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// --------------------------------------------------------------------------- -// 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_geometry "type4" { - - // This is an approximate layout for a (US/ASCII) Sun Type4 US - // keyboard. - - description= "Sun Type4 keyboard"; - - width= 452; - height= 185; - - shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,19], [ 0,19] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,18], [ 1,18] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [170,18] }, { [2,1], [168,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 17; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Alpha" { - top= 58; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, - <FK05>, <FK06>, <FK07>, <FK08>, - <FK09>, <FK10>, <FK11>, <FK12>, - <BKSL>, { <DELE>, "DELE" }, - { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK> - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <ESC>, 9 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, - { <BKSP>, "BKSP" }, - { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> - - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, - { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <RTRN>, "RTRN" }, - { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, - { <LCTL>, 9, shape="LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <TLDE>, - { <KP4>, 33 }, <KP5>, <KP6> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, - { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH" }, <LNFD>, - { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" } - }; - }; - row { - top= 96; - keys { { <HELP>, "HELP" }, { <CAPS>, 9 }, - <LALT>, <LMTA>, { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR>, - { <KP0>, 9, shape="KP0" }, <KPDL> - }; - }; - }; // End of "Alpha" section - - shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; - shape "LED" { cornerRadius= 0, { [ 7, 4 ] } }; - solid "LedPanel" { - shape= "LEDS"; - top= 28; - left= 358; - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 43; - indicator.shape= "LED"; - indicator "Caps Lock" { left= 364; }; - indicator "Compose" { left= 383; }; - indicator "Scroll Lock" { left= 402; }; - indicator "Num Lock" { left= 421; }; - text.top= 34; - text.color= "black"; - text "CapsLockLabel" { left= 364; text="Caps\nLock"; }; - text "ComposeLabel" { left= 380; text="Compose"; }; - text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; }; - text "NumLockLabel" { left= 421; text="Num\nLock"; }; -}; - -xkb_geometry "type4tuv" { - - // This is an approximate layout for a (US/ASCII) Sun Type4 TUV - // (European) keyboard with an extra key between the Shift_L - // and the Z keys, and two keys above the Bksp key, instead - // of a large delete key. - - description= "Sun Type4tuv keyboard"; - - width= 452; - height= 185; - - shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,19], [ 0,19] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,18], [ 1,18] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [170,18] }, { [2,1], [168,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 17; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Alpha" { - top= 58; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, - <FK05>, <FK06>, <FK07>, <FK08>, - <FK09>, <FK10>, <FK11>, <FK12>, - <BKSL>, <BRCR>,<DELE>, - { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK> - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <ESC>, 9 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, - { <BKSP>, "BKSP" }, - { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> - - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, - { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <RTRN>, "RTRN" }, - { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, - { <LCTL>, 9, shape="LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <TLDE>, - { <KP4>, 33 }, <KP5>, <KP6> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, - { <LFSH>, 9 }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH" }, <LNFD>, - { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" } - }; - }; - row { - top= 96; - keys { { <HELP>, "HELP" }, { <CAPS>, 9 }, - <LALT>, <LMTA>, { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR>, - { <KP0>, 9, shape="KP0" }, <KPDL> - }; - }; - }; // End of "Alpha" section - - shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; - shape "LED" { cornerRadius= 0, { [ 7, 4 ] } }; - solid "LedPanel" { - shape= "LEDS"; - top= 28; - left= 358; - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 43; - indicator.shape= "LED"; - indicator "CapsLock" { left= 364; }; - indicator "Compose" { left= 383; }; - indicator "ScrollLock" { left= 402; }; - indicator "NumLock" { left= 421; }; - text.top= 34; - text.color= "black"; - text "CapsLockLabel" { left= 364; text="Caps\nLock"; }; - text "ComposeLabel" { left= 380; text="Compose"; }; - text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; }; - text "NumLockLabel" { left= 421; text="Num\nLock"; }; -}; - -xkb_geometry "type4_ca" { - - // This is an approximate layout for a (US/ASCII) Sun Type4 - // Canadian and British keyboard with an extra key between - // the Shift_L - // and the Z keys. - - description= "Sun Type4_uk keyboard"; - - width= 452; - height= 185; - - shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "DELE" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,19], [ 0,19] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,18], [ 1,18] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [170,18] }, { [2,1], [168,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 17; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Alpha" { - top= 58; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, - <FK05>, <FK06>, <FK07>, <FK08>, - <FK09>, <FK10>, <FK11>, <FK12>, - <BKSL>, { <DELE>, "DELE" }, - { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK> - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <ESC>, 9 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, - { <BKSP>, "BKSP" }, - { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> - - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, - { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <RTRN>, "RTRN" }, - { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, - { <LCTL>, 9, shape="LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <TLDE>, - { <KP4>, 33 }, <KP5>, <KP6> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, - { <LFSH>, 9 }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH" }, <LNFD>, - { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" } - }; - }; - row { - top= 96; - keys { { <HELP>, "HELP" }, { <CAPS>, 9 }, - <LALT>, <LMTA>, { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR>, - { <KP0>, 9, shape="KP0" }, <KPDL> - }; - }; - }; // End of "Alpha" section - - shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; - shape "LED" { cornerRadius= 0, { [ 7, 4 ] } }; - solid "LedPanel" { - shape= "LEDS"; - top= 28; - left= 358; - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 43; - indicator.shape= "LED"; - indicator "CapsLock" { left= 364; }; - indicator "Compose" { left= 383; }; - indicator "ScrollLock" { left= 402; }; - indicator "NumLock" { left= 421; }; - text.top= 34; - text.color= "black"; - text "CapsLockLabel" { left= 364; text="Caps\nLock"; }; - text "ComposeLabel" { left= 380; text="Compose"; }; - text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; } -; - text "NumLockLabel" { left= 421; text="Num\nLock"; }; -}; - -xkb_geometry "type4jp" { - - // This is an approximate layout for a Japanese Sun Type4 - // keyboard, based on the European TUV keyboard. It has two keys - // above the Bksp key, instead of a large delete key, but lacks - // the extra key between Shift_L and Z. - - description= "Sun Japanese Type4 keyboard"; - - width= 452; - height= 185; - - shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,19], [ 0,19] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,18], [ 1,18] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LFSH" { { [ 41,18] }, { [2,1], [39,17] } }; - shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 17; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Alpha" { - top= 58; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, - <FK05>, <FK06>, <FK07>, <FK08>, - <FK09>, <FK10>, <FK11>, <FK12>, - <BKSL>, <BRCR>,<DELE>, - { <PAUS>, 9 }, <PRSC>, <SCLK>, <NMLK> - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <ESC>, 9 }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, - { <BKSP>, "BKSP" }, - { <KPEQ>, 9 }, <KPDV>, <KPMU>, <KPSU> - - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, - { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, { <RTRN>, "RTRN" }, - { <KP7>, 9 }, <KP8>, <KP9>, { <KPAD>, "KPAD" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, - { <LCTL>, 9, shape="LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <TLDE>, - { <KP4>, 33 }, <KP5>, <KP6> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, - { <LFSH>, 9, shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - <LNFD>, { <RTSH>, "RTSH" }, - { <KP1>, 9} , <KP2>, <KP3>, { <KPEN>, "KPAD" } - }; - }; - row { - top= 96; - keys { { <HELP>, "HELP" }, { <CAPS>, 9 }, - <LALT>, <LMTA>, { <EXEC>, "EXEC"} , { <SPCE>, "SPCE" }, - { <KANJ>, "KANJ" }, <HENK>, <RMTA>, <COMP>, <ALGR>, - { <KP0>, 9, shape="KP0" }, <KPDL> - }; - }; - }; // End of "Alpha" section - - shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; - shape "LED" { cornerRadius= 0, { [ 7, 4 ] } }; - solid "LedPanel" { - shape= "LEDS"; - top= 28; - left= 358; - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 43; - indicator.shape= "LED"; - indicator "CapsLock" { left= 364; }; - indicator "Compose" { left= 383; }; - indicator "ScrollLock" { left= 402; }; - indicator "NumLock" { left= 421; }; - text.top= 34; - text.color= "black"; - text "CapsLockLabel" { left= 364; text="Caps\nLock"; }; - text "ComposeLabel" { left= 380; text="Compose"; }; - text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; }; - text "NumLockLabel" { left= 421; text="Num\nLock"; }; -}; - -xkb_geometry "t5" { - - // This is an approximate layout for a (US/ASCII) Sun Type5 - // keyboard. I just took a similar layout (101 key PC keyboard) - // and adjusted the sizes. - - width= 515; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [156,18] }, { [2,1], [154,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 19 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 9 }, <SCLK>, <PAUS>, - { <MUTE>, 9 }, <VOL->, <VOL+>, <POWR> - }; - }; - }; // End of "Function" section - - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <BKSL>, "BKSL" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" } - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section - - section "Keypad" { - top= 61; - left= 420; - row { - top= 1; - keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> }; - }; - row { - top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } }; - }; - row { - top= 39; - keys { <KP4>, <KP5>, <KP6> }; - }; - row { - top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } }; - }; - row { - top= 77; - keys { { <KP0>, "KP0" }, <KPDL> }; - }; - }; // End of "Keypad" section -}; - -xkb_geometry "t5tuv" { - - // This is an approximate layout for a TUV/European Sun Type5 keyboard. - - width= 515; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,18], [ 0,18] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,17], [ 1,17] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } }; - shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [157,18] }, { [2,1], [155,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 19 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 9 }, <SCLK>, <PAUS>, - { <MUTE>, 9 }, <VOL->, <VOL+>, <POWR> - }; - }; - }; // End of "Function" section - - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <BKSL> - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH" } - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section - - section "Keypad" { - top= 61; - left= 420; - row { - top= 1; - keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> }; - }; - row { - top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } }; - }; - row { - top= 39; - keys { <KP4>, <KP5>, <KP6> }; - }; - row { - top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } }; - }; - row { - top= 77; - keys { { <KP0>, "KP0" }, <KPDL> }; - }; - }; // End of "Keypad" section -}; - - -xkb_geometry "t5jp" { - - // This is an approximate layout for a Japanese Sun Type5 keyboard. - - width= 515; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,18], [ 0,18] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,17], [ 1,17] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 19 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 9 }, <SCLK>, <PAUS>, - { <MUTE>, 9 }, <VOL->, <VOL+>, <POWR> - }; - }; - }; // End of "Function" section - - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <BKSL> - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>, - { <RTSH>, "RTSH", color="grey20" } - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9 }, - <LALT>, <LMTA>, { <EXEC>, "EXEC" }, - { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>, - <RMTA>, <COMP>, <ALGR> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section - - section "Keypad" { - top= 61; - left= 420; - row { - top= 1; - keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> }; - }; - row { - top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } }; - }; - row { - top= 39; - keys { <KP4>, <KP5>, <KP6> }; - }; - row { - top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } }; - }; - row { - top= 77; - keys { { <KP0>, "KP0" }, <KPDL> }; - }; - }; // End of "Keypad" section -}; - -xkb_geometry "t5unix" { - - // This is an approximate layout for a (US/ASCII) Sun Type5 - // keyboard. I just took a similar layout (101 key PC keyboard) - // and adjusted the sizes. - - width= 515; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "BKSL" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "RTSH" { { [ 51,18] }, { [2,1], [49,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [157,18] }, { [2,1], [155,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <NONE>, 9 }, - { <FK01>, 19 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 11 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 11 }, <FK10>, <FK11>, <FK12>, - { <PRSC>, 9 }, <SCLK>, <PAUS>, - { <MUTE>, 9 }, <VOL->, <VOL+>, <POWR> - }; - }; - }; // End of "Function" section - - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <ESC>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - <BKSL>, <TLDE> - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <BKSP>, "BKSP" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <LCTL>, 9, shape="LCTL" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" } - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <CAPS>, 9, shape="CAPS" }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <ALGR> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section - - section "Keypad" { - top= 61; - left= 420; - row { - top= 1; - keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> }; - }; - row { - top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } }; - }; - row { - top= 39; - keys { <KP4>, <KP5>, <KP6> }; - }; - row { - top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } }; - }; - row { - top= 77; - keys { { <KP0>, "KP0" }, <KPDL> }; - }; - }; // End of "Keypad" section -}; - -xkb_geometry "t5hobo" { - - // This is an approximate layout for a (US/ASCII) Sun Type5 - // keyboard. I just took a similar layout (101 key PC keyboard) - // and adjusted the sizes. - // - // I modified this to look like the hobo keyboard. - - width= 425; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [156,18] }, { [2,1], [154,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "FKEY"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 4 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 4 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 4 }, <FK10>, <FK11>, <FK12>, - { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, - { <PRSC>, 9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"} - }; - }; - }; // End of "Function" section - - key.shape= "NORM"; - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <BKSL>, "BKSL" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" }, <ALGR> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <NMLK> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section -}; - -xkb_geometry "t5tuvhobo" { - - // This is an approximate layout for a (US/ASCII) Sun Type5 - // keyboard. I just took a similar layout (101 key PC keyboard) - // and adjusted the sizes. - // - // I modified this to look like the hobo keyboard. - - width= 425; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "BKSL" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "RTRN" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 24,18] }, { [2,1], [22,17] } }; - shape "RTSH" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [156,18] }, { [2,1], [154,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "FKEY"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 4 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 4 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 4 }, <FK10>, <FK11>, <FK12>, - { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, - { <PRSC>, 9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"} - }; - }; - }; // End of "Function" section - - key.shape= "NORM"; - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <BKSL>, "BKSL" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" }, <ALGR> - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE" }, - <RMTA>, <COMP>, <NMLK> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section -}; - -xkb_geometry "t5jphobo" { - - // This is an approximate layout for a (US/ASCII) Sun Type5 - // keyboard. I just took a similar layout (101 key PC keyboard) - // and adjusted the sizes. - - width= 425; - height= 170; - - shape "EDGE" { cornerRadius= 2, { [ 425, 170 ] } }; - shape.cornerRadius= 1; - shape "FKEY" { { [ 15,18] }, { [0.5,0.5], [14.5, 17.5] } }; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "KANJ" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "EXEC" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,18], [ 0,18] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,17], [ 1,17] } - }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 42,18] }, { [2,1], [40,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [ 97,18] }, { [2,1], [95,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "LOGO" { { [ 16,16] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 14; - row.left= 1; - key.shape= "FKEY"; - key.gap= 1; - section "Function" { - top= 24; - row { - top= 1; - keys { { <HELP>, "HELP" }, { <ESC>, 9 }, - { <FK01>, 4 }, <FK02>, <FK03>, <FK04>, - { <FK05>, 4 }, <FK06>, <FK07>, <FK08>, - { <FK09>, 4 }, <FK10>, <FK11>, <FK12>, - { <MUTE>, 4 }, <VOL->, <VOL+>, <POWR>, - { <PRSC>, 9, "NORM" }, {<SCLK>, "NORM"}, {<PAUS>, "NORM"} - }; - }; - }; // End of "Function" section - - key.shape= "NORM"; - section "Alpha" { - top= 61; - row { - top= 1; - keys { <STOP>, <AGAI>, - { <TLDE>, 9}, <AE01>, <AE02>, <AE03>, <AE04>, - <AE05>, <AE06>, <AE07>, <AE08>, <AE09>, - <AE10>, <AE11>, <AE12>, - { <BKSP>, "BKSP", color="grey20" } - }; - }; - row { - top= 20; - keys { <PROP>, <UNDO>, { <TAB>, 9, shape="TABK" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <RTRN>, "RTRN" } - }; - }; - row { - top= 39; - keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <BKSL> - }; - }; - row { - top= 58; - keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, - <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, - <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, <UNDR>, - { <RTSH>, "RTSH", color="grey20" } - }; - }; - row { - top= 77; - keys { <FIND>, <CUT>, { <LCTL>, 9 }, - <LALT>, <LMTA>, { <EXEC>, "EXEC" }, - { <SPCE>, "SPCE" }, { <KANJ>, "KANJ" }, <HENK>, - <RMTA>, <COMP>, <ALGR> - }; - }; - }; // End of "Alpha" section - - section "Editing" { - top= 61; - left= 352; - row { - top= 1; - keys { <INS>, <HOME>, <PGUP> }; - }; - row { - top= 20; - keys { <DELE>, <END>, <PGDN> }; - }; - row { - top= 58; - left= 20; - keys { <UP> }; - }; - row { - top= 77; - keys { <LEFT>, <DOWN>, <RGHT> }; - }; - }; // End of "Editing" section -}; - -xkb_geometry "type5_se" { - - // kbd: type = 4, layout = 43 - - description= "Sun Type5 keyboard (Sweden)"; - - width= 510; - height= 170; - - baseColor= "grey"; - labelColor= "black"; - - shape.cornerRadius= 1; - - shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } }; - shape "LOGO" { cornerRadius= 2, - { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] } - }; - - shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } }; - shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } }; - shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } }; - shape "RTRN" { - { [ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] }, - { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] } - }; - shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } }; - shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } }; - shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } }; - shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } }; - shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } }; - shape "SPCE" { { [157, 18] }, { [ 2, 1], [155, 17 ] } }; - shape "KP0" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } }; - shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } }; - shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } }; - - section "Function" { - key.color= "grey10"; - priority= 1; - top= 24; - left= 14; - width= 481; - height= 19; - row { - top= 1; - left= 1; - keys { - { <HELP>, "HELP", 1 }, { <ESC>, "NORM", 9 }, - { <FK01>, "NORM", 19 }, { <FK02>, "NORM", 1 }, - { <FK03>, "NORM", 1 }, { <FK04>, "NORM", 1 }, - { <FK05>, "NORM", 11 }, { <FK06>, "NORM", 1 }, - { <FK07>, "NORM", 1 }, { <FK08>, "NORM", 1 }, - { <FK09>, "NORM", 11 }, { <FK10>, "NORM", 1 }, - { <FK11>, "NORM", 1 }, { <FK12>, "NORM", 1 }, - { <PRSC>, "NORM", 9 }, { <SCLK>, "NORM", 1 }, - { <PAUS>, "NORM", 1 }, { <MUTE>, "NORM", 11 }, - { <VOL->, "NORM", 1 }, { <VOL+>, "NORM", 1 }, - { <POWR>, "NORM", 1, color= "white" } - }; - }; - }; // End of "Function" section - - section "Alpha" { - key.color= "white"; - priority= 2; - top= 61; - left= 14; - width= 333; - height= 95; - row { - top= 1; - left= 1; - keys { - { <STOP>, "NORM", 1, color= "grey10" }, - { <AGAI>, "NORM", 1, color= "grey10" }, - { <TLDE>, "NORM", 9 }, { <AE01>, "NORM", 1 }, - { <AE02>, "NORM", 1 }, { <AE03>, "NORM", 1 }, - { <AE04>, "NORM", 1 }, { <AE05>, "NORM", 1 }, - { <AE06>, "NORM", 1 }, { <AE07>, "NORM", 1 }, - { <AE08>, "NORM", 1 }, { <AE09>, "NORM", 1 }, - { <AE10>, "NORM", 1 }, { <AE11>, "NORM", 1 }, - { <AE12>, "NORM", 1 }, - { <BKSP>, "BKSP", 1, color="grey10" } - }; - }; - row { - top= 20; - left= 1; - keys { - { <PROP>, "NORM", 1, color= "grey10" }, - { <UNDO>, "NORM", 1, color= "grey10" }, - { <TAB>, "TABK", 9, color= "grey10" }, - { <AD01>, "NORM", 1 }, - { <AD02>, "NORM", 1 }, { <AD03>, "NORM", 1 }, - { <AD04>, "NORM", 1 }, { <AD05>, "NORM", 1 }, - { <AD06>, "NORM", 1 }, { <AD07>, "NORM", 1 }, - { <AD08>, "NORM", 1 }, { <AD09>, "NORM", 1 }, - { <AD10>, "NORM", 1 }, { <AD11>, "NORM", 1 }, - { <AD12>, "NORM", 1 }, - { <RTRN>, "RTRN", 1, color= "grey10" } - }; - }; - row { - top= 39; - left= 1; - keys { - { <FRNT>, "NORM", 1, color= "grey10" }, - { <COPY>, "NORM", 1, color= "grey10" }, - { <CAPS>, "CAPS", 9, color= "grey10" }, - { <AC01>, "NORM", 1 }, - { <AC02>, "NORM", 1 }, { <AC03>, "NORM", 1 }, - { <AC04>, "NORM", 1 }, { <AC05>, "NORM", 1 }, - { <AC06>, "NORM", 1 }, { <AC07>, "NORM", 1 }, - { <AC08>, "NORM", 1 }, { <AC09>, "NORM", 1 }, - { <AC10>, "NORM", 1 }, { <AC11>, "NORM", 1 }, - { <AC12>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 1; - keys { - { <OPEN>, "NORM", 1, color= "grey10" }, - { <PAST>, "NORM", 1, color= "grey10" }, - { <LFSH>, "LFSH", 9, color= "grey10" }, - { <AB00>, "NORM", 1 }, { <AB01>, "NORM", 1 }, - { <AB02>, "NORM", 1 }, { <AB03>, "NORM", 1 }, - { <AB04>, "NORM", 1 }, { <AB05>, "NORM", 1 }, - { <AB06>, "NORM", 1 }, { <AB07>, "NORM", 1 }, - { <AB08>, "NORM", 1 }, { <AB09>, "NORM", 1 }, - { <AB10>, "NORM", 1 }, - { <RTSH>, "RTSH", 1, color="grey10" } - }; - }; - row { - top= 77; - left= 1; - key.color= "grey10"; - keys { - { <FIND>, "NORM", 1 }, { <CUT>, "NORM", 1 }, - { <LCTL>, "LCTL", 9 }, { <LALT>, "NORM", 1 }, - { <LMTA>, "NORM", 1 }, - { <SPCE>, "SPCE", 1, color= "white" }, - { <RMTA>, "NORM", 1 }, { <COMP>, "NORM", 1 }, - { <ALGR>, "NORM", 1 } - }; - }; - }; // End of "Alpha" section - - section "Editing" { - key.color= "grey10"; - priority= 3; - top= 61; - left= 352; - width= 58; - height= 95; - row { - top= 1; - left= 1; - keys { - { <INS>, "NORM", 1 }, { <HOME>, "NORM", 1 }, - { <PGUP>, "NORM", 1 } - }; - }; - row { - top= 20; - left= 1; - keys { - { <DELE>, "NORM", 1 }, { <END>, "NORM", 1 }, - { <PGDN>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 20; - keys { - { <UP>, "NORM", 1 } - }; - }; - row { - top= 77; - left= 1; - keys { - { <LEFT>, "NORM", 1 }, { <DOWN>, "NORM", 1 }, - { <RGHT>, "NORM", 1 } - }; - }; - }; // End of "Editing" section - - section "Keypad" { - key.color= "white"; - priority= 4; - top= 61; - left= 420; - width= 77; - height= 95; - row { - top= 1; - left= 1; - key.color= "grey10"; - keys { - { <NMLK>, "NORM", 1 }, { <KPDV>, "NORM", 1 }, - { <KPMU>, "NORM", 1 }, { <KPSU>, "NORM", 1 } - }; - }; - row { - top= 20; - left= 1; - keys { - { <KP7>, "NORM", 1 }, { <KP8>, "NORM", 1 }, - { <KP9>, "NORM", 1 }, - { <KPAD>, "KPAD", 1, color="grey10" } - }; - }; - row { - top= 39; - left= 1; - keys { - { <KP4>, "NORM", 1 }, { <KP5>, "NORM", 1 }, - { <KP6>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 1; - keys { - { <KP1>, "NORM", 1 }, { <KP2>, "NORM", 1 }, - { <KP3>, "NORM", 1 }, - { <KPEN>, "KPAD", 1, color="grey10" } - }; - }; - row { - top= 77; - left= 1; - keys { - { <KP0>, "KP0", 1 }, { <KPDL>, "NORM", 1 } - }; - }; - }; // End of "Keypad" section - - outline "Edges" { - top= 0; - left= 0; - priority= 0; - shape= "EDGE"; - }; - - solid "Logos" { - color= "blue"; - top= 5; - left= 25; - priority= 0; - shape= "LOGO"; - }; - - logo "SUNLogoImage" { - top= 5; - left= 25; - name= "SUN"; - priority= 1; - shape= "LOGO"; - }; - - shape "LED" { cornerRadius= 1, - { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] } - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.shape= "LED"; - indicator "Caps Lock" { left= 75; top= 103; priority= 5; }; - indicator "Compose" { left= 314; top= 142; priority= 5; }; - indicator "Scroll Lock" { left= 378; top= 29; }; - indicator "Num Lock" { left= 426; top= 66; }; -}; - -xkb_geometry "type5c_se" { - - // kbd: type = 4, layout = 43 - - description= "Sun Type5c keyboard (Sweden)"; - - width= 510; - height= 170; - - baseColor= "grey"; - labelColor= "black"; - - shape.cornerRadius= 1; - - shape "EDGE" { cornerRadius= 2, { [ 510, 170 ] } }; - shape "LOGO" { cornerRadius= 2, - { [ 0, 8], [ 8, 16], [ 16, 8], [ 8, 0] } - }; - - shape "NORM" { { [ 18, 18] }, { [ 2, 1], [ 16, 17] } }; - shape "BKSP" { { [ 38, 18] }, { [ 2, 1], [ 36, 17] } }; - shape "TABK" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } }; - shape "META" { { [ 27, 18] }, { [ 2, 1], [ 25, 17] } }; - shape "RTRN" { - { [ 0, 0], [ 29, 0], [ 29, 37], [ 5, 37], [ 5, 18], [ 0, 18] }, - { [ 2, 1], [ 27, 1], [ 27, 36], [ 7, 36], [ 7, 17], [ 2, 17] } - }; - shape "CAPS" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } }; - shape "LFSH" { { [ 24, 18] }, { [ 2, 1], [ 22, 17 ] } }; - shape "RTSH" { { [ 51, 18] }, { [ 2, 1], [ 49, 17 ] } }; - shape "LCTL" { { [ 32, 18] }, { [ 2, 1], [ 30, 17 ] } }; - shape "MODK" { { [ 28, 18] }, { [ 2, 1], [ 26, 17 ] } }; - shape "SPCE" { { [139, 18] }, { [ 2, 1], [137, 17 ] } }; - shape "KP0" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } }; - shape "KPAD" { { [ 18, 37] }, { [ 2, 1], [ 16, 36 ] } }; - shape "HELP" { { [ 37, 18] }, { [ 2, 1], [ 35, 17 ] } }; - - section "Function" { - key.color= "grey10"; - priority= 1; - top= 24; - left= 14; - width= 481; - height= 19; - row { - top= 1; - left= 1; - keys { - { <HELP>, "HELP", 1 }, { <ESC>, "NORM", 9 }, - { <FK01>, "NORM", 19 }, { <FK02>, "NORM", 1 }, - { <FK03>, "NORM", 1 }, { <FK04>, "NORM", 1 }, - { <FK05>, "NORM", 11 }, { <FK06>, "NORM", 1 }, - { <FK07>, "NORM", 1 }, { <FK08>, "NORM", 1 }, - { <FK09>, "NORM", 11 }, { <FK10>, "NORM", 1 }, - { <FK11>, "NORM", 1 }, { <FK12>, "NORM", 1 }, - { <PRSC>, "NORM", 9 }, { <SCLK>, "NORM", 1 }, - { <PAUS>, "NORM", 1 }, { <MUTE>, "NORM", 11 }, - { <VOL->, "NORM", 1 }, { <VOL+>, "NORM", 1 }, - { <POWR>, "NORM", 1, color= "white" } - }; - }; - }; // End of "Function" section - - section "Alpha" { - key.color= "white"; - priority= 2; - top= 61; - left= 14; - width= 333; - height= 95; - row { - top= 1; - left= 1; - keys { - { <STOP>, "NORM", 1, color= "grey10" }, - { <AGAI>, "NORM", 1, color= "grey10" }, - { <TLDE>, "NORM", 9 }, { <AE01>, "NORM", 1 }, - { <AE02>, "NORM", 1 }, { <AE03>, "NORM", 1 }, - { <AE04>, "NORM", 1 }, { <AE05>, "NORM", 1 }, - { <AE06>, "NORM", 1 }, { <AE07>, "NORM", 1 }, - { <AE08>, "NORM", 1 }, { <AE09>, "NORM", 1 }, - { <AE10>, "NORM", 1 }, { <AE11>, "NORM", 1 }, - { <AE12>, "NORM", 1 }, - { <BKSP>, "BKSP", 1, color="grey10" } - }; - }; - row { - top= 20; - left= 1; - keys { - { <PROP>, "NORM", 1, color= "grey10" }, - { <UNDO>, "NORM", 1, color= "grey10" }, - { <TAB>, "TABK", 9, color= "grey10" }, - { <AD01>, "NORM", 1 }, - { <AD02>, "NORM", 1 }, { <AD03>, "NORM", 1 }, - { <AD04>, "NORM", 1 }, { <AD05>, "NORM", 1 }, - { <AD06>, "NORM", 1 }, { <AD07>, "NORM", 1 }, - { <AD08>, "NORM", 1 }, { <AD09>, "NORM", 1 }, - { <AD10>, "NORM", 1 }, { <AD11>, "NORM", 1 }, - { <AD12>, "NORM", 1 }, - { <RTRN>, "RTRN", 1, color= "grey10" } - }; - }; - row { - top= 39; - left= 1; - keys { - { <FRNT>, "NORM", 1, color= "grey10" }, - { <COPY>, "NORM", 1, color= "grey10" }, - { <CAPS>, "CAPS", 9, color= "grey10" }, - { <AC01>, "NORM", 1 }, - { <AC02>, "NORM", 1 }, { <AC03>, "NORM", 1 }, - { <AC04>, "NORM", 1 }, { <AC05>, "NORM", 1 }, - { <AC06>, "NORM", 1 }, { <AC07>, "NORM", 1 }, - { <AC08>, "NORM", 1 }, { <AC09>, "NORM", 1 }, - { <AC10>, "NORM", 1 }, { <AC11>, "NORM", 1 }, - { <AC12>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 1; - keys { - { <OPEN>, "NORM", 1, color= "grey10" }, - { <PAST>, "NORM", 1, color= "grey10" }, - { <LFSH>, "LFSH", 9, color= "grey10" }, - { <AB00>, "NORM", 1 }, { <AB01>, "NORM", 1 }, - { <AB02>, "NORM", 1 }, { <AB03>, "NORM", 1 }, - { <AB04>, "NORM", 1 }, { <AB05>, "NORM", 1 }, - { <AB06>, "NORM", 1 }, { <AB07>, "NORM", 1 }, - { <AB08>, "NORM", 1 }, { <AB09>, "NORM", 1 }, - { <AB10>, "NORM", 1 }, - { <RTSH>, "RTSH", 1, color="grey10" } - }; - }; - row { - top= 77; - left= 1; - key.color= "grey10"; - keys { - { <FIND>, "NORM", 1 }, { <CUT>, "NORM", 1 }, - { <LCTL>, "LCTL", 9 }, { <LALT>, "NORM", 1 }, - { <LMTA>, "META", 1 }, - { <SPCE>, "SPCE", 1, color= "white" }, - { <RMTA>, "META", 1 }, { <COMP>, "NORM", 1 }, - { <ALGR>, "NORM", 1 } - }; - }; - }; // End of "Alpha" section - - section "Editing" { - key.color= "grey10"; - priority= 3; - top= 61; - left= 352; - width= 58; - height= 95; - row { - top= 1; - left= 1; - keys { - { <INS>, "NORM", 1 }, { <HOME>, "NORM", 1 }, - { <PGUP>, "NORM", 1 } - }; - }; - row { - top= 20; - left= 1; - keys { - { <DELE>, "NORM", 1 }, { <END>, "NORM", 1 }, - { <PGDN>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 20; - keys { - { <UP>, "NORM", 1 } - }; - }; - row { - top= 77; - left= 1; - keys { - { <LEFT>, "NORM", 1 }, { <DOWN>, "NORM", 1 }, - { <RGHT>, "NORM", 1 } - }; - }; - }; // End of "Editing" section - - section "Keypad" { - key.color= "white"; - priority= 4; - top= 61; - left= 420; - width= 77; - height= 95; - row { - top= 1; - left= 1; - key.color= "grey10"; - keys { - { <NMLK>, "NORM", 1 }, { <KPDV>, "NORM", 1 }, - { <KPMU>, "NORM", 1 }, { <KPSU>, "NORM", 1 } - }; - }; - row { - top= 20; - left= 1; - keys { - { <KP7>, "NORM", 1 }, { <KP8>, "NORM", 1 }, - { <KP9>, "NORM", 1 }, - { <KPAD>, "KPAD", 1, color="grey10" } - }; - }; - row { - top= 39; - left= 1; - keys { - { <KP4>, "NORM", 1 }, { <KP5>, "NORM", 1 }, - { <KP6>, "NORM", 1 } - }; - }; - row { - top= 58; - left= 1; - keys { - { <KP1>, "NORM", 1 }, { <KP2>, "NORM", 1 }, - { <KP3>, "NORM", 1 }, - { <KPEN>, "KPAD", 1, color="grey10" } - }; - }; - row { - top= 77; - left= 1; - keys { - { <KP0>, "KP0", 1 }, { <KPDL>, "NORM", 1 } - }; - }; - }; // End of "Keypad" section - - outline "Edges" { - top= 0; - left= 0; - priority= 0; - shape= "EDGE"; - }; - - solid "Logos" { - color= "blue"; - top= 5; - left= 15; - priority= 0; - shape= "LOGO"; - }; - - logo "SUNLogoImage" { - top= 5; - left= 15; - name= "SUN"; - priority= 1; - shape= "LOGO"; - }; - - text.font= "charter"; - text.weight= "medium"; - text.slant= "i"; - text.fontSize= 40; - text "SunLogoText" { - top= 5; - left= 32; - color= "blue"; - text= "Sun"; - }; - - shape "LED" { cornerRadius= 1, - { [ 0, 1.5], [ 1.5, 3], [ 3, 1.5], [ 1.5, 0] } - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.shape= "LED"; - indicator "Caps Lock" { left= 75; top= 103; priority= 5; }; - indicator "Compose" { left= 314; top= 142; priority= 5; }; - indicator "Scroll Lock" { left= 378; top= 29; }; - indicator "Num Lock" { left= 426; top= 66; }; -}; - -xkb_geometry "type4_se" { - - // kbd: type = 4, layout = 11 - - description= "Sun Type4 keyboard (Sweden)"; - - - width= 453; - height= 183; - - baseColor= "grey"; - labelColor= "black"; - - shape "EDGE" { cornerRadius= 2, { [ 452, 185 ] } }; - shape.cornerRadius= 1; - shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "TABK" { { [ 27,18] }, { [2,1], [25,17] } }; - shape "DELE" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "RTRN" { - approx = { [ 0, 0], [28,37] }, - { [ 0, 0], [28, 0], [28,37], - [ 5,37], [ 5,19], [ 0,19] }, - { [ 1, 1], [26, 1], [26,36], - [ 7,36], [ 7,18], [ 1,18] } - }; - shape "LCTL" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "LFSH" { { [ 22,18] }, { [2,1], [20,17] } }; - shape "RTSH" { { [ 33,18] }, { [2,1], [31,17] } }; - shape "CAPS" { { [ 32,18] }, { [2,1], [30,17] } }; - shape "MODK" { { [ 28,18] }, { [2,1], [26,17] } }; - shape "SPCE" { { [170,18] }, { [2,1], [168,17] } }; - shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; - shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; - shape "HELP" { { [ 37,18] }, { [2,1], [35,17] } }; - - outline "Edges" { - top= 0; - left= 0; - shape= "EDGE"; - }; - - section.left= 17; - row.left= 1; - key.shape= "NORM"; - key.gap= 1; - - section "Alpha" { - top= 58; - row { - top= 1; - key.color= "grey10"; - keys { <STOP>, <AGAI>, { <FK01>, 9 }, - <FK02>, <FK03>, <FK04>, - <FK05>, <FK06>, <FK07>, <FK08>, - <FK09>, <FK10>, <FK11>, <FK12>, - { <AF13>, color= "white"}, - { <AF14>, color= "white"}, - <DELE>, { <PAUS>, 9 }, - <PRSC>, <SCLK>, <NMLK> - }; - }; - row { - top= 20; - key.color= "white"; - keys { - { <PROP>, color= "grey10" }, - { <UNDO>, color= "grey10" }, - { <ESC>, 9, color= "grey10" }, - <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, - <AE06>, <AE07>, <AE08>, <AE09>, <AE10>, - <AE11>, <AE12>, - { <BKSP>, "BKSP", color= "grey10" }, - { <KPEQ>, 9, color= "grey10" }, - { <KPDV>, color= "grey10" }, - { <KPMU>, color= "grey10" }, - { <KPSU>, color= "grey10" } - }; - }; - row { - top= 39; - key.color= "white"; - keys { - { <FRNT>, color= "grey10" }, - { <COPY>, color= "grey10" }, - { <TAB>, 9, "TABK", color= "grey10" }, - <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, - <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, - <AD11>, <AD12>, - { <RTRN>, "RTRN", color= "grey10" }, - { <KP7>, 9, color= "grey10" }, - { <KP8>, color= "grey10" }, - { <KP9>, color= "grey10" }, - { <KPAD>, "KPAD", color= "grey10" } - }; - }; - row { - top= 58; - key.color= "white"; - keys { - { <OPEN>, color= "grey10" }, - { <PAST>, color= "grey10" }, - { <CAPS>, 9, "LCTL", color= "grey10" }, - <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, - <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, <AC12>, - { <KP4>, 33, color= "grey10" }, - { <KP5>, color= "grey10" }, - { <KP6>, color= "grey10" } - }; - }; - row { - top= 77; - key.color= "white"; - keys { - { <FIND>, color= "grey10" }, - { <CUT>, color= "grey10" }, - { <LFSH>, 9 , "LFSH", color= "grey10" }, - <AB00>, <AB01>, <AB02>, <AB03>, - <AB04>, <AB05>, <AB06>, <AB07>, - <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color= "grey10" }, - { <LNFD>, color= "grey10" }, - { <KP1>, 9, color= "grey10" }, - { <KP2>, color= "grey10" }, - { <KP3>, color= "grey10" }, - { <KPEN>, "KPAD", color= "grey10" } - }; - }; - row { - top= 96; - key.color= "grey10"; - keys { - { <HELP>, "HELP" }, { <LCTL>, 9 }, - <LALT>, <LMTA>, - { <SPCE>, "SPCE", color= "white" }, - <RMTA>, <COMP>, <ALGR>, - { <KP0>, 9, "KP0" }, <KPDL> - }; - }; - }; // End of "Alpha" section - - shape "RIDGE" { cornerRadius= 1, { [ 0, 1], [ 1, 0 ], - [330, 0], [331, 1], - [330, 2], [ 1, 2] } }; - solid "Ridge" { - shape= "RIDGE"; - top= 48; - left= 18; - }; - - shape "LEDS" { cornerRadius= 1, { [ 75 ,21 ] } }; - shape "LED" { cornerRadius= 0, { [ 7, 4 ] } }; - outline "LedPanel" { - shape= "LEDS"; - top= 28; - left= 358; - }; - indicator.onColor= "green"; - indicator.offColor= "green30"; - indicator.top= 43; - indicator.shape= "LED"; - indicator "Caps Lock" { left= 364; }; - indicator "Compose" { left= 383; }; - indicator "Scroll Lock" { left= 402; }; - indicator "Num Lock" { left= 421; }; - text.top= 32; - text.color= "black"; - text "CapsLockLabel" { left= 364; text="Caps\nLock"; }; - text "ComposeLabel" { left= 380; text="\nCompose"; }; - text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; }; - text "NumLockLabel" { left= 421; text="Num\nLock"; }; -}; xkb_geometry "t6" { @@ -2970,45 +715,6 @@ xkb_geometry "t6unix" { text "NumLockLabel" { left= 224; text="Num\nLock"; }; }; -xkb_geometry "type5" { - include "sun(t5)" - description= "Sun Type5 keyboard"; -}; - -xkb_geometry "type5jp" { - include "sun(t5jp)" - description= "Sun Type5 Japanese keyboard"; -}; - -xkb_geometry "type5tuv" { - include "sun(t5tuv)" - description= "Sun Type5 keyboard"; -}; - -xkb_geometry "type5euro" { - include "sun(t5tuv)" - description= "Sun Type5 keyboard"; -}; - -xkb_geometry "type5unix" { - include "sun(t5unix)" - description= "Sun Type5 Unix keyboard"; -}; - -xkb_geometry "type5hobo" { - include "sun(t5hobo)" - description= "Sun Type5 Hobo keyboard"; -}; - -xkb_geometry "type5tuvhobo" { - include "sun(t5tuvhobo)" - description= "Sun Type5 Hobo keyboard"; -}; - -xkb_geometry "type5jphobo" { - include "sun(t5jphobo)" - description= "Sun Type5 Japanese Hobo keyboard"; -}; default xkb_geometry "type6" { include "sun(t6)" @@ -3030,17 +736,22 @@ xkb_geometry "type6unix" { description= "Sun Type6 Unix keyboard"; }; -xkb_geometry "x86" { - include "pc(pc101)" - description= "x86 Style Keyboard"; +xkb_geometry "type7" { + include "sun(t6)" + description= "Sun Type7 keyboard (US, Korea, Taiwan)"; +}; + +xkb_geometry "type7jp" { + include "sun(t6jp)" + description= "Sun Type7 Japanese keyboard"; }; -xkb_geometry "MS_x86" { - include "pc(pc104)" - description= "x86 104 Key Keyboard"; +xkb_geometry "type7tuv" { + include "sun(t6tuv)" + description= "Sun Type7 TUV keyboard"; }; -xkb_geometry "x86tuv" { - include "pc(pc102)" - description= "x86 European Style Keyboard"; +xkb_geometry "type7unix" { + include "sun(t6unix)" + description= "Sun Type7 Unix keyboard"; }; diff --git a/xorg-server/xkeyboard-config/keycodes/sun b/xorg-server/xkeyboard-config/keycodes/sun index ea696a8a1..5a9d21077 100644 --- a/xorg-server/xkeyboard-config/keycodes/sun +++ b/xorg-server/xkeyboard-config/keycodes/sun @@ -1,3 +1,4 @@ +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // //Copyright 1996, 1998 The Open Group // @@ -23,166 +24,11 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// --------------------------------------------------------------------------- -// 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 xkb_keycodes "type4" { - - minimum= 8; - maximum= 255; - - <ESC> = 36; - <AE01> = 37; - <AE02> = 38; - <AE03> = 39; - <AE04> = 40; - <AE05> = 41; - <AE06> = 42; - <AE07> = 43; - <AE08> = 44; - <AE09> = 45; - <AE10> = 46; - <AE11> = 47; - <AE12> = 48; - <TLDE> = 49; - <BKSP> = 50; - - <TAB> = 60; - <AD01> = 61; - <AD02> = 62; - <AD03> = 63; - <AD04> = 64; - <AD05> = 65; - <AD06> = 66; - <AD07> = 67; - <AD08> = 68; - <AD09> = 69; - <AD10> = 70; - <AD11> = 71; - <AD12> = 72; - <DELE> = 73; - <LCTL> = 83; - <AC01> = 84; - <AC02> = 85; - <AC03> = 86; - <AC04> = 87; - <AC05> = 88; - <AC06> = 89; - <AC07> = 90; - <AC08> = 91; - <AC09> = 92; - <AC10> = 93; - <AC11> = 94; - <BKSL> = 95; - <RTRN> = 96; - - <LFSH> = 106; - <AB01> = 107; - <AB02> = 108; - <AB03> = 109; - <AB04> = 110; - <AB05> = 111; - <AB06> = 112; - <AB07> = 113; - <AB08> = 114; - <AB09> = 115; - <AB10> = 116; - <RTSH> = 117; - <LNFD> = 118; - - <HELP> = 125; - <CAPS> = 126; - <LALT> = 26; - <LMTA> = 127; - <SPCE> = 128; - <RMTA> = 129; - <COMP> = 74; - <ALGR> = 20; - alias <RALT> = <ALGR>; - - <FK01> = 12; - <FK02> = 13; - <FK03> = 15; - <FK04> = 17; - <FK05> = 19; - <FK06> = 21; - <FK07> = 23; - <FK08> = 24; - <FK09> = 25; - <FK10> = 14; - <FK11> = 16; - <FK12> = 18; - - <STOP> = 8; - <AGAI> = 10; - <PROP> = 32; - <UNDO> = 33; - <FRNT> = 56; - <COPY> = 58; - <OPEN> = 79; - <PAST> = 80; - <FIND> = 102; - <CUT> = 104; - - <PRSC> = 29; - <SCLK> = 30; - <PAUS> = 28; - - <NMLK> = 105; - <KPEQ> = 52; - <KPDV> = 53; - <KPMU> = 54; - <KPSU> = 78; - - <KP7> = 75; - <KP8> = 76; - <KP9> = 77; - <KPAD> = 132; - - <KP4> = 98; - <KP5> = 99; - <KP6> = 100; - - <KP1> = 119; - <KP2> = 120; - <KP3> = 121; - <KPEN> = 97; - - <KP0> = 101; - <KPDL> = 57; - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5" { +xkb_keycodes "type6" { minimum= 8; - maximum= 255; + maximum= 132; <ESC> = 36; <AE01> = 37; @@ -323,628 +169,78 @@ xkb_keycodes "type5" { indicator 1 = "Num Lock"; }; -xkb_keycodes "type4tuv" { - include "sun(type4)" - <LSGT> = 131; - <BRCR> = 22; -}; - -xkb_keycodes "type4_ca" { - include "sun(type4)" - <LSGT> = 131; -}; -xkb_keycodes "type4_jp" { - include "sun(type4)" - <EXEC> = 122; - <KANJ> = 123; - <HENK> = 124; - <BRCR> = 22; - alias <UNDR> = <LNFD>; -}; - -xkb_keycodes "type4_euro" { - include "sun(type4)" - <LSGT> = 131; -}; - -xkb_keycodes "type5tuv" { - include "sun(type5)" +xkb_keycodes "type6tuv" { + include "sun(type6)" <LSGT> = 131; }; -xkb_keycodes "type5_jp" { - include "sun(type5)" +xkb_keycodes "type6_jp" { + include "sun(type6)" <EXEC> = 122; <KANJ> = 123; <HENK> = 124; <UNDR> = 118; }; -xkb_keycodes "type5_euro" { - include "sun(type5)" - <LSGT> = 131; -}; - -xkb_keycodes "type5hobo" { - - minimum= 8; - maximum= 255; - - <ESC> = 36; - <AE01> = 37; - <AE02> = 38; - <AE03> = 39; - <AE04> = 40; - <AE05> = 41; - <AE06> = 42; - <AE07> = 43; - <AE08> = 44; - <AE09> = 45; - <AE10> = 46; - <AE11> = 47; - <AE12> = 48; - <TLDE> = 49; - <BKSP> = 50; - - <TAB> = 60; - <AD01> = 61; - <AD02> = 62; - <AD03> = 63; - <AD04> = 64; - <AD05> = 65; - <AD06> = 66; - <AD07> = 67; - <AD08> = 68; - <AD09> = 69; - <AD10> = 70; - <AD11> = 71; - <AD12> = 72; - <DELE> = 73; - <COMP> = 74; - <ALGR> = 20; - alias <RALT> = <ALGR>; - - <LCTL> = 83; - <AC01> = 84; - <AC02> = 85; - <AC03> = 86; - <AC04> = 87; - <AC05> = 88; - <AC06> = 89; - <AC07> = 90; - <AC08> = 91; - <AC09> = 92; - <AC10> = 93; - <AC11> = 94; - <BKSL> = 95; - <RTRN> = 96; - - <LFSH> = 106; - <AB01> = 107; - <AB02> = 108; - <AB03> = 109; - <AB04> = 110; - <AB05> = 111; - <AB06> = 112; - <AB07> = 113; - <AB08> = 114; - <AB09> = 115; - <AB10> = 116; - <RTSH> = 117; - - <LALT> = 26; - <CAPS> = 126; - <LMTA> = 127; - <SPCE> = 128; - <RMTA> = 129; - - <FK01> = 12; - <FK02> = 13; - <FK03> = 15; - <FK04> = 17; - <FK05> = 19; - <FK06> = 21; - <FK07> = 23; - <FK08> = 24; - <FK09> = 25; - <FK10> = 14; - <FK11> = 16; - <FK12> = 18; - <STOP> = 8; - <AGAI> = 10; - <PROP> = 32; - <UNDO> = 33; - <FRNT> = 56; - <COPY> = 58; - <OPEN> = 79; - <PAST> = 80; - <FIND> = 102; - <CUT> = 104; - - <PRSC> = 29; - <SCLK> = 30; - <PAUS> = 28; - - <NMLK> = 105; -// <KPDV> = 53; -// <KPMU> = 54; -// <KPSU> = 78; - -// <KP7> = 75; -// <KP8> = 76; -// <KP9> = 77; -// <KPAD> = 132; - -// <KP4> = 98; -// <KP5> = 99; -// <KP6> = 100; - -// <KP1> = 119; -// <KP2> = 120; -// <KP3> = 121; -// <KPEN> = 97; - -// <KP0> = 101; -// <KPDL> = 57; - - <UP> = 27; - <LEFT> = 31; - <DOWN> = 34; - <RGHT> = 35; - - <INS> = 51; - <HOME> = 59; - <END> = 81; - <PGUP> = 103; - <PGDN> = 130; - <HELP> = 125; - - <MUTE> = 52; - <VOL-> = 9; - <VOL+> = 11; - <POWR> = 55; - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5tuvhobo" { - include "sun(type5hobo)" +xkb_keycodes "type6_euro" { + include "sun(type6)" <LSGT> = 131; - -}; - -xkb_keycodes "type5_jphobo" { - include "sun(type5hobo)" - <EXEC> = 122; - <KANJ> = 123; - <HENK> = 124; - <UNDR> = 118; -}; - -xkb_keycodes "type6" { - include "sun(type5)" -}; - -xkb_keycodes "type6tuv" { - include "sun(type5tuv)" }; xkb_keycodes "type6unix" { - include "sun(type5)" -}; - -xkb_keycodes "type6_jp" { - include "sun(type5_jp)" -}; - -xkb_keycodes "type6_euro" { - include "sun(type5_euro)" + include "sun(type6)" }; // Even though this is labeled as _usb, I verified these keycodes as accurate // on my type5 serial and type6 serial keyboards as well on linux-2.6 boxes. -// I'm not sure where the "type5" keycodes above are coming from... -xkb_keycodes "type6_usb" { +// I'm not sure where the "type6" keycodes above are coming from... +default xkb_keycodes "type6_usb" { include "xfree86" - <STOP> = 232; - <AGAI> = 133; - <PROP> = 134; - <UNDO> = 135; - <FRNT> = 140; - <COPY> = 248; - <OPEN> = 191; - <PAST> = 192; - <FIND> = 122; - <CUT> = 188; +// <STOP> = 232; +// <AGAI> = 133; +// <PROP> = 134; +// <UNDO> = 135; +// <FRNT> = 140; +// <COPY> = 248; +// <OPEN> = 191; +// <PAST> = 192; +// <FIND> = 122; +// <CUT> = 188; - <HELP> = 245; + // <HELP> = 245; // The blank has keycode 239 on my type6 serial kb, but 134 on // my type6 usb keyboard (same as <PROP>) - <BLNK> = 239; +// <BLNK> = 239; // AltGr + PrScr actually sends a different keycode - <SYRQ> = 92; +// <SYRQ> = 92; + +// <MUTE> = 160; +// <VOL-> = 174; +// <VOL+> = 176; +// <POWR> = 222; - <MUTE> = 160; - <VOL-> = 174; - <VOL+> = 176; - <POWR> = 222; + <I150> = 155; + <I160> = 160; + <I235> = 235; indicator 4 = "Compose"; }; xkb_keycodes "type6tuv_usb" { include "sun(type6_usb)" - <LSGT> = 94; +// <LSGT> = 94; // <BKSL> = 51; }; xkb_keycodes "type6_jp_usb" { include "sun(type6_usb)" alias <UNDR> = <KPDC>; // 123 - alias <EXEC> = <I0B>; // 139 - alias <KANJ> = <I0A>; // 138 - alias <HENK> = <XFER>; // 129 + alias <EXEC> = <NFER>; // 131 + alias <KANJ> = <XFER>; // 129 + alias <HENK> = <HKTG>; // 208 indicator 5 = "Kana"; }; - -xkb_keycodes "type5_se" { - - minimum= 8; - maximum= 255; - - // Row G - <HELP> = 125; - // - <ESC> = 36; - // - <FK01> = 12; - <FK02> = 13; - <FK03> = 15; - <FK04> = 17; - // - <FK05> = 19; - <FK06> = 21; - <FK07> = 23; - <FK08> = 24; - // - <FK09> = 25; - <FK10> = 14; - <FK11> = 16; - <FK12> = 18; - // - <PRSC> = 29; - <SCLK> = 30; - <PAUS> = 28; - // - <MUTE> = 52; - <VOL-> = 9; - <VOL+> = 11; - <POWR> = 55; - // End Row G - - // Row F - // - // End Row F - - // Row E - <STOP> = 8; - <AGAI> = 10; - // - <AE00> = 49; - alias <TLDE> = <AE00>; - <AE01> = 37; - <AE02> = 38; - <AE03> = 39; - <AE04> = 40; - <AE05> = 41; - <AE06> = 42; - <AE07> = 43; - <AE08> = 44; - <AE09> = 45; - <AE10> = 46; - <AE11> = 47; - <AE12> = 48; - <BKSP> = 50; - // - <INS> = 51; - <HOME> = 59; - <PGUP> = 103; - // - <NMLK> = 105; - <KPDV> = 53; - <KPMU> = 54; - <KPSU> = 78; - //End Row E - - // Row D - <PROP> = 32; - <UNDO> = 33; - // - <AD00> = 60; - alias <TAB> = <AD00>; - <AD01> = 61; - <AD02> = 62; - <AD03> = 63; - <AD04> = 64; - <AD05> = 65; - <AD06> = 66; - <AD07> = 67; - <AD08> = 68; - <AD09> = 69; - <AD10> = 70; - <AD11> = 71; - <AD12> = 72; - // - <DELE> = 73; - <END> = 81; - <PGDN> = 130; - // - <KP7> = 75; - <KP8> = 76; - <KP9> = 77; - <KPAD> = 132; - // End Row D - - // Row C - <FRNT> = 56; - <COPY> = 58; - // - <AC00> = 126; - alias <CAPS> = <AC00>; - <AC01> = 84; - <AC02> = 85; - <AC03> = 86; - <AC04> = 87; - <AC05> = 88; - <AC06> = 89; - <AC07> = 90; - <AC08> = 91; - <AC09> = 92; - <AC10> = 93; - <AC11> = 94; - <AC12> = 95; - alias <BKSL> = <AC12>; - <RTRN> = 96; - // - <KP4> = 98; - <KP5> = 99; - <KP6> = 100; - // End Row C - - // Row B - <OPEN> = 79; - <PAST> = 80; - // - <LFSH> = 106; - <AB00> = 131; - alias <LSGT> = <AB00>; - <AB01> = 107; - <AB02> = 108; - <AB03> = 109; - <AB04> = 110; - <AB05> = 111; - <AB06> = 112; - <AB07> = 113; - <AB08> = 114; - <AB09> = 115; - <AB10> = 116; - <RTSH> = 117; - // - <UP> = 27; - // - <KP1> = 119; - <KP2> = 120; - <KP3> = 121; - <KPEN> = 97; - // End Row B - - // Row A - <FIND> = 102; - <CUT> = 104; - // - <LCTL> = 83; - <LALT> = 26; - <LMTA> = 127; - <SPCE> = 128; - <RMTA> = 129; - <COMP> = 74; - <ALGR> = 20; - alias <RALT> = <ALGR>; - // - <LEFT> = 31; - <DOWN> = 34; - <RGHT> = 35; - // - <KP0> = 101; - <KPDL> = 57; - // End Row A - - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type5c_se" { - include "sun(type5_se)" -}; - -xkb_keycodes "type4__se" { - - minimum= 8; - maximum= 255; - - // Row F - <STOP> = 8; - <AGAI> = 10; - // - <FK01> = 12; - <FK02> = 13; - <FK03> = 15; - <FK04> = 17; - <FK05> = 19; - <FK06> = 21; - <FK07> = 23; - <FK08> = 24; - <FK09> = 25; - <FK10> = 14; - <FK11> = 16; - <FK12> = 18; - <AF13> = 95; - alias <TLDE> = <AF13>; - <AF14> = 22; - <DELE> = 73; - // - <PAUS> = 28; - <PRSC> = 29; - <SCLK> = 30; - <NMLK> = 105; - // End Row F - - // Row E - <PROP> = 32; - <UNDO> = 33; - // - <AE00> = 36; - alias <ESC> = <AE00>; - <AE01> = 37; - <AE02> = 38; - <AE03> = 39; - <AE04> = 40; - <AE05> = 41; - <AE06> = 42; - <AE07> = 43; - <AE08> = 44; - <AE09> = 45; - <AE10> = 46; - <AE11> = 47; - <AE12> = 48; - <BKSP> = 50; - // - <KPEQ> = 52; - <KPDV> = 53; - <KPMU> = 54; - <KPSU> = 78; - // End Row E - - // Row D - <FRNT> = 56; - <COPY> = 58; - // - <AD00> = 60; - alias <TAB> = <AD00>; - <AD01> = 61; - <AD02> = 62; - <AD03> = 63; - <AD04> = 64; - <AD05> = 65; - <AD06> = 66; - <AD07> = 67; - <AD08> = 68; - <AD09> = 69; - <AD10> = 70; - <AD11> = 71; - <AD12> = 72; - // - <KP7> = 75; - <KP8> = 76; - <KP9> = 77; - <KPAD> = 132; - // End Row D - - // Row C - <OPEN> = 79; - <PAST> = 80; - // - <AC00> = 83; - // alias <CAPS> = <AC00>; - <AC01> = 84; - <AC02> = 85; - <AC03> = 86; - <AC04> = 87; - <AC05> = 88; - <AC06> = 89; - <AC07> = 90; - <AC08> = 91; - <AC09> = 92; - <AC10> = 93; - <AC11> = 94; - <AC12> = 49; - alias <BKSL> = <AC12>; - <RTRN> = 96; - // - <KP4> = 98; - <KP5> = 99; - <KP6> = 100; - // End Row C - - // Row B - <FIND> = 102; - <CUT> = 104; - // - <LFSH> = 106; - <AB00> = 131; - alias <LSGT> = <AB00>; - <AB01> = 107; - <AB02> = 108; - <AB03> = 109; - <AB04> = 110; - <AB05> = 111; - <AB06> = 112; - <AB07> = 113; - <AB08> = 114; - <AB09> = 115; - <AB10> = 116; - <RTSH> = 117; - <LNFD> = 118; - // - <KP1> = 119; - <KP2> = 120; - <KP3> = 121; - <KPEN> = 97; - // End Row B - - // Row A - <HELP> = 125; - // - <AA00> = 126; - // alias <LCTL> = <AA00>; - <LALT> = 26; - <LMTA> = 127; - <SPCE> = 128; - <RMTA> = 129; - <COMP> = 74; - <ALGR> = 20; - alias <RALT> = <ALGR>; - // - <KP0> = 101; - <KPDL> = 57; - // End Row A - - indicator 4 = "Caps Lock"; - indicator 3 = "Compose"; - indicator 2 = "Scroll Lock"; - indicator 1 = "Num Lock"; -}; - -xkb_keycodes "type4_se" { - - include "sun(type4__se)" - - alias <LCTL> = <AA00>; - alias <CAPS> = <AC00>; -}; - -xkb_keycodes "type4_se_swapctl" { - - include "sun(type4__se)" - - alias <LCTL> = <AC00>; - alias <CAPS> = <AA00>; -}; diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 05732af2a..1614eec96 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -77,6 +77,12 @@ <_description>Secwepemctsin</_description> </configItem> </variant> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Multilingual (Canada, Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -108,6 +114,12 @@ </languageList> </configItem> </variant> + <variant> + <configItem> + <name>sun_type6</name> + <_description>German (Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -141,6 +153,12 @@ <_description>Lithuanian (US Dvorak with Lithuanian letters)</_description> </configItem> </variant> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Lithuanian (Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -201,6 +219,12 @@ <_description>Latvian (US Colemak, apostrophe variant)</_description> </configItem> </variant> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Latvian (Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -247,6 +271,12 @@ <iso639Id>ger</iso639Id> </languageList> </configItem> </variant> + <variant> + <configItem> + <name>sun_type6</name> + <_description>English (US, Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -269,7 +299,13 @@ <_description>Polish (Colemak)</_description> </configItem> </variant> - </variantList> + <variant> + <configItem> + <name>type6</name> + <_description>Polish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -295,6 +331,12 @@ <_description>Romanian (ergonomic Touchtype)</_description> </configItem> </variant> + <variant> + <configItem> + <name>type6</name> + <_description>Romanian (Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -337,6 +379,12 @@ <iso639Id>bel</iso639Id></languageList> </configItem> </variant> + <variant> + <configItem> + <name>type6</name> + <_description>Russian (Sun Type 6/7)</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -374,6 +422,354 @@ </variant> </variantList> </layout> + <layout> + <configItem> + <name>ara</name> + <_shortDescription>ar</_shortDescription> + <_description>Arabic</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Arabic (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>be</name> + <_shortDescription>be</_shortDescription> + <_description>Belgian</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Belgian (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>br</name> + <_shortDescription>pt</_shortDescription> + <_description>Portuguese (Brazil)</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Portuguese (Brazil,Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>cz</name> + <_shortDescription>cs</_shortDescription> + <_description>Czech</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Czech (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>dk</name> + <_shortDescription>da</_shortDescription> + <_description>Danish</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Danish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>nl</name> + <_shortDescription>nl</_shortDescription> + <_description>Dutch</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Dutch (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>ee</name> + <_shortDescription>et</_shortDescription> + <_description>Estonian</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Estonian (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>fi</name> + <_shortDescription>fi</_shortDescription> + <_description>Finnish</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Finnish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>fr</name> + <_shortDescription>fr</_shortDescription> + <_description>French</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>French (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>gr</name> + <_shortDescription>gr</_shortDescription> + <_description>Greek</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Greek (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>it</name> + <_shortDescription>it</_shortDescription> + <_description>Italian</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Italian (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>jp</name> + <_shortDescription>ja</_shortDescription> + <_description>Japanese</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Japanese (Sun Type 6)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>sun_type7</name> + <_description>Japanese (Sun Type 7 - pc compatible)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>sun_type7_suncompat</name> + <_description>Japanese (Sun Type 7 - sun compatible)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>no</name> + <_shortDescription>no</_shortDescription> + <_description>Norwegian</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Norwegian (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>pt</name> + <_shortDescription>pt</_shortDescription> + <_description>Portuguese</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Portuguese (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>sk</name> + <_shortDescription>sk</_shortDescription> + <_description>Slovak</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Slovak (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>es</name> + <_shortDescription>es</_shortDescription> + <_description>Spanish</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Spanish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>se</name> + <_shortDescription>sv</_shortDescription> + <_description>Swedish</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Swedish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>ch</name> + <_shortDescription>de</_shortDescription> + <_description>>German (Switzerland)</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6_de</name> + <_description>German (Switzerland, Sun Type 6/7)</_description> + </configItem> + </variant> + <variant> + <configItem> + <name>sun_type6_fr</name> + <_description>French (Switzerland, Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>tr</name> + <_shortDescription>tr</_shortDescription> + <_description>Turkish</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Turkish (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>ua</name> + <_shortDescription>uk</_shortDescription> + <_description>Ukrainian</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Ukrainian (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>gb</name> + <_shortDescription>en</_shortDescription> + <_description>English (UK)</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>English (UK, Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> + <layout> + <configItem> + <name>kr</name> + <_shortDescription>ko</_shortDescription> + <_description>Korean</_description> + </configItem> + <variantList> + <variant> + <configItem> + <name>sun_type6</name> + <_description>Korean (Sun Type 6/7)</_description> + </configItem> + </variant> + </variantList> + </layout> </layoutList> <optionList/> </xkbConfigRegistry> diff --git a/xorg-server/xkeyboard-config/rules/base.lists.part b/xorg-server/xkeyboard-config/rules/base.lists.part index c7983df87..97b3b907f 100644 --- a/xorg-server/xkeyboard-config/rules/base.lists.part +++ b/xorg-server/xkeyboard-config/rules/base.lists.part @@ -99,9 +99,21 @@ ! $thinkpads = thinkpad thinkpad60 thinkpadz60 -! $sun_t6_custom = ara be br ca ch cz de dk \ - ee es fi fr gb gr it kr \ - lt lv nl no pl pt ro ru \ - se sk tr tw ua +! $sun = sun_type6_jp sun_type6_usb sun_type6_euro_usb \ + sun_type6_jp_usb sun_type6_unix_usb sun_type7_jp_usb \ + sun_type7_usb sun_type7_euro_usb sun_type7_unix_usb + +! $sun_jp = sun_type6_jp sun_type6_jp_usb sun_type7_jp_usb + +// Sun Type_6_7 keyboards with custom layouts +! $sun_custom = 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 tr tw ua us + +! $sun_var = sun_type6 sun_type6_suncompat sun_type6_de sun_type6_fr \ + sun_type7 sun_type7_suncompat suncompat + +! $sun_compat = sun_type6 sun_type6_suncompat sun_type7_suncompat suncompat ! $htcdreamlayouts = us it de diff --git a/xorg-server/xkeyboard-config/rules/base.m_g.part b/xorg-server/xkeyboard-config/rules/base.m_g.part index 753f2ed75..eb0512d58 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_g.part +++ b/xorg-server/xkeyboard-config/rules/base.m_g.part @@ -24,4 +24,13 @@ hhk = hhk(basic) kinesis = kinesis(model100) $nokiamodels = nokia(%m) + sun_type6_jp = sun(type6jp) + sun_type6_usb = sun(type6) + sun_type6_euro_usb = sun(type6tuv) + sun_type6_jp_usb = sun(type6jp) + sun_type6_unix_usb = sun(type6unix) + sun_type7_jp_usb = sun(type6jp) + sun_type7_usb = sun(type7) + sun_type7_euro_usb = sun(type7tuv) + sun_type7_unix_usb = sun(type7unix) * = pc(pc104) diff --git a/xorg-server/xkeyboard-config/rules/base.m_k.part b/xorg-server/xkeyboard-config/rules/base.m_k.part index 2c621208f..ebccd3ea5 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_k.part +++ b/xorg-server/xkeyboard-config/rules/base.m_k.part @@ -1,10 +1,8 @@ amiga = amiga(de) ataritt = ataritt(de) empty = empty - sun4 = sun(type4_euro) - sun5 = sun(type5_euro) - sun6 = sun(type6_usb) - sun6euro = sun(type6tuv_usb) + $sun_jp = sun(type6_jp_usb) + $sun = sun(type6_usb) pc98 = xfree98(pc98) $applealu = macintosh(alukbd) macintosh_hhk = macintosh(hhk) diff --git a/xorg-server/xkeyboard-config/rules/base.m_s.part b/xorg-server/xkeyboard-config/rules/base.m_s.part index 4bbbcce31..e5d32a2a9 100644 --- a/xorg-server/xkeyboard-config/rules/base.m_s.part +++ b/xorg-server/xkeyboard-config/rules/base.m_s.part @@ -49,3 +49,5 @@ $maclaptop = +inet(apple)+level3(enter_switch) $applealu = +inet(apple) $macs = +inet(apple) + sun_type7_jp_usb = +sun_vndr/solaris(defaults_type7jp) + $sun = +sun_vndr/solaris(defaults) diff --git a/xorg-server/xkeyboard-config/rules/base.ml1_s.part b/xorg-server/xkeyboard-config/rules/base.ml1_s.part index 20b4276ed..1a990b0ae 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml1_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml1_s.part @@ -1,7 +1,6 @@ ataritt * = xfree68_vndr/ataritt(us)+%l[1]%(v[1]) amiga * = xfree68_vndr/amiga(usa1)+%l[1]%(v[1]) - sun4 * = latin+sun_vndr/us(type4)+%l[1]%(v[1]) - sun5 * = latin+sun_vndr/us(type5)+%l[1]%(v[1]) + $sun $sun_custom = pc+sun_vndr/%l[1]%(v[1]) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old $macvendorlayouts = macintosh_vndr/us(oldmac)+macintosh_vndr/%l[1]%(v[1]) macintosh_old * = macintosh_vndr/us(oldmac)+%l[1]%(v[1]) diff --git a/xorg-server/xkeyboard-config/rules/base.ml2_s.part b/xorg-server/xkeyboard-config/rules/base.ml2_s.part index 27f997529..e80d7cf86 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml2_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml2_s.part @@ -1,3 +1,4 @@ nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):2 nokiarx51 * = +nokia_vndr/rx-51(%l[2]%_v[2]):2 + $sun $sun_custom = +sun_vndr/%l[2]%(v[2]):2 * * = +%l[2]%(v[2]):2 diff --git a/xorg-server/xkeyboard-config/rules/base.ml3_s.part b/xorg-server/xkeyboard-config/rules/base.ml3_s.part index 607752509..efe7cf17b 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml3_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml3_s.part @@ -1,3 +1,4 @@ nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):3 nokiarx51 * = +nokia_vndr/rx-51(%l[3]%_v[3]):3 + $sun $sun_custom = +sun_vndr/%l[3]%(v[3]):3 * * = +%l[3]%(v[3]):3 diff --git a/xorg-server/xkeyboard-config/rules/base.ml4_s.part b/xorg-server/xkeyboard-config/rules/base.ml4_s.part index 8d92f393c..00ba445da 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml4_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml4_s.part @@ -1,3 +1,4 @@ nokiarx51 cz(qwerty) = +nokia_vndr/rx-51(cz_qwerty):4 nokiarx51 * = +nokia_vndr/rx-51(%l[4]%_v[4]):4 + $sun $sun_custom = +sun_vndr/%l[4]%(v[4]):4 * * = +%l[4]%(v[4]):4 diff --git a/xorg-server/xkeyboard-config/rules/base.ml_s.part b/xorg-server/xkeyboard-config/rules/base.ml_s.part index 7e0148672..552693dbf 100644 --- a/xorg-server/xkeyboard-config/rules/base.ml_s.part +++ b/xorg-server/xkeyboard-config/rules/base.ml_s.part @@ -5,18 +5,7 @@ classmate us = pc+%l(classmate) empty * = empty(basic) * empty = empty(basic) - sun4 $nonlatin = latin+sun_vndr/us(type4)+%l%(v):2 - sun4 * = latin+sun_vndr/us(type4)+%l%(v) - sun5 $nonlatin = latin+sun_vndr/us(type5)+%l%(v):2 - sun5 * = latin+sun_vndr/us(type5)+%l%(v) - sun6 us = pc+sun_vndr/us(type6) - sun6 en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6 $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6 * = pc+sun_vndr/us(type6)+%l%(v) - sun6euro us = pc+sun_vndr/us(type6) - sun6euro en_US = pc+sun_vndr/us(type6)+iso9995-3(basic) - sun6euro $sun_t6_custom = pc+sun_vndr/us(type6)+sun_vndr/%l%(v) - sun6euro * = pc+sun_vndr/us(type6)+%l%(v) + $sun $sun_custom = pc+sun_vndr/%l%(v) pc98 nec_vndr/jp = nec_vndr/jp(pc98) macintosh_old us = macintosh_vndr/us(oldmac) macintosh_old en_US = macintosh_vndr/us(oldmac) diff --git a/xorg-server/xkeyboard-config/rules/base.mlv_s.part b/xorg-server/xkeyboard-config/rules/base.mlv_s.part index 1eecc55c0..1ae117173 100644 --- a/xorg-server/xkeyboard-config/rules/base.mlv_s.part +++ b/xorg-server/xkeyboard-config/rules/base.mlv_s.part @@ -2,3 +2,4 @@ classmate us alt-intl = pc+us(classmate-alt-intl) classmate us altgr-intl = pc+us(classmate-altgr-intl) nokiarx51 cz qwerty = nokia_vndr/rx-51(cz_qwerty) + * $sun_custom $sun_var = pc+sun_vndr/%l%(v) diff --git a/xorg-server/xkeyboard-config/rules/base.o_s.part b/xorg-server/xkeyboard-config/rules/base.o_s.part index 7d880f438..253effded 100644 --- a/xorg-server/xkeyboard-config/rules/base.o_s.part +++ b/xorg-server/xkeyboard-config/rules/base.o_s.part @@ -134,6 +134,7 @@ shift:both_shiftlock = +shift(both_shiftlock) shift:lshift_both_shiftlock = +shift(lshift_both_shiftlock) shift:rshift_both_shiftlock = +shift(rshift_both_shiftlock) + solaris:sun_compat = +sun_vndr/solaris(sun_compat) lv3:caps_switch = +level3(caps_switch) lv3:bksl_switch = +level3(bksl_switch) lv3:lsgt_switch = +level3(lsgt_switch) diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in index d21891db2..fd9cc274f 100644 --- a/xorg-server/xkeyboard-config/rules/base.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.xml.in @@ -1199,8 +1199,64 @@ </model> <model> <configItem> - <name>sun6</name> - <_description>Sun Type 5/6</_description> + <name>sun_type7_usb</name> + <_description>Sun Type 7 USB</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_euro_usb</name> + <_description>Sun Type 7 USB (European layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_unix_usb</name> + <_description>Sun Type 7 USB (Unix layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type7_jp_usb</name> + <_description>Sun Type 7 USB (Japanese layout) / Japanese 106-key</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_usb</name> + <_description>Sun Type 6/7 USB</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_euro_usb</name> + <_description>Sun Type 6/7 USB (European layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_unix_usb</name> + <_description>Sun Type 6 USB (Unix layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_jp_usb</name> + <_description>Sun Type 6 USB (Japanese layout)</_description> + <vendor>Sun Microsystems</vendor> + </configItem> + </model> + <model> + <configItem> + <name>sun_type6_jp</name> + <_description>Sun Type 6 (Japanese layout)</_description> <vendor>Sun Microsystems</vendor> </configItem> </model> @@ -6598,6 +6654,18 @@ </group> <group allowMultipleSelection="true"> <configItem> + <name>solaris</name> + <_description>Maintain key compatibility with old Solaris keycodes</_description> + </configItem> + <option> + <configItem> + <name>solaris:sun_compat</name> + <_description>Sun Key compatibility</_description> + </configItem> + </option> + </group> + <group allowMultipleSelection="true"> + <configItem> <name>terminate</name> <_description>Key sequence to kill the X server</_description> </configItem> diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part index 64ff0f2f5..9d274dff1 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l1v1_c.part @@ -1 +1,2 @@ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + jp $sun_compat = complete+japan(kana_lock) diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part index fea61be76..b7d6e309a 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l2v2_c.part @@ -1 +1,2 @@ de neo = +caps(caps_lock):2+misc(assign_shift_left_action):2+level5(level5_lock):2 + jp $sun_compat = +complete+japan(kana_lock):2 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part index 5a1fb2f8a..360b4c425 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l3v3_c.part @@ -1 +1,2 @@ de neo = +caps(caps_lock):3+misc(assign_shift_left_action):3+level5(level5_lock):3 + jp $sun_compat = +complete+japan(kana_lock):3 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part index ac8a91102..6633312c2 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.l4v4_c.part @@ -1 +1,2 @@ de neo = +caps(caps_lock):4+misc(assign_shift_left_action):4+level5(level5_lock):4 + jp $sun_compat = +complete+japan(kana_lock):4 diff --git a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part index 64ff0f2f5..927ff06b2 100644 --- a/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part +++ b/xorg-server/xkeyboard-config/rules/compat/base.lv_c.part @@ -1 +1,2 @@ de neo = +caps(caps_lock)+misc(assign_shift_left_action)+level5(level5_lock) + jp $sun_compat = complete+japan(kana_lock) diff --git a/xorg-server/xkeyboard-config/symbols/ara b/xorg-server/xkeyboard-config/symbols/ara index 146e9b325..c0d57ef42 100644 --- a/xorg-server/xkeyboard-config/symbols/ara +++ b/xorg-server/xkeyboard-config/symbols/ara @@ -272,3 +272,10 @@ xkb_symbols "olpc" { include "group(olpc)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ara(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/be b/xorg-server/xkeyboard-config/symbols/be index e39fccf9c..cf8e06871 100644 --- a/xorg-server/xkeyboard-config/symbols/be +++ b/xorg-server/xkeyboard-config/symbols/be @@ -230,3 +230,10 @@ xkb_symbols "wang" { key <TLDE> { [ twosuperior, threesuperior, notsign, asciitilde ] }; key <LSGT> { [ less, greater, backslash, brokenbar ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/be(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/br b/xorg-server/xkeyboard-config/symbols/br index 8ead57c26..dee718860 100644 --- a/xorg-server/xkeyboard-config/symbols/br +++ b/xorg-server/xkeyboard-config/symbols/br @@ -315,3 +315,10 @@ xkb_symbols "nativo-epo" { key <AB06> { [ gcircumflex, Gcircumflex, q, Q ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/br(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca index ab9cef19d..e93995302 100644 --- a/xorg-server/xkeyboard-config/symbols/ca +++ b/xorg-server/xkeyboard-config/symbols/ca @@ -528,3 +528,8 @@ xkb_symbols "shs" { include "compose(rctrl)" }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ca(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ch b/xorg-server/xkeyboard-config/symbols/ch index d890c33a6..989a2df27 100644 --- a/xorg-server/xkeyboard-config/symbols/ch +++ b/xorg-server/xkeyboard-config/symbols/ch @@ -211,3 +211,15 @@ xkb_symbols "fr_mac" { [ agrave, adiaeresis, braceleft ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6_de" { + include "sun_vndr/ch(sun_type6_de)" +}; + +partial alphanumeric_keys + xkb_symbols "sun_type6_fr" { + include "sun_vndr/ch(sun_type6_fr)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz index db3dd4885..336050ceb 100644 --- a/xorg-server/xkeyboard-config/symbols/cz +++ b/xorg-server/xkeyboard-config/symbols/cz @@ -175,3 +175,10 @@ xkb_symbols "dvorak-ucw" { include "level3(ralt_switch)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/cz(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de index 6ac1e6711..6872f46ba 100644 --- a/xorg-server/xkeyboard-config/symbols/de +++ b/xorg-server/xkeyboard-config/symbols/de @@ -650,3 +650,8 @@ xkb_symbols "hu" { }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/de(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk index 1deea28aa..4e656b209 100644 --- a/xorg-server/xkeyboard-config/symbols/dk +++ b/xorg-server/xkeyboard-config/symbols/dk @@ -71,3 +71,10 @@ xkb_symbols "dvorak" { name[Group1]= "Danish (Dvorak)"; key <AD12> { [ asciitilde, asciicircum, dead_diaeresis, dead_tilde ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/dk(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ee b/xorg-server/xkeyboard-config/symbols/ee index e171b78ad..67c484447 100644 --- a/xorg-server/xkeyboard-config/symbols/ee +++ b/xorg-server/xkeyboard-config/symbols/ee @@ -99,3 +99,10 @@ xkb_symbols "us" { include "level3(ralt_switch)" include "eurosign(e)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ee(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es index fec506ab7..cf66f9b35 100644 --- a/xorg-server/xkeyboard-config/symbols/es +++ b/xorg-server/xkeyboard-config/symbols/es @@ -215,3 +215,10 @@ xkb_symbols "olpc2" { include "level3(ralt_switch)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/es(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi index fc5a0a27c..b8b2183b4 100644 --- a/xorg-server/xkeyboard-config/symbols/fi +++ b/xorg-server/xkeyboard-config/symbols/fi @@ -196,3 +196,10 @@ xkb_symbols "mac" { name[Group1]="Finnish (Macintosh)"; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/fi(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr index 45ef6a475..0d1d13de8 100644 --- a/xorg-server/xkeyboard-config/symbols/fr +++ b/xorg-server/xkeyboard-config/symbols/fr @@ -1024,3 +1024,10 @@ xkb_symbols "geo" { key <AB10> { [ 0x010010ed, noSymbol ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/fr(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/gb b/xorg-server/xkeyboard-config/symbols/gb index 58e966fc7..c7de8c33e 100644 --- a/xorg-server/xkeyboard-config/symbols/gb +++ b/xorg-server/xkeyboard-config/symbols/gb @@ -199,3 +199,10 @@ xkb_symbols "mac_intl" { include "level3(ralt_switch)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/gb(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/gr b/xorg-server/xkeyboard-config/symbols/gr index d7d126009..ba04d9f8a 100644 --- a/xorg-server/xkeyboard-config/symbols/gr +++ b/xorg-server/xkeyboard-config/symbols/gr @@ -194,3 +194,10 @@ xkb_symbols "nodeadkeys" { key <AC10> { [ semicolon, colon ] }; // ; : }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/gr(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in index 68f1b8aba..b995fbb98 100644 --- a/xorg-server/xkeyboard-config/symbols/in +++ b/xorg-server/xkeyboard-config/symbols/in @@ -38,7 +38,7 @@ xkb_symbols "deva" { // INSCRIPT in place of the symbols that are here for now. But this // requires XKB to map 1 key into two to three other key presses. key <AE03> { [ U0969, numbersign, 3, numbersign ] }; - key <AE04> { [ U096a, dollar, 4, dollar ] }; + key <AE04> { [ U096a, dollar, 4 ] }; key <AE05> { [ U096b, percent, 5, percent ] }; key <AE06> { [ U096c, asciicircum, 6, asciicircum ] }; key <AE07> { [ U096d, ampersand, 7, ampersand ] }; @@ -89,6 +89,8 @@ xkb_symbols "deva" { // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ): include "nbsp(zwnj3zwj4)" + include "rupeesign(4)" + include "level3(ralt_switch)" }; //Name : Bolnagri (Combined) @@ -110,7 +112,7 @@ xkb_symbols "bolnagri" { key <AE01> { [ 1, exclam, U0967, exclam ] }; key <AE02> { [ 2, at, U0968, at ] }; key <AE03> { [ 3, numbersign, U0969, numbersign ] }; - key <AE04> { [ 4, U20B9, U096A, dollar ] }; // Rupee symbol on $ + key <AE04> { [ 4, dollar, U096A ] }; // Rupee symbol on AltGr+4 key <AE05> { [ 5, percent, U096B, percent ] }; key <AE06> { [ 6, asciicircum, U096C, asciicircum ] }; key <AE07> { [ 7, ampersand, U096D, ampersand ] }; @@ -165,7 +167,9 @@ xkb_symbols "bolnagri" { // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; // modifier_map Mod3 { Mode_switch }; + include "level3(ralt_switch)" + include "rupeesign(4)" }; // based on a keyboard map from an 'xkb/symbols/ben' file @@ -234,6 +238,9 @@ xkb_symbols "ben" { key <AB08> { [ comma, U09B7 ] }; key <AB09> { [ period, U0964 ] }; key <AB10> { [ U09DF, U09AF ] }; + + include "level3(ralt_switch)" + include "rupeesign(4)" }; xkb_symbols "ben_probhat" { @@ -307,6 +314,8 @@ xkb_symbols "ben_probhat" { // modifier_map Lock { Caps_Lock }; // modifier_map Control{ Control_L }; + include "level3(ralt_switch)" + include "rupeesign(4)" }; // Bengali Baishakhi, Bengali Baishakhi Inscript, Bengali Bornona, Uni Gitanjali Layouts are added by Promathesh Mandal <promathesh812004@gmail.com> @@ -670,6 +679,8 @@ xkb_symbols "guj" { key <AB08> { [ comma, U0AB7 ] }; key <AB09> { [ period, U0964 ] }; key <AB10> { [ U0AAF, question ] }; + include "rupeesign(4)" + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -736,7 +747,8 @@ xkb_symbols "kan" { symbols[Group1] = [ Mode_switch, Multi_key ], virtualMods = AltGr }; - + include "rupeesign(4)" + include "level3(ralt_switch)" }; // Description : A keymap for Malayalam @@ -828,6 +840,9 @@ xkb_symbols "mal" { key <AB09> { [ period , U0200d ] }; key <AB10> { [ U0d2f , question ] }; + include "rupeesign(4)" + include "level3(ralt_switch)" + }; //Name : Lalitha @@ -845,7 +860,7 @@ xkb_symbols "mal_lalitha" { key <AE01> { [ 1, exclam, U0D67, exclam ] }; key <AE02> { [ 2, at, U0D68, at ] }; key <AE03> { [ 3, numbersign, U0D69, numbersign ] }; - key <AE04> { [ 4, dollar, U0D6A, dollar ] }; + key <AE04> { [ 4, dollar, U0D6A ] }; key <AE05> { [ 5, percent, U0D6B, percent ] }; key <AE06> { [ 6, asciicircum, U0D6C, asciicircum ] }; key <AE07> { [ 7, ampersand, U0D6D, ampersand ] }; @@ -901,6 +916,7 @@ xkb_symbols "mal_lalitha" { // modifier_map Control{ Control_L }; // modifier_map Mod3 { Mode_switch }; include "level3(ralt_switch)" + include "rupeesign(4)" }; @@ -964,6 +980,8 @@ xkb_symbols "ori" { symbols[Group1] = [ Mode_switch, Multi_key ], virtualMods = AltGr }; + include "rupeesign(4)" + include "level3(ralt_switch)" }; // based on a keyboard map from an 'xkb/symbols/tml' file @@ -1029,6 +1047,9 @@ xkb_symbols "tam" { key <AB08> { [ comma, U0BB7 ] }; key <AB09> { [ period, U0964 ] }; key <AB10> { [ U0BAF, question ] }; + + include "level3(ralt_switch)" + include "rupeesign(4)" }; partial alphanumeric_keys @@ -1340,6 +1361,8 @@ xkb_symbols "tel" { symbols[Group1] = [ Mode_switch, Multi_key ], virtualMods = AltGr }; + include "rupeesign(4)" + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -1425,6 +1448,9 @@ xkb_symbols "guru" { key <AB08> { [ comma, less ] }; key <AB09> { [ period, U0964 ] }; key <AB10> { [ U0A2F, question ] }; + + include "rupeesign(4)" + include "level3(ralt_switch)" }; //Name : Jhelum (Refind Inscript) @@ -1443,7 +1469,7 @@ xkb_symbols "jhelum" { key <AE01> { [ 1,exclam, U0A67, exclam ] }; key <AE02> { [ 2,at, U0A68, at ] }; key <AE03> { [ 3,numbersign, U0A69, numbersign ] }; - key <AE04> { [ 4,dollar, U0A6A, dollar ] }; + key <AE04> { [ 4,dollar, U0A6A ] }; key <AE05> { [ 5,percent,U0A6B, percent ] }; key <AE06> { [ 6,U0A73, U0A6C,asciicircum ] }; key <AE07> { [ 7,U0A72,U0A6D,ampersand ] }; @@ -1458,7 +1484,7 @@ xkb_symbols "jhelum" { key <AD01> { [ U0A4C, U0A14 ] }; // Q: oo, ooh key <AD02> { [ U0A48, U0A10 ] }; // W: ee, ae key <AD03> { [ U0A3E, U0A06 ] }; // E: a, aa - key <AD04> { [ U0A40, U0A08 ] }; // R: ee, ai + key <AD04> { [ U0A40, U0A08, U20B9 ] }; // R: ee, ai, rupeesign key <AD05> { [ U0A42, U0A0A ] }; // T: u, uu key <AD06> { [ U0A30, U0A5C ] }; // Y: ra, raa key <AD07> { [ U0A26, U0A27 ] }; // U: tha, thha @@ -1563,6 +1589,8 @@ xkb_symbols "olpc" { include "nbsp(zwnj3zwj4)" include "group(olpc)" + include "rupeesign(4)" + include "level3(ralt_switch)" }; partial alphanumeric_keys @@ -1628,6 +1656,7 @@ xkb_symbols "hin-wx" { key <AB10> { [ slash, question ] }; include "level3(ralt_switch)" + include "rupeesign(4)" }; partial alphanumeric_keys diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it index d70e49755..f0336e58b 100644 --- a/xorg-server/xkeyboard-config/symbols/it +++ b/xorg-server/xkeyboard-config/symbols/it @@ -298,3 +298,10 @@ xkb_symbols "ibm" { }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/it(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp index 4ef77f817..72985fd3e 100644 --- a/xorg-server/xkeyboard-config/symbols/jp +++ b/xorg-server/xkeyboard-config/symbols/jp @@ -292,3 +292,30 @@ xkb_symbols "dvorak" { key <AB09> { [ v, V ] }; key <AB10> { [ z, Z ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6_suncompat" { + include "sun_vndr/jp(sun_type6_suncompat)" +}; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/jp(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "sun_type7_suncompat" { + include "sun_vndr/jp(sun_type7_suncompat)" +}; + +partial alphanumeric_keys + xkb_symbols "suncompat" { + include "sun_vndr/jp(suncompat)" +}; + +partial alphanumeric_keys + xkb_symbols "sun_type7" { + include "sun_vndr/jp(sun_type7)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/kr b/xorg-server/xkeyboard-config/symbols/kr index 46251880d..ced9a0720 100644 --- a/xorg-server/xkeyboard-config/symbols/kr +++ b/xorg-server/xkeyboard-config/symbols/kr @@ -24,3 +24,10 @@ xkb_symbols "koreankeys_raltctl" { key <RALT> { [ Hangul ] }; key <RCTL> { [ Hangul_Hanja ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/kr(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/lt b/xorg-server/xkeyboard-config/symbols/lt index 5435460ce..206611d9f 100644 --- a/xorg-server/xkeyboard-config/symbols/lt +++ b/xorg-server/xkeyboard-config/symbols/lt @@ -312,3 +312,8 @@ xkb_symbols "us_dvorak" { include "level3(ralt_switch)" }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/lt(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index 567caa658..0eee7deea 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -520,3 +520,8 @@ xkb_symbols "apostrophecolemak" { modifier_map Mod5 { <AC11> }; }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/lv(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl index 4c94a65b2..5e3940b99 100644 --- a/xorg-server/xkeyboard-config/symbols/nl +++ b/xorg-server/xkeyboard-config/symbols/nl @@ -148,3 +148,10 @@ xkb_symbols "mac" { // do just nothing }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/nl(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no index 8012570d5..208d1ecb2 100644 --- a/xorg-server/xkeyboard-config/symbols/no +++ b/xorg-server/xkeyboard-config/symbols/no @@ -251,3 +251,10 @@ xkb_symbols "colemak" { key <AD09> { [ y, Y, leftarrow, yen ] }; key <AD10> { [ oslash, Ooblique, dead_acute, dead_doubleacute ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/no(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/pl b/xorg-server/xkeyboard-config/symbols/pl index 02432acca..4c8ed1d5c 100644 --- a/xorg-server/xkeyboard-config/symbols/pl +++ b/xorg-server/xkeyboard-config/symbols/pl @@ -502,3 +502,8 @@ xkb_symbols "colemak" { include "level3(ralt_switch)" }; +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/pl(sun_type6)" +}; + diff --git a/xorg-server/xkeyboard-config/symbols/pt b/xorg-server/xkeyboard-config/symbols/pt index d55af93b6..ac3635c9b 100644 --- a/xorg-server/xkeyboard-config/symbols/pt +++ b/xorg-server/xkeyboard-config/symbols/pt @@ -218,3 +218,10 @@ xkb_symbols "nativo-epo" { key <AB06> { [ gcircumflex, Gcircumflex, q, Q ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/pt(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro index 58e58c561..eea515995 100644 --- a/xorg-server/xkeyboard-config/symbols/ro +++ b/xorg-server/xkeyboard-config/symbols/ro @@ -233,3 +233,8 @@ xkb_symbols "ergonomic" { key <AC08> { [ icircumflex, Icircumflex, k, K ] }; }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ro(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru index a3dabefdf..0248dc6c0 100644 --- a/xorg-server/xkeyboard-config/symbols/ru +++ b/xorg-server/xkeyboard-config/symbols/ru @@ -651,3 +651,8 @@ xkb_symbols "ruu" { include "level3(ralt_switch)" }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ru(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se index 827b091f8..04ce1d206 100644 --- a/xorg-server/xkeyboard-config/symbols/se +++ b/xorg-server/xkeyboard-config/symbols/se @@ -310,3 +310,10 @@ xkb_symbols "swl" { key <AE09> { [ 0x110c97b, 0x110c90a, 0x110c98b, 0x110c965 ] }; key <AE10> { [ 0x110c974, 0x110c909, 0x110c98c, 0x110c968 ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/se(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sk b/xorg-server/xkeyboard-config/symbols/sk index 3a1b4a49b..e33b74a5e 100644 --- a/xorg-server/xkeyboard-config/symbols/sk +++ b/xorg-server/xkeyboard-config/symbols/sk @@ -101,3 +101,10 @@ xkb_symbols "qwerty_bksl" { key <BKSL> { [ backslash, bar, slash, NoSymbol ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/sk(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am index cc4c5b620..d738a9f82 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am @@ -6,5 +6,5 @@ dist_symbols_DATA = \ fi fr gb gr it \ jp kr lt lv nl \ no pl pt ro ru \ - se sk solaris tr tuv \ + se sk solaris tr \ tw ua us diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara index 70e1b9b90..53ad9177e 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,90 +27,105 @@ // 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 "sun_type6" { + + name[Group1]= "Arabic (Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" -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 <TLDE> { [ Arabic_thal, Arabic_shadda, grave, asciitilde ] }; + key <AE01> { [ 0x1000661, exclam, 1, exclam ] }; + key <AE02> { [ 0x1000662, at, 2, at ] }; + key <AE03> { [ 0x1000663, numbersign, 3, numbersign ] }; + key <AE04> { [ 0x1000664, dollar, 4, dollar ] }; + key <AE05> { [ 0x1000665, percent, 5, percent ] }; + key <AE06> { [ 0x1000666, asciicircum, 6, asciicircum ] }; + key <AE07> { [ 0x1000667, ampersand, 7, ampersand ] }; + key <AE08> { [ 0x1000668, asterisk, 8, asterisk ] }; + key <AE09> { [ 0x1000669, parenright, 9, parenright ] }; + key <AE10> { [ 0x1000660, 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 ] }; + 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)" + include "sun_vndr/ara(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty" { + include "ara(qwerty)" +}; + +partial alphanumeric_keys + xkb_symbols "azerty" { + include "ara(azerty)" +}; + +partial alphanumeric_keys + xkb_symbols "digits" { + include "ara(digits)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty_digits" { + include "ara(qwerty_digits)" +}; + +partial alphanumeric_keys + xkb_symbols "azerty_digits" { + include "ara(azerty_digits)" +}; + +partial alphanumeric_keys + xkb_symbols "buckwalter" { + include "ara(buckwalter)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "ara(olpc)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be index 202e8a4c1..5d66f34b6 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,32 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Belgium"; + name[Group1]="Belgium (Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" key <TLDE> { [twosuperior, threesuperior ] }; key <AE01> { [ ampersand, 1, bar ] }; @@ -91,8 +71,57 @@ xkb_symbols "type6" { }; - partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/be(type6)" + include "sun_vndr/be(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "oss" { + include "be(oss)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_frbe" { + include "be(oss_frbe)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_latin9" { + include "be(oss_latin9)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_Sundeadkeys" { + include "be(oss_Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_sundeadkeys" { + include "be(oss_sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "iso-alternate" { + include "be(iso-alternate)" +}; + +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "be(sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "be(Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "be(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "wang" { + include "be(wang)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br index 7ad2dd1cf..3651f9c81 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Brazil"; + name[Group1]= "Portuguese (Brazil, Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" key <TLDE> { [ apostrophe, quotedbl, notsign ] }; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; @@ -94,8 +75,47 @@ xkb_symbols "type6" { }; - partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/br(type6)" + include "sun_vndr/br(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "abnt2" { + include "br(abnt2)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "br(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "thinkpad" { + include "br(thinkpad)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "br(olpc)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "br(dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "nativo" { + include "br(nativo)" +}; + +partial alphanumeric_keys + xkb_symbols "nativo-us" { + include "br(nativo-us)" +}; + +partial alphanumeric_keys + xkb_symbols "nativo-epo" { + include "br(nativo-epo)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca index 4705123dc..114ef3a7a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,32 +27,12 @@ // 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 alphanumeric_keys +xkb_symbols "sun_type6" { + name[Group1]="Multilingual (Canada, Sun Type 6/7)"; -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Canada Bilingual"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ slash, bar, backslash ]}; key <AE01> { [ 1, exclam, plusminus ]}; @@ -91,7 +71,62 @@ xkb_symbols "type6" { }; -partial alphanumeric_keys +alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/ca(type6)" + include "sun_vndr/ca(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "fr" { + include "ca(fr)" +}; + +partial alphanumeric_keys + xkb_symbols "fr-dvorak" { + include "ca(fr-dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "fr-legacy" { + include "ca(fr-legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "multi" { + include "ca(multi)" +}; + +partial alphanumeric_keys + xkb_symbols "multi-2gr" { + include "ca(multi-2gr)" +}; + +partial alphanumeric_keys + xkb_symbols "ike" { + include "ca(ike)" +}; + +partial alphanumeric_keys + xkb_symbols "multix" { + include "ca(multix)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "ca(olpc)" +}; + +partial alphanumeric_keys + xkb_symbols "eng" { + include "ca(eng)" +}; + +partial alphanumeric_keys + xkb_symbols "kut" { + include "ca(kut)" +}; + +partial alphanumeric_keys + xkb_symbols "shs" { + include "ca(shs)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch index 8a41ea303..213b4f08e 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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 "sun_type6_de" { -partial default alphanumeric_keys -xkb_symbols "de_type6" { + name[Group1]= "German (Switzerland, Sun Type 6/7)"; - name[Group1]= "Switzerland - German"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ section, degree ] }; key <AE01> { [ 1, plus, bar ] }; @@ -86,12 +67,12 @@ xkb_symbols "de_type6" { }; - - partial alphanumeric_keys -xkb_symbols "fr_type6" { +xkb_symbols "sun_type6_fr" { + + name[Group1]= "French (Switzerland, Sun Type 6/7)"; - name[Group1]= "Switzerland - French, Sun type 6"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ section, degree ] }; key <AE01> { [ 1, plus, bar ] }; @@ -126,8 +107,62 @@ xkb_symbols "fr_type6" { }; - partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/ch(de_type6)" + include "sun_vndr/ch(sun_type6_de)" +}; + +partial alphanumeric_keys + xkb_symbols "legacy" { + include "ch(legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "de" { + include "ch(de)" +}; + +partial alphanumeric_keys + xkb_symbols "de_Sundeadkeys" { + include "ch(de_Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "de_sundeadkeys" { + include "ch(de_sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "de_nodeadkeys" { + include "ch(de_nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "fr" { + include "ch(fr)" +}; + +partial alphanumeric_keys + xkb_symbols "fr_Sundeadkeys" { + include "ch(fr_Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "fr_sundeadkeys" { + include "ch(fr_sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "fr_nodeadkeys" { + include "ch(fr_nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "de_mac" { + include "ch(de_mac)" +}; + +partial alphanumeric_keys + xkb_symbols "fr_mac" { + include "ch(fr_mac)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz index b46f01c2b..0818c9ab0 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,32 +27,13 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="Czech (Sun Type 6/7"; - name[Group1]="Czech"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; key <AE01> { [ plus, 1, exclam, asciitilde ] }; @@ -101,5 +82,30 @@ xkb_symbols "type6" { partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/cz(type6)" + include "sun_vndr/cz(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "bksl" { + include "cz(bksl)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty" { + include "cz(qwerty)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty_bksl" { + include "cz(qwerty_bksl)" +}; + +partial alphanumeric_keys + xkb_symbols "ucw" { + include "cz(ucw)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak-ucw" { + include "cz(dvorak-ucw)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de index 5177b989a..7736088bb 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de @@ -1,6 +1,5 @@ // -// -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -28,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Germany"; + name[Group1]="German (Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" key <TLDE> { [ asciicircum, degree ] }; key <AE02> { [ 2, quotedbl, twosuperior ] }; @@ -86,55 +66,106 @@ xkb_symbols "type6" { }; partial alphanumeric_keys -xkb_symbols "type4" { + xkb_symbols "basic" { + include "sun_vndr/de(sun_type6)" +}; - name[Group1]="Germany - Sun type 4"; +partial alphanumeric_keys + xkb_symbols "legacy" { + include "de(legacy)" +}; - key <BKSL> { [ less, braceleft ] }; - key <BRCR> { [ greater, braceright ] }; - key <DELE> { [ Delete ] }; +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "de(nodeadkeys)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "deadgraveacute" { + include "de(deadgraveacute)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "deadacute" { + include "de(deadacute)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "ro" { + include "de(ro)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "ro_nodeadkeys" { + include "de(ro_nodeadkeys)" +}; - include "level3(ralt_switch)" - include "kpdl(comma)" +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "de(dvorak)" +}; +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "de(Sundeadkeys)" }; +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "de(sundeadkeys)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/de(type6)" + xkb_symbols "neo_base" { + include "de(neo_base)" +}; + +partial alphanumeric_keys + xkb_symbols "neo" { + include "de(neo)" +}; + +partial alphanumeric_keys + xkb_symbols "mac" { + include "de(mac)" +}; + +partial alphanumeric_keys + xkb_symbols "mac_nodeadkeys" { + include "de(mac_nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "dsb" { + include "de(dsb)" +}; + +partial alphanumeric_keys + xkb_symbols "dsb_qwertz" { + include "de(dsb_qwertz)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty" { + include "de(qwerty)" +}; + +partial alphanumeric_keys + xkb_symbols "ru" { + include "de(ru)" +}; + +partial alphanumeric_keys + xkb_symbols "htcdream" { + include "de(htcdream)" +}; + +partial alphanumeric_keys + xkb_symbols "us" { + include "de(us)" +}; + +partial alphanumeric_keys + xkb_symbols "hu" { + include "de(hu)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk index e5db30e7f..9975486b8 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="Danish (Sun Type 6/7)"; - name[Group1]="Denmark"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ onehalf, section ] }; key <AE02> { [ 2, quotedbl, at ] }; @@ -81,67 +62,27 @@ xkb_symbols "type6" { }; - 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)" - + xkb_symbols "basic" { + include "sun_vndr/dk(sun_type6)" }; - 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)" + xkb_symbols "nodeadkeys" { + include "dk(nodeadkeys)" +}; +partial alphanumeric_keys + xkb_symbols "mac" { + include "dk(mac)" }; +partial alphanumeric_keys + xkb_symbols "mac_nodeadkeys" { + include "dk(mac_nodeadkeys)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/dk(type6)" + xkb_symbols "dvorak" { + include "dk(dvorak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee index 0530f9e2f..6f8113317 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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 alphanumeric_keys +xkb_symbols "sun_type6" { -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Estonia"; + name[Group1]="Estonian (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ dead_caron, dead_tilde, notsign, notsign ] }; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; @@ -113,5 +92,20 @@ xkb_symbols "type6" { partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/ee(type6)" + include "sun_vndr/ee(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "ee(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "ee(dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "us" { + include "ee(us)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es index 6d28bc541..60557f579 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -26,32 +26,13 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="Spanish (Sun Type 6/7)"; - name[Group1]="Spain"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ masculine, ordfeminine, backslash ] }; key <LSGT> { [ less, greater ] }; @@ -78,68 +59,59 @@ xkb_symbols "type6" { key <AB10> { [ minus, underscore ] }; include "level3(ralt_switch)" +}; + +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/es(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "es(Sundeadkeys)" +}; +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "es(sundeadkeys)" }; +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "es(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "es(dvorak)" +}; partial alphanumeric_keys -xkb_symbols "type4" { - - name[Group1]="Spain - Sun type 4"; + xkb_symbols "cat" { + include "es(cat)" +}; - 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 "ast" { + include "es(ast)" }; - partial alphanumeric_keys -xkb_symbols "type5" { - include "sun_vndr/es(type4)" + xkb_symbols "mac" { + include "es(mac)" +}; - 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 "olpc" { + include "es(olpc)" }; +partial alphanumeric_keys + xkb_symbols "deadtilde" { + include "es(deadtilde)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/es(type6)" + xkb_symbols "olpc2" { + include "es(olpc2)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi index eaa19e848..13e822c8f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -26,32 +26,13 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="Finnish (Sun Type 6/7)"; - name[Group1]="Finland"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ section, onehalf ] }; key <AE01> { [ 1, exclam ] }; @@ -79,11 +60,39 @@ xkb_symbols "type6" { include "level3(ralt_switch)" include "kpdl(comma)" +}; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fi(sun_type6)" }; +partial alphanumeric_keys + xkb_symbols "kotoistus" { + include "fi(kotoistus)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/fi(type6)" + xkb_symbols "classic" { + include "fi(classic)" +}; + +partial alphanumeric_keys + xkb_symbols "fi" { + include "fi(fi)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "fi(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "smi" { + include "fi(smi)" +}; + +partial alphanumeric_keys + xkb_symbols "mac" { + include "fi(mac)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr index a3850ba5f..f046c3f85 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="France"; + name[Group1]="French (Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" key <TLDE> { [ twosuperior ] }; key <AE01> { [ ampersand, 1 ] }; @@ -86,11 +67,109 @@ xkb_symbols "type6" { key <AB10> { [ exclam, section ] }; include "level3(ralt_switch)" +}; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/fr(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "fr(olpc)" }; +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "fr(Sundeadkeys)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/fr(type6)" + xkb_symbols "sundeadkeys" { + include "fr(sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "fr(nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "oss" { + include "fr(oss)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_latin9" { + include "fr(oss_latin9)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_Sundeadkeys" { + include "fr(oss_Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_sundeadkeys" { + include "fr(oss_sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "oss_nodeadkeys" { + include "fr(oss_nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "latin9" { + include "fr(latin9)" +}; + +partial alphanumeric_keys + xkb_symbols "latin9_Sundeadkeys" { + include "fr(latin9_Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "latin9_sundeadkeys" { + include "fr(latin9_sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "latin9_nodeadkeys" { + include "fr(latin9_nodeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "bepo" { + include "fr(bepo)" +}; + +partial alphanumeric_keys + xkb_symbols "bepo_latin9" { + include "fr(bepo_latin9)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "fr(dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "bre" { + include "fr(bre)" +}; + +partial alphanumeric_keys + xkb_symbols "oci" { + include "fr(oci)" +}; + +partial alphanumeric_keys + xkb_symbols "mac" { + include "fr(mac)" +}; + +partial alphanumeric_keys + xkb_symbols "geo" { + include "fr(geo)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb index 78287ec06..f329c5fd5 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="English (UK, Sun Type 6/7)"; - name[Group1]="United Kingdom"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ quoteleft, notsign, brokenbar ] }; @@ -63,40 +44,44 @@ xkb_symbols "type6" { 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)" - + xkb_symbols "basic" { + include "sun_vndr/gb(sun_type6)" }; - partial alphanumeric_keys -xkb_symbols "type4" { + xkb_symbols "intl" { + include "gb(intl)" +}; - name[Group1]="United Kingdom - Sun type 4"; +partial alphanumeric_keys + xkb_symbols "extd" { + include "gb(extd)" +}; - 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 alphanumeric_keys + xkb_symbols "colemak" { + include "gb(colemak)" +}; - include "level3(ralt_switch)" +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "gb(dvorak)" +}; +partial alphanumeric_keys + xkb_symbols "dvorakukp" { + include "gb(dvorakukp)" }; +partial alphanumeric_keys + xkb_symbols "mac" { + include "gb(mac)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/gb(type6)" + xkb_symbols "mac_intl" { + include "gb(mac_intl)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr index 1f3fac799..218e95051 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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 alphanumeric_keys +xkb_symbols "sun_type6" { + name[Group1]="Greek (Sun Type 6/7)"; -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Greece"; - + include "sun_vndr/us(sun_type6)" key <TLDE> { [ grave, asciitilde, onehalf ] }; key <AE01> { [ 1, exclam ] }; @@ -96,22 +75,46 @@ xkb_symbols "type6" { 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 <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)" +}; +alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/gr(sun_type6)" }; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/gr(type6)" + xkb_symbols "simple" { + include "gr(simple)" +}; + +partial alphanumeric_keys + xkb_symbols "bare" { + include "gr(bare)" +}; + +partial alphanumeric_keys + xkb_symbols "extended" { + include "gr(extended)" +}; + +partial alphanumeric_keys + xkb_symbols "polytonic" { + include "gr(polytonic)" +}; + +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "gr(nodeadkeys)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it index acd94a2fb..d73ef6e64 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]= "Italian (Sun Type 6/7)"; - name[Group1]="Italy"; + include "sun_vndr/us(sun_type6)" key <LSGT> { [ less, greater ] }; key <TLDE> { [ backslash, bar ] }; @@ -75,66 +56,44 @@ xkb_symbols "type6" { 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)" + xkb_symbols "basic" { + include "sun_vndr/it(sun_type6)" +}; +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "it(nodeadkeys)" }; - partial alphanumeric_keys -xkb_symbols "type5" { + xkb_symbols "mac" { + include "it(mac)" +}; - name[Group1]="Italy - Sun type 5"; +partial alphanumeric_keys + xkb_symbols "geo" { + include "it(geo)" +}; - key <AE08> { [ 8, parenleft, braceleft ] }; - key <AE09> { [ 9, parenright, braceright ] }; - key <BKSL> { [ ugrave, section, asciitilde ] }; +partial alphanumeric_keys + xkb_symbols "olpc" { + include "it(olpc)" +}; - include "level3(ralt_switch)" +partial alphanumeric_keys + xkb_symbols "us" { + include "it(us)" +}; +partial alphanumeric_keys + xkb_symbols "htcdream" { + include "it(htcdream)" }; - partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/it(type6)" + xkb_symbols "ibm" { + include "it(ibm)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp index 26911494a..c30d31e38 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -26,791 +26,154 @@ // 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. -// -// 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 -// +partial default alphanumeric_keys modifier_keys +xkb_symbols "sun_type6_suncompat" { -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 }; -}; + include "inet(evdev)" + include "sun_vndr/us(sunbasic)" -// 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 <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 <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 }; + 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 ] }; + + key <COMP> { [ Multi_key ] }; + key <SYRQ> { [ SunSys_Req ] }; + + modifier_map Mod3 { Kana_Lock }; + }; -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 ] }; +partial alphanumeric_keys +xkb_symbols "sun_type6" { + + // include "jp" + // type6 based on "jp" should be provided later + + include "sun_vndr/jp(sun_type6_suncompat)" - 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" { +partial alphanumeric_keys +xkb_symbols "sun_type7_suncompat" { - // 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 ] }; + include "sun_vndr/jp(sun_type6_suncompat)" + + key <AE10> { [ 0, asciitilde, kana_WA, kana_WO ] }; + key <TLDE> { [ Henkan_Mode ] }; + key <HENK> { [ Kana_Lock, Mode_switch ] }; + key <ALGR> { [ Alt_R, Alt_R ] }; - 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 ] }; +partial alphanumeric_keys +xkb_symbols "suncompat" { - key <AE10> { [ 0, asciitilde ], [ kana_WA, kana_WO ]}; - key <AE13> { [ backslash, bar ], [ prolongedsound ]}; + include "sun_vndr/jp(sun_type7_suncompat)" +}; - - key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ]}; +partial alphanumeric_keys +xkb_symbols "sun_type7" { - key <ALGR> { [ Mode_switch ] }; - key <RALT> { [ Alt_R ] }; + include "jp" }; -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 ] }; +partial alphanumeric_keys + xkb_symbols "106" { + include "jp(106)" +}; +partial alphanumeric_keys + xkb_symbols "common" { + include "jp(common)" }; -xkb_symbols "Muhenkan_x86" { - include "sun_vndr/jp(x86)" +partial alphanumeric_keys + xkb_symbols "OADG109A" { + include "jp(OADG109A)" +}; + +partial alphanumeric_keys + xkb_symbols "kana86" { + include "jp(kana86)" +}; - key <EXEC> { [ Muhenkan ] }; +partial alphanumeric_keys + xkb_symbols "kana" { + include "jp(kana)" }; +partial alphanumeric_keys + xkb_symbols "nicola_f_bs" { + include "jp(nicola_f_bs)" +}; +partial alphanumeric_keys + xkb_symbols "mac" { + include "jp(mac)" +}; + +partial alphanumeric_keys + xkb_symbols "hztg_escape" { + include "jp(hztg_escape)" +}; -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 ] }; +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "jp(dvorak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr index 62cf63d71..cc6d29e9a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -26,72 +26,44 @@ // or other dealings in this Software without prior written authorization // of the copyright holder. // -// -// -// CDDL HEADER START -// -// The contents of this file are subject to the terms of the -// Common Development and Distribution License (the "License"). -// You may not use this file except in compliance with the License. -// -// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE -// or http://www.opensolaris.org/os/licensing. -// See the License for the specific language governing permissions -// and limitations under the License. -// -// When distributing Covered Code, include this CDDL HEADER in each -// file and include the License file at src/OPENSOLARIS.LICENSE. -// If applicable, add the following below this CDDL HEADER, with the -// fields enclosed by brackets "[]" replaced with your own identifying -// information: Portions Copyright [yyyy] [name of copyright owner] -// -// CDDL HEADER END -// +partial default alphanumeric_keys +xkb_symbols "sun_type6" { -// Korean layout for a Type 6 Sun keyboard -partial -xkb_symbols "type6" { + name[Group1]= "Korean (Sun Type 6/7)"; - // 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 "sun_vndr/us(sunbasic)" - include "level3(ralt_switch)" + // A few keys are different + key <ALGR> { [ Hangul ] }; + key <COMP> { [ Hangul_Hanja ] }; + key <KANA> { [ Hangul ] }; + key <EISU> { [ Hangul_Hanja ] }; + key <BKSL> { [ backslash, bar, brokenbar ] }; }; - -// 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)" - +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/kr(sun_type6)" }; -// 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 alphanumeric_keys + xkb_symbols "kr106" { + include "kr(kr106)" +}; +partial alphanumeric_keys + xkb_symbols "kr104" { + include "kr(kr104)" }; +partial alphanumeric_keys + xkb_symbols "koreankeys" { + include "kr(koreankeys)" +}; -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/kr(type6)" +partial alphanumeric_keys + xkb_symbols "koreankeys_raltctl" { + include "kr(koreankeys_raltctl)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt index 8e8bee0f8..b333622d9 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,34 +27,12 @@ // 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"; +xkb_symbols "sun_type6" { + name[Group1]="Lithuanian (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ quoteleft, asciitilde, notsign, brokenbar ] }; key <AE01> { [ aogonek, Aogonek, 1, exclam ] }; @@ -109,10 +87,39 @@ xkb_symbols "type6" { key <AB10> { [ slash, question, dead_belowdot, dead_abovedot ] }; include "level3(ralt_switch)" - }; partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/lt(type6)" + include "sun_vndr/lt(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "us" { + include "lt(us)" +}; + +partial alphanumeric_keys + xkb_symbols "std" { + include "lt(std)" +}; + +partial alphanumeric_keys + xkb_symbols "ibm" { + include "lt(ibm)" +}; + +partial alphanumeric_keys + xkb_symbols "lekp" { + include "lt(lekp)" +}; + +partial alphanumeric_keys + xkb_symbols "lekpa" { + include "lt(lekpa)" +}; + +partial alphanumeric_keys + xkb_symbols "us_dvorak" { + include "lt(us_dvorak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv index befcfc679..998145e65 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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 alphanumeric_keys +xkb_symbols "sun_type6" { -partial default alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Latvia"; + name[Group1]="Latvian (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ grave, asciitilde, acute, asciitilde ] }; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; @@ -108,10 +87,79 @@ xkb_symbols "type6" { key <AB10> { [ slash, question, slash, abovedot ] }; include "level3(ralt_switch)" +}; +alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/lv(sun_type6)" }; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/lv(type6)" + xkb_symbols "apostrophe" { + include "lv(apostrophe)" +}; + +partial alphanumeric_keys + xkb_symbols "tilde" { + include "lv(tilde)" +}; + +partial alphanumeric_keys + xkb_symbols "fkey" { + include "lv(fkey)" +}; + +partial alphanumeric_keys + xkb_symbols "adapted" { + include "lv(adapted)" +}; + +partial alphanumeric_keys + xkb_symbols "ergonomic" { + include "lv(ergonomic)" +}; + +partial alphanumeric_keys + xkb_symbols "modern" { + include "lv(modern)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "lv(dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "ykeydvorak" { + include "lv(ykeydvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "minuskeydvorak" { + include "lv(minuskeydvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorakprogr" { + include "lv(dvorakprogr)" +}; + +partial alphanumeric_keys + xkb_symbols "ykeydvorakprogr" { + include "lv(ykeydvorakprogr)" +}; + +partial alphanumeric_keys + xkb_symbols "minuskeydvorakprogr" { + include "lv(minuskeydvorakprogr)" +}; + +partial alphanumeric_keys + xkb_symbols "colemak" { + include "lv(colemak)" +}; + +partial alphanumeric_keys + xkb_symbols "apostrophecolemak" { + include "lv(apostrophecolemak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl index 3e0ba2011..8f7a69de0 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { + + name[Group1]="Dutch (Sun Type 6/7)"; - name[Group1]="Netherlands"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ at, section, notsign ] }; key <AE01> { [ 1, exclam, onesuperior ] }; @@ -95,54 +76,29 @@ xkb_symbols "type6" { 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 ] }; + xkb_symbols "basic" { + include "sun_vndr/nl(sun_type6)" +}; - include "level3(ralt_switch)" +partial alphanumeric_keys + xkb_symbols "std" { + include "nl(std)" +}; +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "nl(Sundeadkeys)" }; +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "nl(sundeadkeys)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/nl(type6)" + xkb_symbols "mac" { + include "nl(mac)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no index bcc8c30cc..1dde45f6f 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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 "sun_type6" { -partial alphanumeric_keys -xkb_symbols "type6" { + name[Group1]="Norwegian (Sun Type 6/7)"; - name[Group1]="Norway"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ bar, section ] }; key <LSGT> { [ less, greater ] }; @@ -78,67 +59,44 @@ xkb_symbols "type6" { 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)" - + xkb_symbols "basic" { + include "sun_vndr/no(sun_type6)" }; - partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="Norway - Sun type 5"; + xkb_symbols "nodeadkeys" { + include "no(nodeadkeys)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "no(dvorak)" +}; - key <BKSL> { [ quoteright, asterisk, quoteleft ] }; - key <LSGT> { [ less, greater ] }; +partial alphanumeric_keys + xkb_symbols "smi" { + include "no(smi)" +}; - include "level3(ralt_switch)" - include "kpdl(comma)" +partial alphanumeric_keys + xkb_symbols "smi_nodeadkeys" { + include "no(smi_nodeadkeys)" +}; +partial alphanumeric_keys + xkb_symbols "mac" { + include "no(mac)" }; +partial alphanumeric_keys + xkb_symbols "mac_nodeadkeys" { + include "no(mac_nodeadkeys)" +}; -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/no(type6)" +partial alphanumeric_keys + xkb_symbols "colemak" { + include "no(colemak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl index 2fdf1fe06..d5a7f5b04 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,32 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Polish Developers"; + name[Group1]="Polish (Sun Type 6/7)"; + + include "sun_vndr/us(sun_type6)" key <TLDE> { [ grave, asciitilde ] }; key <AE01> { [ 1, exclam ] }; @@ -91,11 +71,59 @@ xkb_symbols "type6" { key <AB10> { [ slash, question ] }; include "level3(ralt_switch)" +}; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/pl(sun_type6)" }; +partial alphanumeric_keys + xkb_symbols "legacy" { + include "pl(legacy)" +}; partial alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/pl(type6)" + xkb_symbols "qwertz" { + include "pl(qwertz)" +}; + +partial alphanumeric_keys + xkb_symbols "intl" { + include "pl(intl)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "pl(dvorak)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak_quotes" { + include "pl(dvorak_quotes)" +}; + +partial alphanumeric_keys + xkb_symbols "dvorak_altquotes" { + include "pl(dvorak_altquotes)" +}; + +partial alphanumeric_keys + xkb_symbols "dvp" { + include "pl(dvp)" +}; + +partial alphanumeric_keys + xkb_symbols "szl" { + include "pl(szl)" +}; + +partial alphanumeric_keys + xkb_symbols "csb" { + include "pl(csb)" +}; + +partial alphanumeric_keys + xkb_symbols "ru_phonetic_dvorak" { + include "pl(ru_phonetic_dvorak)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt index 9e0ec9502..b6797bb94 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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 "sun_type6" { -partial alphanumeric_keys -xkb_symbols "type6" { + name[Group1]= "Portuguese (Sun Type 6/7)"; - name[Group1]="Portugal"; + include "sun_vndr/us(sun_type6)" key <LSGT> { [ less, greater ] }; key <TLDE> { [ backslash, bar ] }; @@ -77,66 +58,54 @@ xkb_symbols "type6" { 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)" + xkb_symbols "basic" { + include "sun_vndr/pt(sun_type6)" +}; +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "pt(Sundeadkeys)" }; +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "pt(sundeadkeys)" +}; partial alphanumeric_keys -xkb_symbols "type5" { - - name[Group1]="Portugal - Sun type 5"; + xkb_symbols "nodeadkeys" { + include "pt(nodeadkeys)" +}; - 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 ]}; +partial alphanumeric_keys + xkb_symbols "mac" { + include "pt(mac)" +}; - key <AD11> { [ plus, asterisk, dead_diaeresis ]}; +partial alphanumeric_keys + xkb_symbols "mac_sundeadkeys" { + include "pt(mac_sundeadkeys)" +}; - include "level3(ralt_switch)" +partial alphanumeric_keys + xkb_symbols "mac_nodeadkeys" { + include "pt(mac_nodeadkeys)" +}; +partial alphanumeric_keys + xkb_symbols "nativo" { + include "pt(nativo)" }; +partial alphanumeric_keys + xkb_symbols "nativo-us" { + include "pt(nativo-us)" +}; -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/pt(type6)" +partial alphanumeric_keys + xkb_symbols "nativo-epo" { + include "pt(nativo-epo)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro index 07241a3ee..1783db4bf 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Romania"; + name[Group1]="Romanian (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ grave, asciitilde, grave, asciitilde ] }; key <AE01> { [ 1, exclam, dead_tilde ] }; @@ -108,10 +87,39 @@ xkb_symbols "type6" { key <AB10> { [ slash, question, slash, question ] }; include "level3(ralt_switch)" - }; partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/ro(type6)" + include "sun_vndr/ro(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "cedilla" { + include "ro(cedilla)" +}; + +partial alphanumeric_keys + xkb_symbols "std" { + include "ro(std)" +}; + +partial alphanumeric_keys + xkb_symbols "std_cedilla" { + include "ro(std_cedilla)" +}; + +partial alphanumeric_keys + xkb_symbols "winkeys" { + include "ro(winkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "crh_dobruja" { + include "ro(crh_dobruja)" +}; + +partial alphanumeric_keys + xkb_symbols "ergonomic" { + include "ro(ergonomic)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru index cfa27d08a..1ea594754 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,36 +27,16 @@ // 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" { +partial default alphanumeric_keys +xkb_symbols "sun_type6" { - name[Group1]= "Russia"; + name[Group1]= "Russian (Sun Type 6/7)"; - key.type[group1]="FOUR_LEVEL"; + include "sun_vndr/us(sun_type6)" + key.type[group1]="FOUR_LEVEL"; - key <AE01> { [ 1, exclam ] }; + key <AE01> { [ 1, exclam, 1, exclam ] }; key <AE02> { [ 2, quotedbl, 2, at ] }; key <AE03> { [ 3, numerosign, 3, numbersign ] }; key <AE04> { [ 4, percent, 4, dollar ] }; @@ -65,7 +45,7 @@ xkb_symbols "type6" { key <AE08> { [ 8, semicolon, 8, asterisk ] }; key <BKSL> { [ slash, question, backslash, bar ] }; key <AB10> { [ ediaeresis, Ediaeresis, slash, question ] }; - key <LSGT> { [ backslash, bar ] }; + key <LSGT> { [ backslash, bar, backslash, bar ] }; key <AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; key <AD02> { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; @@ -101,11 +81,124 @@ xkb_symbols "type6" { key <AB09> { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; include "level3(ralt_switch)" +}; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/ru(sun_type6)" }; +partial alphanumeric_keys + xkb_symbols "winkeys" { + include "ru(winkeys)" +}; -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/ru(type6)" +partial alphanumeric_keys + xkb_symbols "common" { + include "ru(common)" +}; + +partial alphanumeric_keys + xkb_symbols "legacy" { + include "ru(legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "ru(olpc)" +}; + +partial alphanumeric_keys + xkb_symbols "typewriter" { + include "ru(typewriter)" +}; + +partial alphanumeric_keys + xkb_symbols "typewriter-legacy" { + include "ru(typewriter-legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "phonetic" { + include "ru(phonetic)" +}; + +partial alphanumeric_keys + xkb_symbols "phonetic_winkeys" { + include "ru(phonetic_winkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "tt" { + include "ru(tt)" +}; + +partial alphanumeric_keys + xkb_symbols "os_legacy" { + include "ru(os_legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "os_winkeys" { + include "ru(os_winkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "cv" { + include "ru(cv)" +}; + +partial alphanumeric_keys + xkb_symbols "udm" { + include "ru(udm)" +}; + +partial alphanumeric_keys + xkb_symbols "cv_latin" { + include "ru(cv_latin)" +}; + +partial alphanumeric_keys + xkb_symbols "kom" { + include "ru(kom)" +}; + +partial alphanumeric_keys + xkb_symbols "sah" { + include "ru(sah)" +}; + +partial alphanumeric_keys + xkb_symbols "xal" { + include "ru(xal)" +}; + +partial alphanumeric_keys + xkb_symbols "dos" { + include "ru(dos)" +}; + +partial alphanumeric_keys + xkb_symbols "bak" { + include "ru(bak)" +}; + +partial alphanumeric_keys + xkb_symbols "srp" { + include "ru(srp)" +}; + +partial alphanumeric_keys + xkb_symbols "chm" { + include "ru(chm)" +}; + +partial alphanumeric_keys + xkb_symbols "chu" { + include "ru(chu)" +}; + +partial alphanumeric_keys + xkb_symbols "ruu" { + include "ru(ruu)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se index d27001466..506d9c377 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,31 +27,12 @@ // 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 "sun_type6" { -partial alphanumeric_keys -xkb_symbols "type6" { + name[Group1]="Swedish (Sun Type 6/7)"; - name[Group1]="Sweden"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ section, onehalf ] }; key <LSGT> { [ less, greater, bar ] }; @@ -77,203 +58,54 @@ xkb_symbols "type6" { 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 +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/se(sun_type6)" }; -// 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 +partial alphanumeric_keys + xkb_symbols "se" { + include "se(se)" +}; - // 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 ] }; +partial alphanumeric_keys + xkb_symbols "nodeadkeys" { + include "se(nodeadkeys)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "se(dvorak)" +}; - key <KP4> { [ KP_Left, KP_4 ], [ F30 ] }; - key <KP5> { [ KP_Begin, KP_5 ], [ F31 ] }; - key <KP6> { [ KP_Right, KP_6 ], [ F32 ] }; +partial alphanumeric_keys + xkb_symbols "rus" { + include "se(rus)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "rus_nodeadkeys" { + include "se(rus_nodeadkeys)" +}; - key <KP0> { [ KP_Insert, KP_0 ] }; - key <KPDL> { [ KP_Delete, KP_Decimal ] }; - // End "Keypad" section, +partial alphanumeric_keys + xkb_symbols "smi" { + include "se(smi)" +}; - // 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 alphanumeric_keys + xkb_symbols "mac" { + include "se(mac)" }; +partial alphanumeric_keys + xkb_symbols "svdvorak" { + include "se(svdvorak)" +}; -partial default alphanumeric_keys - xkb_symbols "basic" { - include "sun_vndr/se(type6)" +partial alphanumeric_keys + xkb_symbols "swl" { + include "se(swl)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk index 9c909763f..e3507f0c4 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Slovakia"; + name[Group1]="Slovak (Sun Type 6/7)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ semicolon, dead_abovering, quoteleft, asciitilde ] }; key <AE01> { [ plus, 1, exclam, asciitilde ] }; @@ -105,5 +84,20 @@ xkb_symbols "type6" { partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/sk(type6)" + include "sun_vndr/sk(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "bksl" { + include "sk(bksl)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty" { + include "sk(qwerty)" +}; + +partial alphanumeric_keys + xkb_symbols "qwerty_bksl" { + include "sk(qwerty_bksl)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris index c435744ee..d8289506e 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris @@ -1,6 +1,5 @@ -//------------------------------------------------------------------------- // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,187 +26,87 @@ // 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 +partial 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 ] }; + key <MUTE> { [ XF86AudioMute ] }; + key <VOL-> { [ XF86AudioLowerVolume ] }; + key <VOL+> { [ XF86AudioRaiseVolume ] }; + key <POWR> { [ XF86PowerOff ] }; + key <STOP> { [ Cancel ] }; + key <AGAI> { [ Redo ] }; + key <PROP> { [ SunProps ] }; + key <UNDO> { [ Undo ] }; + key <FRNT> { [ SunFront ] }; + key <COPY> { [ XF86Copy ] }; + key <OPEN> { [ SunOpen ] }; + key <PAST> { [ XF86Paste ] }; + key <FIND> { [ Find ] }; + key <CUT> { [ XF86Cut ] }; + key <HELP> { [ Help ] }; + key <LNFD> { [ Linefeed ] }; + + key <LALT> { [ Alt_L, Alt_L ] }; + key <LWIN> { [ Meta_L ] }; + key <RWIN> { [ Meta_R ] }; + +// The following is needed for virtual hotkeys + + key <I150> { [ XF86Sleep ] }; + key <I160> { [ XF86ScreenSaver ] }; + key <I235> { [ XF86Display ] }; + +// Common Sun Modifiers + + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod2 { Num_Lock }; + modifier_map Mod4 { Meta_L, Meta_R }; + }; 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 }; + + modifier_map Mod1 { Alt_L }; + }; -partial default +partial 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 ] }; + modifier_map Mod1 { Alt_L, Alt_R }; }; -// 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 ] }; +xkb_symbols "sun_compat" { + + 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 ] }; + +// 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 ] }; }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr index 18ff4f0b1..b926349ab 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,32 +27,12 @@ // 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 "sun_type6" { + name[Group1]="Turkish (Sun Type 6)"; -partial alphanumeric_keys -xkb_symbols "type6" { - - name[Group1]="Turkey - (Q)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ quotedbl, eacute ] }; key <AE01> { [ 1, exclam ] }; @@ -83,10 +63,69 @@ xkb_symbols "type6" { key <AB10> { [ period, colon ] }; include "level3(ralt_switch)" - }; -partial default alphanumeric_keys +partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/tr(type6)" + include "sun_vndr/tr(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "f" { + include "tr(f)" +}; + +partial alphanumeric_keys + xkb_symbols "alt" { + include "tr(alt)" +}; + +partial alphanumeric_keys + xkb_symbols "Sundeadkeys" { + include "tr(Sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "sundeadkeys" { + include "tr(sundeadkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "ku" { + include "tr(ku)" +}; + +partial alphanumeric_keys + xkb_symbols "ku_f" { + include "tr(ku_f)" +}; + +partial alphanumeric_keys + xkb_symbols "ku_alt" { + include "tr(ku_alt)" +}; + +partial alphanumeric_keys + xkb_symbols "intl" { + include "tr(intl)" +}; + +partial alphanumeric_keys + xkb_symbols "olpc" { + include "tr(olpc)" +}; + +partial alphanumeric_keys + xkb_symbols "crh" { + include "tr(crh)" +}; + +partial alphanumeric_keys + xkb_symbols "crh_f" { + include "tr(crh_f)" +}; + +partial alphanumeric_keys + xkb_symbols "crh_alt" { + include "tr(crh_alt)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv deleted file mode 100644 index f098f9f27..000000000 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv +++ /dev/null @@ -1,261 +0,0 @@ -// -// 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. -// -// 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/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw index d2d3952e4..2296ad16a 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,52 +27,34 @@ // 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 "sun_type6" { + + name[Group1]= "Taiwanese (Sun Type 6/7)"; + + include "sun_vndr/us(sunbasic)" -// 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 ] }; - +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/tw(sun_type6)" }; -// Taiwanese layout for a Type 5 Sun keyboard -xkb_symbols "type5" { +partial alphanumeric_keys + xkb_symbols "tw" { + include "tw(tw)" +}; - // A few keys are different - key <ALGR> { [ Henkan_Mode ] }; - key <BKSL> { [ backslash, bar, brokenbar ] }; +partial alphanumeric_keys + xkb_symbols "indigenous" { + include "tw(indigenous)" +}; +partial alphanumeric_keys + xkb_symbols "saisiyat" { + include "tw(saisiyat)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua index 98d39ecde..b53b0d874 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -27,33 +27,12 @@ // 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" { +xkb_symbols "sun_type6" { - name[Group1]="Ukraine"; + name[Group1]="Ukrainian (Sun Type 6)"; + include "sun_vndr/us(sun_type6)" key <TLDE> { [ grave, asciitilde, apostrophe, asciitilde ] }; key <AE01> { [ 1, exclam, 1, exclam ] }; @@ -108,10 +87,49 @@ xkb_symbols "type6" { key <AB10> { [ slash, question, slash, question ] }; include "level3(ralt_switch)" - }; partial alphanumeric_keys xkb_symbols "basic" { - include "sun_vndr/ua(type6)" + include "sun_vndr/ua(sun_type6)" +}; + +partial alphanumeric_keys + xkb_symbols "unicode" { + include "ua(unicode)" +}; + +partial alphanumeric_keys + xkb_symbols "legacy" { + include "ua(legacy)" +}; + +partial alphanumeric_keys + xkb_symbols "winkeys" { + include "ua(winkeys)" +}; + +partial alphanumeric_keys + xkb_symbols "typewriter" { + include "ua(typewriter)" +}; + +partial alphanumeric_keys + xkb_symbols "phonetic" { + include "ua(phonetic)" +}; + +partial alphanumeric_keys + xkb_symbols "rstu" { + include "ua(rstu)" +}; + +partial alphanumeric_keys + xkb_symbols "rstu_ru" { + include "ua(rstu_ru)" +}; + +partial alphanumeric_keys + xkb_symbols "homophonic" { + include "ua(homophonic)" }; diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us index 6bc09a2cd..056936a01 100644 --- a/xorg-server/xkeyboard-config/symbols/sun_vndr/us +++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us @@ -1,5 +1,5 @@ // -// Copyright 2010 Sun Microsystems, Inc. All rights reserved. +// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. // // Permission is hereby granted, free of charge, to any person obtaining a // copy of this software and associated documentation files (the @@ -26,375 +26,180 @@ // 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 +partial default alphanumeric_keys 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 "srvr_ctrl(fkey2vt)" - 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 }; - 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 ] }; + include "srvr_ctrl(xfree86)" }; -xkb_symbols "type4" { - include "sun_vndr/us(type4basic)" +partial alphanumeric_keys +xkb_symbols "sun_type6" { - key <BKSL> { [ backslash, bar, brokenbar ] }; -}; + name[Group1]= "English (US, Sun Type 6/7)"; -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5basic" { include "sun_vndr/us(sunbasic)" - include "sun_vndr/us(volumekeys)" + include "eurosign(4)" + include "level3(ralt_switch)" - // 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 + key <COMP> { [ Multi_key ] }; + key <SYRQ> { [ SunSys_Req ] }; }; -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 ] }; +partial alphanumeric_keys + xkb_symbols "basic" { + include "sun_vndr/us(sunbasic)" }; -// US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "type5hobobasic" { - include "sun_vndr/us(type5basic)" +partial alphanumeric_keys + xkb_symbols "euro" { + include "us(euro)" }; -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 ] }; +partial alphanumeric_keys + xkb_symbols "intl" { + include "us(intl)" +}; - // Here is the hobo keypad: +partial alphanumeric_keys + xkb_symbols "alt-intl" { + include "us(alt-intl)" +}; - 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] }; +partial alphanumeric_keys + xkb_symbols "dvorak" { + include "us(dvorak)" +}; - 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] }; +partial alphanumeric_keys + xkb_symbols "dvorak-intl" { + include "us(dvorak-intl)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "dvorak-alt-intl" { + include "us(dvorak-alt-intl)" +}; - key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter ] }; +partial alphanumeric_keys + xkb_symbols "dvorak-l" { + include "us(dvorak-l)" +}; - key <AB07> { [ m, M, NoSymbol, NoSymbol, KP_0 ] }; +partial alphanumeric_keys + xkb_symbols "dvorak-r" { + include "us(dvorak-r)" +}; - key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] }; - key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] }; +partial alphanumeric_keys + xkb_symbols "dvorak-classic" { + include "us(dvorak-classic)" }; +partial alphanumeric_keys + xkb_symbols "dvp" { + include "us(dvp)" +}; -xkb_symbols "type6" { - include "sun_vndr/us(sunbasic)" - include "sun_vndr/us(volumekeys)" - include "eurosign(4)" - include "level3(ralt_switch)" +partial alphanumeric_keys + xkb_symbols "rus" { + include "us(rus)" +}; - key <SYRQ> { [ SunSys_Req ]}; +partial alphanumeric_keys + xkb_symbols "mac" { + include "us(mac)" }; +partial alphanumeric_keys + xkb_symbols "colemak" { + include "us(colemak)" +}; +partial alphanumeric_keys + xkb_symbols "altgr-intl" { + include "us(altgr-intl)" +}; -xkb_symbols "pc101" { - include "us(pc101)" - key <RALT> { [ Mode_switch, Meta_R ] }; +partial alphanumeric_keys + xkb_symbols "classmate" { + include "us(classmate)" }; -xkb_symbols "pc102" { - include "us(pc102)" - key <RALT> { [ Mode_switch, Meta_R ] }; +partial alphanumeric_keys + xkb_symbols "classmate-intl" { + include "us(classmate-intl)" }; -xkb_symbols "pc104" { - include "us(pc104)" +partial alphanumeric_keys + xkb_symbols "classmate-alt-intl" { + include "us(classmate-alt-intl)" }; -xkb_symbols "pc101currency" { +partial alphanumeric_keys + xkb_symbols "classmate-altgr-intl" { + include "us(classmate-altgr-intl)" +}; - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ]}; +partial alphanumeric_keys + xkb_symbols "olpc" { + include "us(olpc)" }; -xkb_symbols "US101A_Sun" { +partial alphanumeric_keys + xkb_symbols "olpc2" { + include "us(olpc2)" +}; - key <AE04> { [ 4, dollar ], [ EuroSign ] }; - key <AE05> { [ 5, percent ], [ EuroSign ] }; - key <AD03> { [ e, E ], [ EuroSign ] }; - key <BKSL> { [ backslash, bar ], [ brokenbar ]}; +partial alphanumeric_keys + xkb_symbols "chr" { + include "us(chr)" +}; - // 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 ]}; +partial alphanumeric_keys + xkb_symbols "hbs" { + include "us(hbs)" +}; +partial alphanumeric_keys + xkb_symbols "htcdream" { + include "us(htcdream)" +}; - key <DELE> { [ L10, L10 ], [ Delete ]}; - key <END> { [ L9, L9 ], [ End ]}; - key <PGDN> { [ L4, L4 ], [ Next ]}; +partial alphanumeric_keys + xkb_symbols "workman" { + include "us(workman)" +}; - key <UP> { [ Up ] }; - key <LEFT> { [ Left ] }; - key <DOWN> { [ Down ] }; - key <RGHT> { [ Right ] }; +partial alphanumeric_keys + xkb_symbols "workman-intl" { + include "us(workman-intl)" +}; - key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; - key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; +partial alphanumeric_keys + xkb_symbols "cz_sk_de" { + include "us(cz_sk_de)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "intl-unicode" { + include "us(intl-unicode)" +}; - key <KP4> { [ KP_Left, KP_4 ], [ KP_4 ] }; - key <KP5> { [ R11, KP_5 ], [ KP_5 ] }; - key <KP6> { [ KP_Right, KP_6 ], [ KP_6 ] }; +partial alphanumeric_keys + xkb_symbols "alt-intl-unicode" { + include "us(alt-intl-unicode)" +}; - 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 ] }; +partial alphanumeric_keys + xkb_symbols "ats" { + include "us(ats)" +}; - key <LALT> { [ Meta_L ] }; - key <RALT> { [ Alt_L ] }; - key <RCTL> { [ Multi_key ] }; +partial alphanumeric_keys + xkb_symbols "crd" { + include "us(crd)" }; diff --git a/xorg-server/xkeyboard-config/symbols/tr b/xorg-server/xkeyboard-config/symbols/tr index 025f844b2..72bf590f3 100644 --- a/xorg-server/xkeyboard-config/symbols/tr +++ b/xorg-server/xkeyboard-config/symbols/tr @@ -352,3 +352,10 @@ xkb_symbols "crh_alt" { key <AB06> { [ n, N, ntilde, Ntilde ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/tr(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw index b98e21ed3..e97c0b60b 100644 --- a/xorg-server/xkeyboard-config/symbols/tw +++ b/xorg-server/xkeyboard-config/symbols/tw @@ -72,3 +72,10 @@ xkb_symbols "saisiyat" { include "level3(ralt_switch)" }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/tw(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua index 262243e22..ddfe11f9f 100644 --- a/xorg-server/xkeyboard-config/symbols/ua +++ b/xorg-server/xkeyboard-config/symbols/ua @@ -306,3 +306,10 @@ xkb_symbols "homophonic" { key <AB09> { [ period, greater ] }; key <AB10> { [ slash, question ] }; }; + +// EXTRAS: + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/ua(sun_type6)" +}; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 84bf15e76..11c971cf1 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -1475,3 +1475,8 @@ xkb_symbols "crd" { // End alphanumeric section }; + +partial alphanumeric_keys + xkb_symbols "sun_type6" { + include "sun_vndr/us(sun_type6)" +}; |