Index: geometry/thinkpad =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/geometry/thinkpad,v retrieving revision 1.2 diff -u -r1.2 thinkpad --- geometry/thinkpad 28 Sep 2006 20:33:00 -0000 1.2 +++ geometry/thinkpad 7 Jan 2008 13:01:40 -0000 @@ -265,3 +265,207 @@ }; }; // End of "Alpha" section }; + +xkb_geometry "60" { + width = 290; + height = 140; + baseColor = "grey80"; + labelColor = "white"; + + shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2, 0], [16, 16] } }; + + shape "ESC" { cornerRadius = 1, { [17, 13] }, { [1.5, 0], [15.5, 12] } }; + shape "FN0" { cornerRadius = 1, { [17, 11] }, { [1.5, 0], [15.5, 10] } }; + + shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2, 0], [35, 16] } }; + + shape "TABK" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } }; + shape "BKSL" { cornerRadius = 1, { [27.5, 18] }, { [2, 0], [25.5, 16] } }; + + shape "CAPS" { cornerRadius = 1, { [30.5, 18] }, { [2, 0], [28.5, 16] } }; + shape "RTRN" { cornerRadius = 1, { [43.5, 18] }, { [2, 0], [41.5, 16] } }; + + shape "LFSH" { cornerRadius = 1, { [40, 18] }, { [2, 0], [38, 16] } }; + shape "RTSH" { cornerRadius = 1, { [53, 18] }, { [2, 0], [51, 16] } }; + + shape "LCTL" { cornerRadius = 1, { [21, 18] }, { [2, 0], [19, 16] } }; + shape "LWIN" { cornerRadius = 1, { [15, 18] }, { [1.5, 0], [13.5, 16] } }; + + shape "SPCE" { cornerRadius = 1, { [97, 18] }, { [2, 0], [95, 16] } }; + + shape "ARR1" { cornerRadius = 1, { [17, 13] }, { [1.5, 0], [15.5, 12] } }; + shape "ARR2" { cornerRadius = 1, { [17, 11] }, { [1.5, 0], [15.5, 10] } }; + + shape "VOL" { cornerRadius = 2.5, { [5, 5] } }; + shape "TVTG" { cornerRadius = 0.5, { [0, 1], [17, 1], [17, 4], [0, 4] } }; + + shape "KEYS" { cornerRadius = 2, + { [0, 0], [19, 0], [19, 16], [172, 16], + [172, 4], [286, 4], [286, 133], [231, 133], + [231, 126], [0, 126] } }; + + solid "KeyPanel" { + shape = "KEYS"; + left = 2; + top = 3; + color = "black"; + }; + + shape "NULL0" { cornerRadius = 0.5, + { [0, 26], + [72, 26], [72, 14], [76, 14], [76, 26], + [149, 26], [149, 14], [153, 14], [153, 26], + [226, 26], [226, 2], [230, 2], [230, 26], + [284, 26], [284, 27], + [0, 27] } }; + + solid "NullPanel0" { + shape = "NULL0"; + left = 3; + top = 6; + color = "grey80"; + }; + + shape "NULL1" { cornerRadius = 0.5, { [0, 12], [17, 12], [17, 13], [0, 13] } }; + + solid "NullPanel1" { + shape = "NULL1"; + left = 3; + top = 6; + color = "grey80"; + }; + + shape "MEDIA" { cornerRadius = 0.5, { [0, 0], [55, 0], [55, 10], [0, 10] } }; + + solid "MediaPanel" { + shape = "MEDIA"; + left = 25.5; + top = 6; + color = "black"; + }; + + section "Volume" { + left = 22; + top = 8.5; + key.shape = "VOL"; + key.gap = 6; + key.color = "grey20"; + + row { + keys { , , , {, "TVTG", color = "blue"} }; + }; + }; + + key.gap = 1; + key.color = "grey60"; + + section "Function" { + left = 2; + top = 3; + key.shape = "FN0"; + row { + key.shape = "ESC"; + top = 1; + keys { }; + }; + row { + top = 5; + keys { { , 173 }, , }; + }; + row { + top = 17; + keys { , , , , + { , 6 }, , , , + { , 6 }, , , + }; + }; + }; // End of "Function" section + + section "Control" { + left = 2; + top = 109; + key.shape = "NORM"; + row { + top = 1; + keys { , { , "LCTL" }, { , "LWIN" }, , + { , "SPCE" }, , , + }; + }; + }; // End of "Control" section + + section "Editing" { + top = 7; + left = 233; + key.shape = "FN0"; + row { + top = 1; + keys { , , }; + }; + row { + top = 13; + keys { , , }; + }; + }; // End of "Editing" section + + section "Navigation" { + top = 109; + left = 233; + row { + key.shape = "ARR1"; + top = 1; + keys { , , }; + }; + row { + key.shape = "ARR2"; + top = 15; + keys { , , }; + }; + }; // End of "Navigation" section + + shape "STIK" { cornerRadius = 3.5, { [7, 7] } }; + + solid "STIK" { + priority = 255; + color = "red"; + shape = "STIK"; + top = 85.5; + left = 125.5; + }; + + section "Alpha" { + left = 2; + top = 33; + key.shape = "NORM"; + row { + top = 1; + keys { , , , , , + , , , , , + , , , { , "BKSP" } + }; + }; + row { + top = 20; + keys { { , "TABK" }, + , , , , , + , , , , , + , , { , "BKSL" } + }; + }; + row { + top = 39; + keys { { , "CAPS" }, + , , , , , + , , , , , + , { , "RTRN", color = "blue" } + }; + }; + row { + top = 58; + keys { { , "LFSH" }, + , , , , , + , , , , , + { , "RTSH" } + }; + }; + }; // End of "Alpha" section +}; Index: keycodes/xfree86 =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/keycodes/xfree86,v retrieving revision 1.8 diff -u -r1.8 xfree86 --- keycodes/xfree86 29 Aug 2007 22:01:48 -0000 1.8 +++ keycodes/xfree86 7 Jan 2008 13:01:41 -0000 @@ -415,3 +415,9 @@ include "xfree86(xfree86)" = 134; }; + +// IBM ThinkPad 60 series +xkb_keycodes "thinkpad60" { + include "xfree86(xfree86)" + = 227; +}; Index: rules/base.lists.part =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.lists.part,v retrieving revision 1.52 diff -u -r1.52 base.lists.part --- rules/base.lists.part 4 Jan 2008 21:07:53 -0000 1.52 +++ rules/base.lists.part 7 Jan 2008 13:01:41 -0000 @@ -54,7 +54,7 @@ oretec \ presario propeller \ qtronix \ - rapidaccess rapidaccess2 rapidaccess2a thinkpad \ + rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \ samsung4500 samsung4510 \ scorpius silvercrest \ sk1300 sk2500 sk6200 sk7100 sp_inet \ Index: rules/base.m_g.part =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_g.part,v retrieving revision 1.14 diff -u -r1.14 base.m_g.part --- rules/base.m_g.part 10 Oct 2007 23:06:13 -0000 1.14 +++ rules/base.m_g.part 7 Jan 2008 13:01:41 -0000 @@ -9,6 +9,7 @@ $pcgeometries = pc(%m) everex = everex(STEPnote) thinkpad = thinkpad(intl) + thinkpad60 = thinkpad(60) winbook = winbook(XP5) pc98 = nec(pc98) $macbooks = macintosh(%m) Index: rules/base.m_k.part =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.m_k.part,v retrieving revision 1.14 diff -u -r1.14 base.m_k.part --- rules/base.m_k.part 17 Dec 2007 20:56:27 -0000 1.14 +++ rules/base.m_k.part 7 Jan 2008 13:01:41 -0000 @@ -12,4 +12,5 @@ macintosh_old = macintosh(old) $macbooks = macintosh+macintosh(goodmap) $macs = macintosh + thinkpad60 = xfree86(thinkpad60) * = xfree86 Index: rules/base.xml.in =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/rules/base.xml.in,v retrieving revision 1.237 diff -u -r1.237 base.xml.in --- rules/base.xml.in 4 Jan 2008 21:07:53 -0000 1.237 +++ rules/base.xml.in 7 Jan 2008 13:01:43 -0000 @@ -541,6 +541,12 @@ + thinkpad60 + <_description>IBM ThinkPad R60/T60/Z60m/Z60t/R61/T61/Z61m/Z61t + + + + logiaccess <_description>Logitech Access Keyboard Logitech Index: symbols/inet =================================================================== RCS file: /cvs/xkeyboard-config/xkeyboard-config/symbols/inet,v retrieving revision 1.79 diff -u -r1.79 inet --- symbols/inet 4 Jan 2008 21:07:53 -0000 1.79 +++ symbols/inet 7 Jan 2008 13:01:45 -0000 @@ -1256,6 +1256,15 @@ }; +// IBM ThinkPad 60 series +partial alphanumeric_keys +xkb_symbols "thinkpad60" { + include "inet(media_nav_common)" + + key { [ XF86VendorHome ] }; +}; + + // Logitech // Logitech common definitions