diff -Nrup xkb.org/geometry/sanwa xkb/geometry/sanwa --- xkb.org/geometry/sanwa 1970-01-01 01:00:00.000000000 +0100 +++ xkb/geometry/sanwa 2010-11-02 22:16:51.723836014 +0100 @@ -0,0 +1,155 @@ +// $Xorg: $ +// +//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. +// +//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. +// +default xkb_geometry "sanwa_skb-kg3" { + + description= "Sanwa Supply Inc. Small Keyboard KG3"; + // SKB-KG3BK (black) + // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3BK + // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3BK/ + // SKB-KG3W (white) + // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3W + // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SW/ + // SKB-KG3SV (silver) + // http://www.sanwa.co.jp/product/syohin.asp?code=SKB-KG3SV + // http://www.sanwa.co.jp/zooma/keybord/SKB-KG3SV/ + + width= 304; + height= 127; + + shape.cornerRadius= 1; + shape "TOP" { { [15.25,13] }, { [2,2], [13.25,11] } }; + shape "NORM" { { [17,16] }, { [2,2], [15,14] } }; + shape "TBBK" { { [24.5,16] }, { [2,2], [22.5,14] } }; + shape "RTRN" { { [0,0], [36,0], [36,34], [8.5,34], [8.5,16], [0,16] }, + { [2,2], [34,2], [34,32], [10.5,32], [10.5,14], [2,14] } }; + shape "CAPS" { { [33,16] }, { [28,16] }, { [2,2], [26,14] } }; + shape "LFSH" { { [41,16] }, { [2,2], [39,14] } }; + shape "CTSH" { { [19.5,16] }, { [2,2], [17.5,14] } }; + shape "SPCE" { { [57.5,16] }, { [2,2], [55.5,14] } }; + + shape "LED" { cornerRadius= 0, { [5,1] } }; + + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 3; + indicator.shape= "LED"; + indicator "Num Lock" { left= 247; }; + indicator "Caps Lock" { left= 266; }; + indicator "Scroll Lock" { left= 285; }; + text.color= "black"; + text.top= 1; + text "Vendor1" { left= 10; text="SANWA"; }; + text.top= 4.5; + text "Vendor2" { left= 10; text="SUPPLY"; }; + text "NumLockLabel" { left= 241; text="Num Lock"; }; + text "CapsLockLabel" { left= 260; text="Caps Lock"; }; + text "ScrollLockLabel" { left= 279; text="Scroll Lock"; }; + + section.left= 3; + row.left= 1; + key.shape= "NORM"; + key.gap= 2; + section "Function" { + key.shape= "TOP"; + top= 10; + row { + top= 1; + keys { , , , , , , , + , , , , , , , + {, color="grey20"}, , {, color="grey20"} + }; + }; + overlay "SCLK" { + = + }; + overlay "FN" { + = + }; + }; // End of "Function" section + + section "Alpha" { + top= 24; + row { + top= 2; + keys { , , , , , , , + {, color="grey20"}, {, color="grey20"}, + {, color="grey20"}, {, color="grey20"}, + , , , { , "TBBK" } + }; + }; + row { + top= 20; + keys { { , "TBBK" }, , , , , , + , {, color="grey20"}, {, color="grey20"}, + {, color="grey20"}, {, color="grey20"}, , + , { , "RTRN" } + }; + }; + row { + top= 38; + keys { { , "CAPS" }, , , , , , + , {, color="grey20"}, {, color="grey20"}, + {, color="grey20"}, {, color="grey20"}, , + + }; + }; + row { + top= 56; + keys { { , "LFSH" }, , , , , , + , {, color="grey20"}, , + {, color="grey20"}, {, color="grey20"}, , + {, color="grey20"}, {, key.shape= "CTSH" } + }; + }; + row { + top= 74; + keys { { , key.shape= "CTSH" }, {, color="grey20"}, + , , , {, "SPCE" }, , , + , , {, color="grey20"}, + {, color="grey20"}, + {, key.shape= "CTSH", color="grey20"} + }; + }; + overlay "SCLK" { + =, =, =, =, + =, =, =, =, + =, =, =, =, + =, =, = + // TODO AB09 is keycode 91 and representes a keypad centered dot + // look-a-like separator. Assumption is made that this is should + // be KPSP (KP_Separator), please confirm this. Second candicate + // is JPCM for evdev, but apparently evdev has been dropped. + }; + overlay "FN" { + =, =, =, = + }; + }; // End of "Alpha" section + + alias = ; + alias = ; + +}; // End of "default" geometry diff -Nrup xkb.org/geometry.dir xkb/geometry.dir --- xkb.org/geometry.dir 2010-10-30 14:00:45.118383000 +0200 +++ xkb/geometry.dir 2010-10-29 21:11:39.377790002 +0200 @@ -124,3 +124,4 @@ h-p----- -------- hhk(basic) -d------ -------- nec(pc98) -d------ -------- amiga(usa1) -------- -------- amiga(de) +-d------ -------- sanwa(sanwa_skb-kg3) diff -Nrup xkb.org/rules/base xkb/rules/base --- xkb.org/rules/base 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/base 2010-10-29 22:02:11.504932011 +0200 @@ -156,6 +156,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwa_skb-kg3 = sanwa(sanwa_skb-kg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) diff -Nrup xkb.org/rules/base.lst xkb/rules/base.lst --- xkb.org/rules/base.lst 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/base.lst 2010-10-29 21:09:37.997790001 +0200 @@ -127,6 +127,7 @@ qtronix QTronix Scorpius 98N+ samsung4500 Samsung SDM 4500P samsung4510 Samsung SDM 4510P + sanwa_skb-kg3 Sanwa Supply Inc. Small Keyboard KG3 sk1300 SK-1300 sk2500 SK-2500 sk6200 SK-6200 diff -Nrup xkb.org/rules/base.xml xkb/rules/base.xml --- xkb.org/rules/base.xml 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/base.xml 2010-10-29 21:12:30.877790000 +0200 @@ -897,6 +897,13 @@ + sanwa_skb-kg3 + Sanwa Supply Inc. Small Keyboard KG3 + Sanwa Supply Inc. + + + + sk1300 SK-1300 NEC @@ -5370,4 +5377,4 @@ - \ No newline at end of file + diff -Nrup xkb.org/rules/evdev xkb/rules/evdev --- xkb.org/rules/evdev 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/evdev 2010-10-29 22:02:20.134932012 +0200 @@ -142,6 +142,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwa_skb-kg3 = sanwa(sanwa_skb-kg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) diff -Nrup xkb.org/rules/evdev.lst xkb/rules/evdev.lst --- xkb.org/rules/evdev.lst 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/evdev.lst 2010-10-29 21:09:44.587790000 +0200 @@ -127,6 +127,7 @@ qtronix QTronix Scorpius 98N+ samsung4500 Samsung SDM 4500P samsung4510 Samsung SDM 4510P + sanwa_skb-kg3 Sanwa Supply Inc. Small Keyboard KG3 sk1300 SK-1300 sk2500 SK-2500 sk6200 SK-6200 diff -Nrup xkb.org/rules/evdev.xml xkb/rules/evdev.xml --- xkb.org/rules/evdev.xml 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/evdev.xml 2010-10-29 21:12:37.927790002 +0200 @@ -897,6 +897,13 @@ + sanwa_skb-kg3 + Sanwa Supply Inc. Small Keyboard KG3 + Sanwa Supply Inc. + + + + sk1300 SK-1300 NEC @@ -5370,4 +5377,4 @@ - \ No newline at end of file + diff -Nrup xkb.org/rules/xfree86 xkb/rules/xfree86 --- xkb.org/rules/xfree86 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xfree86 2010-10-29 22:02:11.504932011 +0200 @@ -156,6 +156,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwa_skb-kg3 = sanwa(sanwa_skb-kg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) diff -Nrup xkb.org/rules/xfree86.lst xkb/rules/xfree86.lst --- xkb.org/rules/xfree86.lst 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xfree86.lst 2010-10-29 21:09:37.997790001 +0200 @@ -127,6 +127,7 @@ qtronix QTronix Scorpius 98N+ samsung4500 Samsung SDM 4500P samsung4510 Samsung SDM 4510P + sanwa_skb-kg3 Sanwa Supply Inc. Small Keyboard KG3 sk1300 SK-1300 sk2500 SK-2500 sk6200 SK-6200 diff -Nrup xkb.org/rules/xfree86.xml xkb/rules/xfree86.xml --- xkb.org/rules/xfree86.xml 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xfree86.xml 2010-10-29 21:12:30.877790000 +0200 @@ -897,6 +897,13 @@ + sanwa_skb-kg3 + Sanwa Supply Inc. Small Keyboard KG3 + Sanwa Supply Inc. + + + + sk1300 SK-1300 NEC @@ -5370,4 +5377,4 @@ - \ No newline at end of file + diff -Nrup xkb.org/rules/xorg xkb/rules/xorg --- xkb.org/rules/xorg 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xorg 2010-10-29 22:02:11.504932011 +0200 @@ -156,6 +156,7 @@ hpmini110 = hp(mini110) hpdv5 = hp(dv5) omnikey101 = northgate(omnikey101) + sanwa_skb-kg3 = sanwa(sanwa_skb-kg3) $pcmodels = pc(%m) $pcgeometries = pc(%m) everex = everex(STEPnote) diff -Nrup xkb.org/rules/xorg.lst xkb/rules/xorg.lst --- xkb.org/rules/xorg.lst 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xorg.lst 2010-10-29 21:09:37.997790001 +0200 @@ -127,6 +127,7 @@ qtronix QTronix Scorpius 98N+ samsung4500 Samsung SDM 4500P samsung4510 Samsung SDM 4510P + sanwa_skb-kg3 Sanwa Supply Inc. Small Keyboard KG3 sk1300 SK-1300 sk2500 SK-2500 sk6200 SK-6200 diff -Nrup xkb.org/rules/xorg.xml xkb/rules/xorg.xml --- xkb.org/rules/xorg.xml 2010-04-15 14:12:21.000000000 +0200 +++ xkb/rules/xorg.xml 2010-10-29 21:12:30.877790000 +0200 @@ -897,6 +897,13 @@ + sanwa_skb-kg3 + Sanwa Supply Inc. Small Keyboard KG3 + Sanwa Supply Inc. + + + + sk1300 SK-1300 NEC @@ -5370,4 +5377,4 @@ - \ No newline at end of file + diff -Nrup xkb.org/symbols.dir xkb/symbols.dir --- xkb.org/symbols.dir 2010-04-15 14:12:22.000000000 +0200 +++ xkb/symbols.dir 2010-10-29 21:50:09.804932005 +0200 @@ -541,6 +541,7 @@ h-p----- a------- jp(common) --p----- a------- jp(kana) --p----- a------- jp(nicola_f_bs) --p----- a------- jp(mac) +--p----- a------- jp(sanwa_skb-kg3) -d------ a------- kr(kr106) -------- a------- kr(kr104) h-p----- ---f---- kr(koreankeys)