Index: geometry/pc =================================================================== RCS file: /cvs/xlibs/xkbdesc/geometry/pc,v retrieving revision 1.2 diff -u -p -r1.2 pc --- geometry/pc 10 Jan 2006 21:19:16 -0000 1.2 +++ geometry/pc 24 Jun 2006 23:08:44 -0000 @@ -1157,3 +1157,164 @@ xkb_geometry "pc86" { alias = ; alias = ; }; // End of "pc86" geometry + +xkb_geometry "kr106" { + + description= "Korean 106"; + width= 470; + height= 210; + + shape.cornerRadius= 1; + shape "NORM" { { [ 18,18] }, { [2,1], [ 16,16] } }; + shape "BKSP" { { [ 38,18] }, { [2,1], [ 36,16] } }; + shape "TABK" { { [ 28,18] }, { [2,1], [ 26,16] } }; + shape "BKSL" { { [ 28,18] }, { [2,1], [ 26,16] } }; + shape "RTRN" { { [ 42,18] }, { [2,1], [ 40,16] } }; + shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } }; + shape "LFSH" { { [ 42,18] }, { [2,1], [ 40,16] } }; + shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,16] } }; + shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } }; + shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } }; + shape "SPCE" { { [ 75,18] }, { [2,1], [ 73,16] } }; + shape "KP0" { { [ 37,18] }, { [2,1], [ 35,16] } }; + shape "KPAD" { { [ 18,37] }, { [2,1], [ 16,35] } }; + + shape "LEDS" { cornerRadius= 0, { [ 75 ,20 ] } }; + shape "LED" { cornerRadius= 0, { [ 5, 1 ] } }; + solid "LedPanel" { + shape= "LEDS"; + top= 52; + left= 377; + color= "grey10"; + }; + + indicator.onColor= "green"; + indicator.offColor= "green30"; + indicator.top= 67; + indicator.shape= "LED"; + indicator "Num Lock" { left= 382; }; + indicator "Caps Lock" { left= 407; }; + indicator "Scroll Lock" { left= 433; }; + text.top= 55; + text.color= "black"; + text "NumLockLabel" { left= 378; text="Num\nLock"; }; + text "CapsLockLabel" { left= 403; text="Caps\nLock"; }; + text "ScrollLockLabel" { left= 428; text="Scroll\nLock"; }; + + section.left= 19; + row.left= 1; + key.shape= "NORM"; + key.gap= 1; + section "Function" { + top= 52; + row { + top= 1; + keys { { , color="grey20" }, + { , 20 }, , , , + { , 11 }, , , , + { , 11 }, , , , + { , 8 }, , + }; + }; + }; // End of "Function" section + + section "Alpha" { + top= 91; + row { + top= 1; + keys { , , , , , + , , , , , + , , , + { , "BKSP", color="grey20" } + }; + }; + row { + top= 20; + keys { { , "TABK", color="grey20" }, + , , , , , + , , , , , + , , { , "BKSL" } + }; + }; + row { + top= 39; + keys { { , "CAPS", color="grey20" }, + , , , , , + , , , , , + , { , "RTRN", color="grey20" } + }; + }; + row { + top= 58; + keys { { , "LFSH", color="grey20" }, + , , , , , + , , , , , + { , "RTSH", color="grey20" } + }; + }; + row { + top= 77; + key.shape= "SMOD"; + key.color= "grey20"; + keys { { , "MODK" }, , , + { , "NORM", color="white" }, + { , "SPCE", color="white" }, + { , "NORM", color="white" }, + , , , + }; + }; + }; // End of "Alpha" section + + section "Editing" { + top= 91; + left= 312; + key.color= "grey20"; + row { + top= 1; + keys { , , }; + }; + row { + top= 20; + keys { , , }; + }; + row { + top= 58; + left= 20; + keys { }; + }; + row { + top= 77; + keys { , , }; + }; + }; // End of "Editing" section + + section "Keypad" { + top= 91; + left= 376; + row { + top= 1; + key.color= "grey20"; + keys { , , , }; + }; + row { + top= 20; + keys { , , , { , "KPAD", color="grey20" } }; + }; + row { + top= 39; + keys { , , }; + }; + row { + top= 58; + keys { , , , { , "KPAD", color="grey20" } }; + }; + row { + top= 77; + keys { { , "KP0" }, }; + }; + }; // End of "Keypad" section + + alias = ; + alias = ; + +}; // End of "kr106" geometry Index: rules/base.lists.part =================================================================== RCS file: /cvs/xlibs/xkbdesc/rules/base.lists.part,v retrieving revision 1.20 diff -u -p -r1.20 base.lists.part --- rules/base.lists.part 28 May 2006 21:31:19 -0000 1.20 +++ rules/base.lists.part 24 Jun 2006 23:08:44 -0000 @@ -2,7 +2,7 @@ // If you want non-latin layouts implicitly include the en_US layout // uncomment lines below //! $nonlatin = am ara ben bd bg bt by cs deva ge gh gr guj guru il \ -// in ir iku jp kan kh la lao lk mk mm mn mv mal ori pk \ +// in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \ // ru scc sy syr tel th tj tam ua uz ! $pcmodels = pc101 pc102 pc104 pc105 Index: rules/base.m_g.part =================================================================== RCS file: /cvs/xlibs/xkbdesc/rules/base.m_g.part,v retrieving revision 1.3 diff -u -p -r1.3 base.m_g.part --- rules/base.m_g.part 20 Jul 2004 01:29:47 -0000 1.3 +++ rules/base.m_g.part 24 Jun 2006 23:08:44 -0000 @@ -9,6 +9,7 @@ thinkpad = ibm_vndr/thinkpad(common) $pcmodels = pc(%m) jp106 = pc(jp106) + kr106 = pc(kr106) everex = everex(STEPnote) winbook = winbook(XP5) pc98 = nec(pc98) Index: rules/base.xml.in =================================================================== RCS file: /cvs/xlibs/xkbdesc/rules/base.xml.in,v retrieving revision 1.128 diff -u -p -r1.128 base.xml.in --- rules/base.xml.in 14 Jun 2006 21:43:30 -0000 1.128 +++ rules/base.xml.in 24 Jun 2006 23:08:44 -0000 @@ -746,6 +746,12 @@ <_description>Laptop/notebook eMachines m68xx + + + kr106 + <_description>Korean 106-key + + @@ -2619,6 +2625,21 @@ <_description>Esperanto + + + kr + <_shortDescription>Kor + <_description>Korea, Republic of + + + + + kr104 + <_description>101/104 key Compatible + + + + Index: symbols/kr =================================================================== RCS file: /cvs/xlibs/xkbdesc/symbols/kr,v retrieving revision 1.2 diff -u -p -r1.2 kr --- symbols/kr 2 Apr 2006 20:08:48 -0000 1.2 +++ symbols/kr 24 Jun 2006 23:08:45 -0000 @@ -1,7 +1,25 @@ -partial default alphanumeric_keys -xkb_symbols "hangul_keys" { - include "us" - name[Group1]= "Korea, Republic of"; - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; +default alphanumeric_keys +xkb_symbols "kr106" { + include "us" + include "kr(koreankeys)" }; + +alphanumeric_keys +xkb_symbols "kr104" { + include "us" + include "kr(koreankeys)" + include "kr(koreankeys_raltctl)" +}; + +partial function_keys +xkb_symbols "koreankeys" { + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; +}; + +partial function_keys +xkb_symbols "koreankeys_raltctl" { + key { [ Hangul ] }; + key { [ Hangul_Hanja ] }; +}; +