diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | compat/japan | 19 | ||||
-rw-r--r-- | compat/mousekeys | 23 | ||||
-rw-r--r-- | compat/xorg | 11 | ||||
-rw-r--r-- | geometry/sun | 1771 | ||||
-rw-r--r-- | rules/base.o_c.part | 2 | ||||
-rw-r--r-- | rules/base.xml.in | 35 | ||||
-rw-r--r-- | symbols/de | 20 | ||||
-rw-r--r-- | symbols/nl | 18 | ||||
-rw-r--r-- | symbols/ru | 5 | ||||
-rw-r--r-- | symbols/sun_vndr/se | 262 | ||||
-rw-r--r-- | symbols/sun_vndr/us | 603 | ||||
-rw-r--r-- | symbols/tr | 24 |
13 files changed, 2261 insertions, 539 deletions
@@ -1,3 +1,10 @@ +2006-02-25 Alan Coopersmith + + * symbols/sun_vndr/*, compat/japan, compat/mousekeys, + geometry/sun: + massive update from Sun, see + https://bugs.freedesktop.org/show_bug.cgi?id=5725 + 2006-02-24 M. Emal Alekozai <memala@gmx.net> * symbols/af, symbols/Makefile.am, rules/base.xml: diff --git a/compat/japan b/compat/japan index 34bcc096..00187d00 100644 --- a/compat/japan +++ b/compat/japan @@ -27,3 +27,22 @@ default partial xkb_compatibility "japan" { action= NoAction(); }; }; + +// Some Japanese keyboards have an explict Kana Lock key & matching LED + +partial xkb_compatibility "kana_lock" { + + virtual_modifiers Kana_Lock; + + interpret Kana_Lock+AnyOfOrNone(all) { + virtualModifier= Kana_Lock; + useModMapMods=level1; + action= LockGroup(group=+1); + }; + + indicator "Kana" { + !allowExplicit; + groups= All-Group1; + }; +}; + diff --git a/compat/mousekeys b/compat/mousekeys index 6e9a208d..fbd2b889 100644 --- a/compat/mousekeys +++ b/compat/mousekeys @@ -117,6 +117,29 @@ default partial xkb_compatibility "mousekeys" { action = LockPointerButton(button=default,affect=unlock); }; + // Additional mappings for Solaris keypad compatibility + interpret F25 { // aka KP_Divide + action = SetPtrDflt(affect=defaultButton,button=1); + }; + interpret F26 { // aka KP_Multiply + action = SetPtrDflt(affect=defaultButton,button=2); + }; + interpret F27 { // aka KP_Home + action = MovePtr(x=-1,y=-1); + }; + interpret F29 { // aka KP_Prior + action = MovePtr(x=+1,y=-1); + }; + interpret F31 { // aka KP_Begin + action = PointerButton(button=default); + }; + interpret F33 { // aka KP_End + action = MovePtr(x=-1,y= +1); + }; + interpret F35 { // aka KP_Next + action = MovePtr(x=+1,y=+1); + }; + interpret.repeat= False; diff --git a/compat/xorg b/compat/xorg new file mode 100644 index 00000000..310f86d3 --- /dev/null +++ b/compat/xorg @@ -0,0 +1,11 @@ +// +// $XKeyboardConfig$ +// Misc optional compat things +// + +default partial xkb_compatibility "lctrl_group1" { + interpret Control_L+Any { + action = SetMods(modifiers=ModMapMods,clearLocks); + //action = LatchGroup(group=1,!clearLocks,!latchToLock); + }; +}; diff --git a/geometry/sun b/geometry/sun index 77a4f2a2..633077ac 100644 --- a/geometry/sun +++ b/geometry/sun @@ -1,4 +1,5 @@ // $Xorg: sun,v 1.4 2001/02/09 02:05:51 xorgcvs Exp $ +// $XdotOrg: $ // //Copyright 1996, 1998 The Open Group // @@ -24,7 +25,37 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.6 2001/12/14 20:01:58 dawes Exp $ +// --------------------------------------------------------------------------- +// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +// --------------------------------------------------------------------------- +// +// $XFree86: xc/programs/xkbcomp/geometry/sun,v 1.7 2003/08/09 14:30:47 pascal Exp $ // xkb_geometry "type4" { @@ -156,15 +187,409 @@ xkb_geometry "type4" { text "NumLockLabel" { left= 421; text="Num\nLock"; }; }; -default xkb_geometry "type5" { +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. - // Sun Type6 US keyboard (PN 320-1270, PN 320-1271) is identical. - description= "Sun Type5 keyboard"; - width= 515; height= 170; @@ -180,7 +605,7 @@ default xkb_geometry "type5" { 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 "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] } }; @@ -305,13 +730,9 @@ default xkb_geometry "type5" { }; // End of "Keypad" section }; -xkb_geometry "type5euro" { +xkb_geometry "t5tuv" { - // 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. - - description= "Sun Type5 keyboard"; + // This is an approximate layout for a TUV/European Sun Type5 keyboard. width= 515; height= 170; @@ -321,8 +742,13 @@ xkb_geometry "type5euro" { 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 "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] } }; @@ -375,7 +801,7 @@ xkb_geometry "type5euro" { <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, <AD11>, <AD12>, - { <BKSL>, "BKSL" } + { <RTRN>, "RTRN" } }; }; row { @@ -383,8 +809,7 @@ xkb_geometry "type5euro" { keys { <FRNT>, <COPY>, { <CAPS>, 9, shape="CAPS" }, <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>, <AC10>, - <AC11>, - { <RTRN>, "RTRN" } + <AC11>, <BKSL> }; }; row { @@ -392,7 +817,7 @@ xkb_geometry "type5euro" { keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH", color="grey20" } + { <RTSH>, "RTSH" } }; }; row { @@ -436,6 +861,156 @@ xkb_geometry "type5euro" { }; 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 { @@ -453,24 +1028,21 @@ xkb_geometry "type5euro" { }; // End of "Keypad" section }; - -xkb_geometry "type5unix" { +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. - // Sun Type6 US/UNIX keyboard (PN 320-1272, PN 320-1273) is identical. - description= "Sun Type5 Unix keyboard"; - width= 515; height= 170; shape "EDGE" { cornerRadius= 2, { [ 515, 170 ] } }; shape.cornerRadius= 1; shape "NORM" { { [ 18,18] }, { [2,1], [16,17] } }; - shape "BKSP" { { [ 28,18] }, { [2,1], [26,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] } }; @@ -541,7 +1113,7 @@ xkb_geometry "type5unix" { keys { <OPEN>, <PAST>, { <LFSH>, 9 , shape="LFSH" }, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, - { <RTSH>, "RTSH" } + { <RTSH>, "RTSH", color="grey20" } }; }; row { @@ -585,7 +1157,7 @@ xkb_geometry "type5unix" { }; row { top= 20; - keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD" } }; + keys { <KP7>, <KP8>, <KP9>, { <KPAD>, "KPAD", color= "grey20" } }; }; row { top= 39; @@ -593,7 +1165,7 @@ xkb_geometry "type5unix" { }; row { top= 58; - keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD" } }; + keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color= "grey20" } }; }; row { top= 77; @@ -602,6 +1174,386 @@ xkb_geometry "type5unix" { }; // 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 @@ -1337,3 +2289,768 @@ xkb_geometry "type4_se" { text "ScrollLockLabel" { left= 402; text="Scroll\nLock"; }; text "NumLockLabel" { left= 421; text="Num\nLock"; }; }; + +xkb_geometry "t6" { + + // This is an approximate layout for a (US/ASCII) Sun Type6 + // 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" { { [136,18] }, { [2,1], [134,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 "RMTA" { { [ 28,18] }, { [2,1], [26,17] } }; + shape "LMTA" { { [ 28,18] }, { [2,1], [26,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>, "LMTA" }, + { <SPCE>, "SPCE" }, + { <RMTA>, "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 + + shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; + shape "LED" { cornerRadius= 2, { [ 3, 6 ] } }; + solid "LedPanel" { + shape= "LEDS"; + top= 1; + left= 218; + }; + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 10; + indicator.shape= "LED"; + indicator "CapsLock" { left= 243; }; + indicator "Compose" { left= 281; }; + indicator "ScrollLock" { left= 262; }; + indicator "NumLock" { left= 224; }; + text.top= 1; + text.color= "black"; + text "CapsLockLabel" { left= 243; text="Caps\nLock"; }; + text "ComposeLabel" { left= 281; text="Compose"; }; + text "ScrollLockLabel" { left= 262; text="Scroll\nLock"; }; + text "NumLockLabel" { left= 224; text="Num\nLock"; }; + + +}; + +xkb_geometry "t6tuv" { + + // This is an approximate layout for a (US/ASCII) Sun Type6 + // 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 "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" { { [137,18] }, { [2,1], [135,17] } }; + shape "KP0" { { [ 37,18] }, { [2,1], [35,17] } }; + shape "KPAD" { { [ 18,37] }, { [2,1], [16,36] } }; + shape "RMTA" { { [ 28,18] }, { [2,1], [26,17] } }; + shape "LMTA" { { [ 28,18] }, { [2,1], [26,17] } }; + 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", color="grey20" } + }; + }; + row { + top= 77; + keys { <FIND>, <CUT>, { <LCTL>, 9, shape="LCTL" }, + <LALT>, { <LMTA>, "LMTA" }, + { <SPCE>, "SPCE" }, + { <RMTA>, "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 + + shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; + shape "LED" { cornerRadius= 2, { [ 3, 6 ] } }; + solid "LedPanel" { + shape= "LEDS"; + top= 1; + left= 218; + }; + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 10; + indicator.shape= "LED"; + indicator "CapsLock" { left= 243; }; + indicator "Compose" { left= 281; }; + indicator "ScrollLock" { left= 262; }; + indicator "NumLock" { left= 224; }; + text.top= 1; + text.color= "black"; + text "CapsLockLabel" { left= 243; text="Caps\nLock"; }; + text "ComposeLabel" { left= 281; text="Compose"; }; + text "ScrollLockLabel" { left= 262; text="Scroll\nLock"; }; + text "NumLockLabel" { left= 224; text="Num\nLock"; }; + +}; + +xkb_geometry "t6jp" { + + // This is an approximate layout for a (US/ASCII) Sun Type6 + // 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 "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" { { [ 96,18] }, { [2,1], [94,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 + + shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; + shape "LED" { cornerRadius= 2, { [ 3, 6 ] } }; + solid "LedPanel" { + shape= "LEDS"; + top= 1; + left= 218; + }; + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 10; + indicator.shape= "LED"; + indicator "CapsLock" { left= 243; }; + indicator "Compose" { left= 281; }; + indicator "ScrollLock" { left= 262; }; + indicator "NumLock" { left= 224; }; + text.top= 1; + text.color= "black"; + text "CapsLockLabel" { left= 243; text="Caps\nLock"; }; + text "ComposeLabel" { left= 281; text="Compose"; }; + text "ScrollLockLabel" { left= 262; text="Scroll\nLock"; }; + text "NumLockLabel" { left= 224; text="Num\nLock"; }; + +}; + +xkb_geometry "t6unix" { + + // This is an approximate layout for a (US/ASCII) Sun Type6 + // 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" { { [ 28,18] }, { [2,1], [26,17] } }; + shape "TABK" { { [ 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" { { [136,18] }, { [2,1], [134,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 "RMTA" { { [ 28,18] }, { [2,1], [26,17] } }; + shape "LMTA" { { [ 28,18] }, { [2,1], [26,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", color="grey20" } + }; + }; + 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>, "LMTA"}, + { <SPCE>, "SPCE" }, + {<RMTA>, "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 + + shape "LEDS" { cornerRadius= 0, { [ 78 ,21 ] } }; + shape "LED" { cornerRadius= 2, { [ 3, 6 ] } }; + solid "LedPanel" { + shape= "LEDS"; + top= 1; + left= 218; + }; + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 10; + indicator.shape= "LED"; + indicator "CapsLock" { left= 243; }; + indicator "Compose" { left= 281; }; + indicator "ScrollLock" { left= 262; }; + indicator "NumLock" { left= 224; }; + text.top= 1; + text.color= "black"; + text "CapsLockLabel" { left= 243; text="Caps\nLock"; }; + text "ComposeLabel" { left= 281; text="Compose"; }; + text "ScrollLockLabel" { left= 262; text="Scroll\nLock"; }; + 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)" + description= "Sun Type6 keyboard (US, Korea, Taiwan)"; +}; + +xkb_geometry "type6jp" { + include "sun(t6jp)" + description= "Sun Type6 Japanese keyboard"; +}; + +xkb_geometry "type6tuv" { + include "sun(t6tuv)" + description= "Sun Type6 TUV keyboard"; +}; + +xkb_geometry "type6unix" { + include "sun(t6unix)" + description= "Sun Type6 Unix keyboard"; +}; + +xkb_geometry "x86" { + include "pc(pc101)" + description= "x86 Style Keyboard"; +}; + +xkb_geometry "MS_x86" { + include "pc(pc104)" + description= "x86 104 Key Keyboard"; +}; + +xkb_geometry "x86tuv" { + include "pc(pc102)" + description= "x86 European Style Keyboard"; +}; diff --git a/rules/base.o_c.part b/rules/base.o_c.part index ff830d4c..160294b0 100644 --- a/rules/base.o_c.part +++ b/rules/base.o_c.part @@ -2,4 +2,6 @@ grp_led:caps = +ledcaps(group_lock) grp_led:scroll = +ledscroll(group_lock) grp:caps_toggle = +ledcaps(group_lock) + compat:lctrl_group1 = +xorg(lctrl_group1) + japan:kana_lock = +japan(kana_lock) diff --git a/rules/base.xml.in b/rules/base.xml.in index 8a00e746..b47cac8d 100644 --- a/rules/base.xml.in +++ b/rules/base.xml.in @@ -1204,7 +1204,14 @@ <_shortDescription>Nld</_shortDescription> <_description>Netherlands</_description> </configItem> - <variantList/> + <variantList> + <variant> + <configItem> + <name>sundeadkeys</name> + <_description>Sun dead keys</_description> + </configItem> + </variant> + </variantList> </layout> <layout> <configItem> @@ -1445,6 +1452,12 @@ <_description>Dvorak</_description> </configItem> </variant> + <variant> + <configItem> + <name>sundeadkeys</name> + <_description>Sun dead keys</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2267,7 +2280,7 @@ <configItem> <name>tr</name> <_shortDescription>Tur</_shortDescription> - <_description>Turkish </_description> + <_description>Turkey</_description> </configItem> <variantList> <variant> @@ -2282,6 +2295,12 @@ <_description>Alt-Q</_description> </configItem> </variant> + <variant> + <configItem> + <name>sundeadkeys</name> + <_description>Sun dead keys</_description> + </configItem> + </variant> </variantList> </layout> <layout> @@ -2878,5 +2897,17 @@ </configItem> </option> </group> + <group allowMultipleSelection="true"> + <configItem> + <name>japan</name> + <description>Japanese Keyboard Options</description> + </configItem> + <option> + <configItem> + <name>japan:kana_lock</name> + <description>Kana Lock key is locking</description> + </configItem> + </option> + </group> </optionList> </xkbConfigRegistry> @@ -172,3 +172,23 @@ xkb_symbols "dvorak" { include "level3(ralt_switch)" }; + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + + // For naming consistency + + include "de(basic)" + +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + + // For naming consistency + + include "de(Sundeadkeys)" + + name[Group1]="Germany - Sun dead keys"; +}; + @@ -52,3 +52,21 @@ xkb_symbols "basic" { include "level3(ralt_switch)" }; +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + + // For naming consistency + + include "nl(basic)" + +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + + // For naming consistency + + include "nl(Sundeadkeys)" + name[Group1]="Netherlands - Sun dead keys"; +}; + @@ -112,8 +112,8 @@ xkb_symbols "phonetic" { key <AE02> { [ 2, at ] }; key <AE03> { [ 3, Cyrillic_io ] }; key <AE04> { [ 4, Cyrillic_IO ] }; - key <AE05> { [ 5, percent ] }; - key <AE06> { [ 6, asciicircum ] }; + key <AE05> { [ 5, Cyrillic_hardsign ] }; + key <AE06> { [ 6, Cyrillic_HARDSIGN ] }; key <AE07> { [ 7, ampersand ] }; key <AE08> { [ 8, asterisk ] }; key <AE09> { [ 9, parenleft ] }; @@ -154,7 +154,6 @@ xkb_symbols "phonetic" { key <LatL> { [ Cyrillic_el, Cyrillic_EL ] }; key <LatP> { [ Cyrillic_pe, Cyrillic_PE ] }; - key <AE11> { [ minus, Cyrillic_hardsign ] }; key <AD11> { [ Cyrillic_sha, Cyrillic_SHA ] }; key <AE12> { [ Cyrillic_che, Cyrillic_CHE ] }; key <AD12> { [ Cyrillic_shcha, Cyrillic_SHCHA ] }; diff --git a/symbols/sun_vndr/se b/symbols/sun_vndr/se index 9980a02d..38e530af 100644 --- a/symbols/sun_vndr/se +++ b/symbols/sun_vndr/se @@ -1,197 +1,81 @@ -// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/se,v 1.2 1998/12/20 09:40:28 dawes Exp $ +// $XdotOrg: $ // -// Swedish layout for a Type 5/5c Sun keyboard -xkb_symbols "sun5" { - include "latin(basic)+se(basic)" - - name[Group1]="Swedish"; - - // 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 { Alt_L }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Num_Lock }; - // End modifier mappings +// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +xkb_symbols "type4" { + key <BKSL> { [ section, onehalf ] }; + key <BRCR> { [ asciitilde, asciicircum ] }; + key <AE02> { [ 2, quotedbl ], [ at ] }; + key <AE03> { [ 3, numbersign ], [ sterling ] }; + key <AE04> { [ 4, currency ], [ dollar ] }; + key <AE05> { [ 5, percent ], [ degree ] }; + key <AE06> { [ 6, ampersand ], [ notsign ] }; + key <AE07> { [ 7, slash ], [ braceleft ] }; + key <AE08> { [ 8, parenleft ], [ bracketleft ]}; + key <AE09> { [ 9, parenright ], [ bracketright ] }; + key <AE10> { [ 0, equal ], [ braceright ] }; + key <AE11> { [ plus, question ], [ backslash ] }; + key <AE12> { [ SunFA_Acute, SunFA_Grave ] }; + + key <AD03> { [ e, E ], [ EuroSign ] }; + key <AD11> { [ Aring ] }; + key <AD12> { [ SunFA_Diaeresis, SunFA_Circum ], [ SunFA_Tilde ] }; + + key <AC10> { [ Odiaeresis ] }; + key <AC11> { [ Adiaeresis ] }; + key <TLDE> { [ quoteright, asterisk ], [ quoteleft ]}; + + key <LCTL> { [ Caps_Lock ] }; + key <CAPS> { [ Control_L ] }; + key <LSGT> { [ less, greater ] }; + key <AB08> { [ comma, semicolon ] }; + key <AB09> { [ period, colon ] }; + key <AB10> { [ minus, underscore ] }; }; -// Swedish layout for a Type 4 Sun keyboard -xkb_symbols "sun4" { - include "latin(basic)+se(basic)" - - name[Group1]="Swedish"; - - // 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 ] }; +xkb_symbols "type5" { + include "se" - key <LALT> { [ Alt_L ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; - // End alphanumeric section + key <TLDE> { [ section, onehalf ] }; + key <AE07> { [ 7, slash ], [ braceleft ] }; + key <AE08> { [ 8, parenleft ], [ bracketleft ]}; + key <AE09> { [ 9, parenright ], [ bracketright ] }; + key <AE10> { [ 0, equal ], [ braceright ] }; + key <AE11> { [ plus, question ], [ backslash ] }; - // Begin "Function" section - key <FK01> { [ F1 ] }; - key <FK02> { [ F2 ] }; - key <FK03> { [ F3 ] }; - key <FK04> { [ F4 ] }; - key <FK05> { [ F5 ] }; - key <FK06> { [ F6 ] }; - key <FK07> { [ F7 ] }; - key <FK08> { [ F8 ] }; - key <FK09> { [ F9 ] }; - key <FK10> { [ F10 ] }; - key <FK11> { [ F11 ], [ SunF36] }; - key <FK12> { [ F12 ], [ SunF37] }; - key <STOP> { [ Cancel ], [ F11 ] }; - key <AGAI> { [ Redo ], [ F12 ] }; - key <PROP> { [ SunProps ], [ F13 ] }; - key <UNDO> { [ Undo ], [ F14 ] }; - key <FRNT> { [ SunFront ], [ F15 ] }; - key <COPY> { [ SunCopy ], [ F16 ] }; - key <OPEN> { [ SunOpen ], [ F17 ] }; - key <PAST> { [ SunPaste ], [ F18 ] }; - key <FIND> { [ Find ], [ F19 ] }; - key <CUT> { [ SunCut ], [ F20 ] }; - // End "Function" section - - // Begin "Editing" section - key <LNFD> { [ Linefeed ] }; - key <DELE> { [ Delete ] }; - key <PRSC> { [ Print ], [ Sys_Req, SunSys_Req ] }; - key <SCLK> { [ Scroll_Lock ] }; - key <PAUS> { [ Pause ], [ Break ] }; - key <HELP> { [ Help ] }; - // End "Editing" section - - // Begin "Keypad" section - key <NMLK> { [ Num_Lock ] }; - key <KPEQ> { [ KP_Equal ] }; - key <KPDV> { [ KP_Divide ], [ F25 ] }; - key <KPMU> { [ KP_Multiply ], [ F26 ] }; - key <KPSU> { [ KP_Subtract ] }; - - key <KP7> { [ KP_Home, KP_7 ], [ F27 ] }; - key <KP8> { [ KP_Up, KP_8 ], [ F28 ] }; - key <KP9> { [ KP_Prior, KP_9 ], [ F29 ] }; - key <KPAD> { [ KP_Add ] }; - - key <KP4> { [ KP_Left, KP_4 ], [ F30 ] }; - key <KP5> { [ KP_Begin, KP_5 ], [ F31 ] }; - key <KP6> { [ KP_Right, KP_6 ], [ F32 ] }; - - key <KP1> { [ KP_End, KP_1 ], [ F33 ] }; - key <KP2> { [ KP_Down, KP_2 ], [ F34 ] }; - key <KP3> { [ KP_Next, KP_3 ], [ F35 ] }; - key <KPEN> { [ KP_Enter ] }; - - key <KP0> { [ KP_Insert, KP_0 ] }; - key <KPDL> { [ KP_Delete, KP_Decimal ] }; - // End "Keypad" section, + key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde ] }; + key <BKSL> { [ quoteright, asterisk ], [ quoteleft ]}; +}; + +partial +xkb_symbols "type6" { + include "se(Sundeadkeys)" - // 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 + key <AD12> { [ SunFA_Diaeresis, asciicircum ], [ asciitilde, caron ] }; }; diff --git a/symbols/sun_vndr/us b/symbols/sun_vndr/us index 83207f4a..4a1328b3 100644 --- a/symbols/sun_vndr/us +++ b/symbols/sun_vndr/us @@ -1,12 +1,38 @@ -// $Xorg: us,v 1.4 2001/02/09 02:05:53 xorgcvs Exp $ +// $XdotOrg: $ +// +// Copyright 2004 Sun Microsystems, Inc. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, and/or sell copies of the Software, and to permit persons +// to whom the Software is furnished to do so, provided that the above +// copyright notice(s) and this permission notice appear in all copies of +// the Software and that both the above copyright notice(s) and this +// permission notice appear in supporting documentation. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL +// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING +// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION +// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// Except as contained in this notice, the name of a copyright holder +// shall not be used in advertising or otherwise to promote the sale, use +// or other dealings in this Software without prior written authorization +// of the copyright holder. +// +// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $ +// Sun: @(#)us 1.5 03/04/21 SMI // //Copyright 1996, 1998 The Open Group // -//Permission to use, copy, modify, distribute, and sell this software and its -//documentation for any purpose is hereby granted without fee, provided that -//the above copyright notice appear in all copies and that both that -//copyright notice and this permission notice appear in supporting -//documentation. +//All Rights Reserved. // //The above copyright notice and this permission notice shall be //included in all copies or substantial portions of the Software. @@ -24,351 +50,298 @@ //other dealings in this Software without prior written authorization //from The Open Group. // -// $XFree86: xc/programs/xkbcomp/symbols/sun_vndr/us,v 1.6 2001/12/14 20:02:05 dawes Exp $ -// -// US/ASCII layout for a Type 4 Sun keyboard -xkb_symbols "sun4" { + +// Symbols shared by all Sun Keyboard layouts +xkb_symbols "sunbasic" { + include "srvr_ctrl(stdkeypad)" include "us(basic)" - // A few alphanumeric keys are different - key <TLDE> { [ grave, asciitilde ], [ acute ] }; - key <AC11> { [ apostrophe, quotedbl ], [ acute ] }; - - 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 ] }; + key <RTSH> { [ Shift_R ] }; + key <LALT> { [ Alt_L ] }; + key <ALGR> { [ Mode_switch ] }; + key <LMTA> { [ Meta_L ] }; + key <RMTA> { [ Meta_R ] }; + key <RCTL> { [ Control_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 ] }; + 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> { [ Print ],[ F21 ] }; - key <SCLK> { [ Break, Scroll_Lock ],[ F22 ] }; - key <PAUS> { [ Pause ],[ F23 ] }; - key <DELE> { [ Delete ] }; - key <HELP> { [ Help ] }; + key <DELE> { [ Delete ] }; + key <HELP> { [ Help ] }; // End "Editing" section, begin "Keypad" - key <NMLK> { [ Num_Lock ] }; - key <KPEQ> { [ KP_Equal ], [ F24 ] }; - 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 + key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; + + // 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 + + modifier_map Control{ Control_R }; - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_L }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Num_Lock }; - modifier_map Mod5 { F13, F18, F20 }; }; -hidden partial function_keys xkb_symbols "broken_openlook_map" { - key <STOP> { [ F11 ], [ Cancel ] }; - key <AGAI> { [ F12 ], [ Redo ] }; - key <PROP> { [ F13 ], [ SunProps ] }; - key <UNDO> { [ F14 ], [ Undo ] }; - key <FRNT> { [ F15 ], [ SunFront ] }; - key <COPY> { [ F16 ], [ SunCopy ] }; - key <OPEN> { [ F17 ], [ SunOpen ] }; - key <PAST> { [ F18 ], [ SunPaste ] }; - key <FIND> { [ F19 ], [ Find ] }; - key <CUT> { [ F20 ], [ SunCut ] }; +// US/ASCII layout for a Type 4 Sun keyboard +xkb_symbols "type4basic" { + include "sun/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 ] }; + + // begin modifier mappings + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod1 { Meta_L, Meta_R }; + modifier_map Mod2 { Mode_switch }; + modifier_map Mod3 { Num_Lock }; + modifier_map Mod4 { Alt_L }; + }; -// US/ASCII layout for a Type 4 Sun keyboard w/ broken OpenLook keymap -xkb_symbols "sun4ol" { - override "sun_vndr/us(sun4)" - include "sun_vndr/us(broken_openlook_map)" +xkb_symbols "type4" { + include "sun/us(type4basic)" + + key <BKSL> { [ backslash, bar ], [ brokenbar ] }; }; // US/ASCII layout for a Type 5 Sun keyboard -xkb_symbols "sun5" { - augment "us(basic)" +xkb_symbols "type5basic" { + include "sun/us(sunbasic)" - // A alphanumeric keys are different - key <TLDE> { [ grave, asciitilde ], [ acute ] }; - key <AC11> { [ apostrophe, quotedbl ], [ acute ] }; - - key <RTSH> { [ Shift_R ] }; + // Begin "Editing" section + key <PRSC> { [ R2, R2 ], [ Print, SunSys_Req ] }; + key <SCLK> { [ R3, R3 ], [ Scroll_Lock ] }; + key <PAUS> { [ R1, R1 ], [ Pause, Break ] }; - key <LALT> { [ Alt_L ] }; - key <ALGR> { [ Mode_switch ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; - // End alphanumeric section + key <LEFT> { [ Left ] }; + key <RGHT> { [ Right ] }; + key <UP> { [ Up ] }; + key <DOWN> { [ Down ] }; - // 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 + key <DELE> { [ Delete ] }; + key <INS> { [ Insert ] }; + key <PGUP> { [ Prior ] }; + key <PGDN> { [ Next ] }; + key <HOME> { [ Home ] }; + key <END> { [ End ] }; + key <HELP> { [ Help ] }; - // 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 - // End "Editing" section, begin "Keypad" - 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 ] }; + 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 { Alt_L }; - modifier_map Mod2 { Num_Lock }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Meta_L, Meta_R}; - modifier_map Mod5 { Scroll_Lock }; + modifier_map Shift { Shift_R, Shift_L }; + modifier_map Mod1 { Alt_L }; + modifier_map Mod2 { Alt_R, Mode_switch }; + modifier_map Mod3 { Num_Lock }; + modifier_map Mod4 { Meta_L, Meta_R }; }; -// US/ASCII layout for a Type 5 Sun keyboard w/ broken OpenLook keymap -xkb_symbols "sun5ol" { - override "sun_vndr/us(sun5)" - include "sun_vndr/us(broken_openlook_map)" +xkb_symbols "type5" { + include "sun/us(type5basic)" + + // A few alphanumeric keys are different + key <AE04> { [ 4, dollar ], [ EuroSign ] }; + key <AE05> { [ 5, percent ], [ EuroSign ] }; + key <AD03> { [ e, E ], [ EuroSign ] }; + key <BKSL> { [ backslash, bar ], [ brokenbar ] }; }; -// US/ASCII layout for a Type 6 Sun keyboard -xkb_symbols "sun6" { - augment "us(basic)" +xkb_symbols "type6" { + include "sun/us(type5)" +}; - key <RTSH> { [ Shift_R ] }; - key <LALT> { [ Alt_L ] }; - key <RCTL> { [ Control_R ] }; - key <RALT> { [ Alt_R ] }; - key <LMTA> { [ Meta_L ] }; - key <RMTA> { [ Meta_R ] }; - key <COMP> { [ Multi_key ] }; - // Begin "Function" section - key <FK01> { - type="CTRL+ALT", - symbols[Group1]= [ F1, XF86_Switch_VT_1 ] - }; - key <FK02> { - type="CTRL+ALT", - symbols[Group1]= [ F2, XF86_Switch_VT_2 ] - }; - key <FK03> { - type="CTRL+ALT", - symbols[Group1]= [ F3, XF86_Switch_VT_3 ] - }; - key <FK04> { - type="CTRL+ALT", - symbols[Group1]= [ F4, XF86_Switch_VT_4 ] - }; - key <FK05> { - type="CTRL+ALT", - symbols[Group1]= [ F5, XF86_Switch_VT_5 ] - }; - key <FK06> { - type="CTRL+ALT", - symbols[Group1]= [ F6, XF86_Switch_VT_6 ] - }; - key <FK07> { - type="CTRL+ALT", - symbols[Group1]= [ F7, XF86_Switch_VT_7 ] - }; - key <FK08> { - type="CTRL+ALT", - symbols[Group1]= [ F8, XF86_Switch_VT_8 ] - }; - key <FK09> { - type="CTRL+ALT", - symbols[Group1]= [ F9, XF86_Switch_VT_9 ] - }; - key <FK10> { - type="CTRL+ALT", - symbols[Group1]= [ F10, XF86_Switch_VT_10 ] - }; - key <FK11> { - type="CTRL+ALT", - symbols[Group1]= [ F11, XF86_Switch_VT_11 ] - }; - key <FK12> { - type="CTRL+ALT", - symbols[Group1]= [ F12, XF86_Switch_VT_12 ] - }; - // End "Function" section +// US/ASCII layout for a Type 5 Sun keyboard +xkb_symbols "type5hobobasic" { + include "sun/us(type5basic)" +}; - // Begin "Editing" section - key <PRSC> { - type= "PC_SYSRQ", - symbols[Group1]= [ Print, Execute ] - }; - key <SCLK> { [ Scroll_Lock ] }; - key <PAUS> { - type= "PC_BREAK", - symbols[Group1]= [ Pause, Break ] - }; - key <INS> { [ Insert ] }; - key <HOME> { [ Home ] }; - key <PGUP> { [ Prior ] }; - key <DELE> { [ Delete ] }; - key <END> { [ End ] }; - key <PGDN> { [ Next ] }; - - key <UP> { [ Up ] }; - key <LEFT> { [ Left ] }; - key <DOWN> { [ Down ] }; - key <RGHT> { [ Right ] }; +xkb_symbols "type5hobo" { + include "sun/us(type5hobobasic)" - // End "Editing" section, begin "Keypad" - key <NMLK> { [ Num_Lock, Pointer_EnableKeys ] }; - 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 "Keypad" section - - key <MUTE> { [ SunAudioMute, SunVideoDegauss ] }; - key <VOL-> { [ SunAudioLowerVolume,SunVideoLowerBrightness ] }; - key <VOL+> { [ SunAudioRaiseVolume,SunVideoRaiseBrightness ] }; - key <POWR> { [ SunPowerSwitch, SunPowerSwitchShift ] }; - - // from symbols/sun_vndr/us(type5) - 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 ] }; + // 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 ] }; - // begin modifier mappings - modifier_map Shift { Shift_R }; - modifier_map Mod1 { Meta_L, Meta_R }; - modifier_map Mod2 { Alt_L }; - modifier_map Mod3 { Mode_switch }; - modifier_map Mod4 { Num_Lock }; + // Here is the hobo keypad: + + key <AE07> { [ 7, ampersand ], [ NoSymbol, NoSymbol ], [ KP_7 ] }; + key <AE08> { [ 8, asterisk ], [ NoSymbol, NoSymbol ], [ KP_8 ] }; + key <AE09> { [ 9, parenleft ], [ NoSymbol, NoSymbol ], [ KP_9 ] }; + key <AE10> { [ 0, parenright], [ NoSymbol, NoSymbol ], [ KP_Multiply] }; + + key <AD07> { [ u, U ], [ NoSymbol, NoSymbol ], [ KP_4 ] }; + key <AD08> { [ i, I ], [ NoSymbol, NoSymbol ], [ KP_5 ] }; + key <AD09> { [ o, O ], [ NoSymbol, NoSymbol ], [ KP_6 ] }; + key <AD10> { [ p, P ], [ NoSymbol, NoSymbol ], [ KP_Subtract]}; + + key <AC07> { [ j, J ], [ NoSymbol, NoSymbol ], [ KP_1 ] }; + key <AC08> { [ k, K ], [ NoSymbol, NoSymbol ], [ KP_2 ] }; + key <AC09> { [ l, L ], [ NoSymbol, NoSymbol ], [ KP_3 ] }; + key <AC10> { [ semicolon, colon], [ NoSymbol, NoSymbol], [ KP_Add ] }; + + key <RTRN> { [ Return ], [ NoSymbol, NoSymbol], [ KP_Enter ] }; + + key <AB07> { [ m, M ], [ NoSymbol, NoSymbol ], [ KP_0 ] }; + + key <AB09> { [ period, greater], [ NoSymbol, NoSymbol], [ KP_Decimal] }; + key <AB10> { [ slash, question], [ NoSymbol, NoSymbol], [ KP_Divide ] }; + +}; + +xkb_symbols "pc101" { + include "us(pc101)" + key <RALT> { [ Mode_switch, Meta_R ] }; }; -// US/ASCII layout for a Type 6 Sun keyboard w/ broken OpenLook keymap -xkb_symbols "sun6ol" { - override "sun_vndr/us(sun6)" - include "sun_vndr/us(broken_openlook_map)" +xkb_symbols "pc102" { + include "us(pc102)" + key <RALT> { [ Mode_switch, Meta_R ] }; }; + +xkb_symbols "pc104" { + include "us(pc104)" +}; + +xkb_symbols "pc101currency" { + + key <AE04> { [ 4, dollar ], [ EuroSign ] }; + key <AE05> { [ 5, percent ], [ EuroSign ] }; + key <AD03> { [ e, E ], [ EuroSign ] }; + key <BKSL> { [ backslash, bar ], [ brokenbar ]}; +}; + +xkb_symbols "US101A_Sun" { + + key <AE04> { [ 4, dollar ], [ EuroSign ] }; + key <AE05> { [ 5, percent ], [ EuroSign ] }; + key <AD03> { [ e, E ], [ EuroSign ] }; + key <BKSL> { [ backslash, bar ], [ brokenbar ]}; + + // Begin "Editing" section + key <PRSC> { [ L5, L5 ], [ Print, SunSys_Req ]}; + key <SCLK> { [ L7, L7 ], [ Scroll_Lock ]}; + key <PAUS> { [ L1, L1 ], [ Pause, Break ]}; + key <INS> { [ L8, L8 ], [ Insert ]}; + key <HOME> { [ L6, L6 ], [ Home ]}; + key <PGUP> { [ L3, L3 ], [ Prior ]}; + + + key <DELE> { [ L10, L10 ], [ Delete ]}; + key <END> { [ L9, L9 ], [ End ]}; + key <PGDN> { [ L4, L4 ], [ Next ]}; + + key <UP> { [ Up ] }; + key <LEFT> { [ Left ] }; + key <DOWN> { [ Down ] }; + key <RGHT> { [ Right ] }; + + key <KPDV> { [ R5, R5 ], [ KP_Divide ] }; + key <KPMU> { [ R6, R6 ], [ KP_Multiply ] }; + + key <KP7> { [ R7, KP_7 ], [ KP_7, Home ] }; + key <KP8> { [ KP_Up, KP_8 ], [ KP_8 ] }; + key <KP9> { [ R9, KP_9 ], [ KP_9, Prior ] }; + key <KPAD> { [ KP_Add ] }; + + key <KP4> { [ KP_Left, KP_4 ], [ KP_4 ] }; + key <KP5> { [ R11, KP_5 ], [ KP_5 ] }; + key <KP6> { [ KP_Right, KP_6 ], [ KP_6 ] }; + + key <KP1> { [ R13, KP_1 ], [ KP_1, End ] }; + key <KP2> { [ KP_Down, KP_2 ], [ KP_2 ] }; + key <KP3> { [ R15, KP_3 ], [ KP_3, Next ] }; + key <KPEN> { [ KP_Enter ] }; + + key <LALT> { [ Meta_L ] }; + key <RALT> { [ Alt_L ] }; + key <RCTL> { [ Multi_key ] }; +}; + @@ -13,7 +13,7 @@ xkb_symbols "basic" { include "latin" - name[Group1]="Turkish"; + name[Group1]="Turkey"; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; key <AE02> { [ 2, apostrophe, sterling, twosuperior ] }; @@ -68,7 +68,7 @@ xkb_symbols "f" { include "latin" - name[Group1]="Turkish - (F)"; + name[Group1]="Turkey - (F)"; key <AE01> { [ 1, exclam, onesuperior, exclamdown ] }; key <AE02> { [ 2, quotedbl, twosuperior, VoidSymbol ] }; @@ -133,7 +133,7 @@ xkb_symbols "alt" { include "latin" - name[Group1]="Turkish - Alt-Q"; + name[Group1]="Turkey - Alt-Q"; key <AE07> { [ 7, ampersand, lowleftcorner, upleftcorner ] }; key <AE08> { [ 8, asterisk, leftt, topt ] }; @@ -156,3 +156,21 @@ xkb_symbols "alt" { include "level3(ralt_switch)" }; + + +partial alphanumeric_keys +xkb_symbols "Sundeadkeys" { + + // For naming consistency + include "tr(basic)" + +}; + +partial alphanumeric_keys +xkb_symbols "sundeadkeys" { + + // For naming consistency + include "tr(Sundeadkeys)" + + name[Group1]="Turkey - Sun dead keys"; +}; |