From 478424105f049394c06ea1134b6f1816a163426e Mon Sep 17 00:00:00 2001 From: svu Date: Tue, 5 Sep 2006 22:05:38 +0000 Subject: getting rid of geometry/ibm_vndr, b.fd.o#7990 --- geometry/Makefile.am | 4 +- geometry/ibm_vndr/.cvsignore | 2 - geometry/ibm_vndr/Makefile.am | 4 - geometry/ibm_vndr/thinkpad | 267 ------------------------------------------ geometry/thinkpad | 267 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 269 insertions(+), 275 deletions(-) delete mode 100644 geometry/ibm_vndr/.cvsignore delete mode 100644 geometry/ibm_vndr/Makefile.am delete mode 100644 geometry/ibm_vndr/thinkpad create mode 100644 geometry/thinkpad (limited to 'geometry') diff --git a/geometry/Makefile.am b/geometry/Makefile.am index 26a19c0..c54eb2b 100644 --- a/geometry/Makefile.am +++ b/geometry/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = digital_vndr ibm_vndr sgi_vndr +SUBDIRS = digital_vndr sgi_vndr geomdir = $(xkb_base)/geometry @@ -7,7 +7,7 @@ amiga ataritt chicony \ dell everex fujitsu \ hp keytronic kinesis \ macintosh microsoft nec \ -northgate pc sony \ +northgate pc sony thinkpad \ sun winbook README include $(top_srcdir)/xkbrules.am diff --git a/geometry/ibm_vndr/.cvsignore b/geometry/ibm_vndr/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/geometry/ibm_vndr/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am deleted file mode 100644 index 84130ac..0000000 --- a/geometry/ibm_vndr/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -geomdir = $(xkb_base)/geometry/ibm_vndr - -dist_geom_DATA = \ -thinkpad diff --git a/geometry/ibm_vndr/thinkpad b/geometry/ibm_vndr/thinkpad deleted file mode 100644 index 6599c41..0000000 --- a/geometry/ibm_vndr/thinkpad +++ /dev/null @@ -1,267 +0,0 @@ -// -*- indent-tabs-mode: nil -*- -// $XFree86: xc/programs/xkbcomp/geometry/ibm/thinkpad,v 1.3 2003/08/09 14:30:48 pascal Exp $ - -// Created by Alexander Pohoyda -// Geometry specification for IBM ThinkPad keyboard. -// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U, -// THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3, -// THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U, -// THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U, -// THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U, -// THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU, -// THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U, -// THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU, -// THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU, -// THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD, -// THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U - -xkb_geometry "common" { - width = 290; - height = 150; - baseColor = "grey80"; - labelColor = "white"; - - shape "FN0" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } }; - shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } }; - shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } }; - shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } }; - shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] }, - { [1, 0], [26, 16] }, - { [2.5, 0], [24.5, 14] } }; - shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } }; - shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } }; - shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } }; - shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } }; - - shape "LED" { cornerRadius = 2, { [3, 3] } }; - - shape "KEYS" { cornerRadius = 2, - { [0, 0], [19, 0], [19, 13], [172, 13], - [172, 0], [286, 0], [286, 138], [216, 138], - [216, 124], [0, 124] } }; - - solid "KeyPanel" { - shape = "KEYS"; - left = 2; - top = 5; - color = "black"; - }; - - shape "NULL1" { cornerRadius = 1, - { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4], - [16, 4], [16, 18], [0, 18] } }; - - solid "NullPanel1" { - shape = "NULL1"; - left = 237; - top = 110; - color = "grey80"; - }; - - shape "NULL2" { cornerRadius = 1, { [17, 13] } }; - - solid "NullPanel2" { - shape = "NULL2"; - left = 219; - top = 129; - color = "grey80"; - }; - - shape "NULL3" { cornerRadius = 1, - { [0, 26], - [72, 26], [72, 13], [76, 13], [76, 26], - [149, 26], [149, 13], [153, 13], [153, 26], - [226, 26], [226, 0], [230, 0], [230, 26], - [284, 26], [285, 27], - [0, 27] } }; - - solid "NullPanel3" { - shape = "NULL3"; - left = 3; - top = 6; - color = "grey80"; - }; - - indicator.onColor = "green"; - indicator.offColor = "grey10"; - indicator.top = 4; - indicator.shape = "LED"; - indicator "HDDActivity" { onColor = "red"; left = 100; }; - indicator "Num Lock" { left = 108; }; - indicator "Caps Lock" { left = 114; }; - indicator "Scroll Lock" { left = 120; }; - indicator "Power" { left = 128; }; - - key.gap = 1; - key.color = "grey60"; - - section "Function" { - left = 2; - top = 5; - key.shape = "FN0"; - row { - top = 1; - keys { , { , 155 }, , }; - }; - row { - top = 14; - keys { , , , , - { , 6 }, , , , - { , 6 }, , , - }; - }; - }; // End of "Function" section - - section "Control" { - left= 2; - top = 109; - key.shape = "MODK"; - row { - top = 1; - keys { { , "NORM" }, , , - { , "SPCE" }, , - }; - }; - }; // End of "Control" section - - section "Editing" { - top = 5; - left = 233; - key.shape = "FN0"; - row { - top = 1; - keys { , , }; - }; - row { - top = 14; - keys { , , }; - }; - }; // End of "Editing" section - - section "Navigation" { - top = 114; - left = 236; - key.shape = "ARRS"; - row { - top = 1; - left = 17; - keys { }; - }; - row { - top = 15; - keys { , , }; - }; - }; // End of "Navigation" section - - shape "STIK" { cornerRadius = 4, { [7, 7] } }; - - solid "STIK" { - priority = 255; - color = "red"; - shape = "STIK"; - top = 85; - left = 126; - }; -}; - -// 85 keys -// US/English (FRU 02K4785). -xkb_geometry "us" { - include "ibm_vndr/thinkpad(common)" - description = "IBM ThinkPad 560Z/600/600E/A22E, US"; - - shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; - shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; - shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } }; - - section "Alpha" { - left = 2; - top = 33; - key.gap = 1; - key.color = "grey60"; - key.shape = "NORM"; - row { - top = 1; - keys { , , , , , - , , , , , - , , , { , "BKSP" } - }; - }; - row { - top = 20; - keys { { , "TABK" }, - , , , , , - , , , , , - , , { , "BKSL" } - }; - }; - row { - top = 39; - keys { { , "CAPS" }, - , , , , , - , , , , , - , { , "RTRN" } - }; - }; - row { - top = 58; - keys { { , "LFSH" }, - , , , , , - , , , , , - { , "RTSH" } - }; - }; - }; // End of "Alpha" section -}; - -// 86 keys -// Tested on: DE/German, UK/English (FRU 02K4787). -xkb_geometry "intl" { - include "ibm_vndr/thinkpad(common)" - description = "IBM ThinkPad 560Z/600/600E/A22E, Intl"; - - shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18], - [0, 18], [0, 0] }, - { [25.5, 0], [25.5, 33], [6.5, 33], - [6.5, 14], [2.5, 14], [2.5, 0] } }; - shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } }; - - section "Alpha" { - left = 2; - top = 33; - key.gap = 1; - key.color = "grey60"; - key.shape = "NORM"; - row { - top = 1; - keys { , , , , , - , , , , , - , , , { , "BKSP" } - }; - }; - row { - top = 20; - keys { { , "TABK" }, - , , , , , - , , , , , - , , { , "RTRN" } - }; - }; - row { - top = 39; - keys { { , "CAPS" }, - , , , , , - , , , , , - , - }; - }; - row { - top = 58; - keys { { , "LFSH" }, , - , , , , , - , , , , , - { , "RTSH" } - }; - }; - }; // End of "Alpha" section -}; diff --git a/geometry/thinkpad b/geometry/thinkpad new file mode 100644 index 0000000..6599c41 --- /dev/null +++ b/geometry/thinkpad @@ -0,0 +1,267 @@ +// -*- indent-tabs-mode: nil -*- +// $XFree86: xc/programs/xkbcomp/geometry/ibm/thinkpad,v 1.3 2003/08/09 14:30:48 pascal Exp $ + +// Created by Alexander Pohoyda +// Geometry specification for IBM ThinkPad keyboard. +// Compatible Models: THINKPAD 560Z 2640-90U, THINKPAD 560Z 2640-91U, +// THINKPAD 560Z 2640-B0U, THINKPAD 560Z 2640-B1U, THINKPAD 560Z 2640-RR3, +// THINKPAD 600 2645-31U, THINKPAD 600 2645-35U, THINKPAD 600 2645-41U, +// THINKPAD 600 2645-42U, THINKPAD 600 2645-45U, THINKPAD 600 2645-48U, +// THINKPAD 600 2645-51U, THINKPAD 600 2645-85U, THINKPAD 600 2645-A1U, +// THINKPAD 600 2645-RR1, THINKPAD 600 2645-RR2, THINKPAD 600E 2645-3AU, +// THINKPAD 600E 2645-4AU, THINKPAD 600E 2645-4BU, THINKPAD 600E 2645-55U, +// THINKPAD 600E 2645-5AU, THINKPAD 600E 2645-5BU, THINKPAD 600E 2645-5JU, +// THINKPAD 600E 2645-8AO, THINKPAD 600E 2645-8AU, THINKPAD 600E 2645-8BU, +// THINKPAD 600E 2645-AAU, THINKPAD 600E 2645-RRB, THINKPAD 600E 2645-RRD, +// THINKPAD 600E 2645-RRF, THINKPAD 600E 2645-RRS, THINKPAD A22E 2645-45U + +xkb_geometry "common" { + width = 290; + height = 150; + baseColor = "grey80"; + labelColor = "white"; + + shape "FN0" { cornerRadius = 1, { [17, 12] }, { [2, 0], [15, 10] } }; + shape "NORM" { cornerRadius = 1, { [18, 18] }, { [2.5, 0], [15.5, 14] } }; + shape "BKSP" { cornerRadius = 1, { [37, 18] }, { [2.5, 0], [34.5, 14] } }; + shape "TABK" { cornerRadius = 1, { [27, 18] }, { [2.5, 0], [24.5, 14] } }; + shape "CAPS" { cornerRadius = 1, { [31, 18] }, { [1, 0], [30, 16] }, + { [1, 0], [26, 16] }, + { [2.5, 0], [24.5, 14] } }; + shape "RTSH" { cornerRadius = 1, { [50, 18] }, { [2.5, 0], [46.5, 14] } }; + shape "MODK" { cornerRadius = 1, { [27.5, 18] }, { [2.5, 0], [25, 14] } }; + shape "SPCE" { cornerRadius = 1, { [100, 18] }, { [2.5, 0], [97.5, 14] } }; + shape "ARRS" { cornerRadius = 1, { [16, 13] }, { [1.5, 0], [14.5, 11] } }; + + shape "LED" { cornerRadius = 2, { [3, 3] } }; + + shape "KEYS" { cornerRadius = 2, + { [0, 0], [19, 0], [19, 13], [172, 13], + [172, 0], [286, 0], [286, 138], [216, 138], + [216, 124], [0, 124] } }; + + solid "KeyPanel" { + shape = "KEYS"; + left = 2; + top = 5; + color = "black"; + }; + + shape "NULL1" { cornerRadius = 1, + { [0, 0], [50, 0], [50, 18], [34, 18], [34, 4], + [16, 4], [16, 18], [0, 18] } }; + + solid "NullPanel1" { + shape = "NULL1"; + left = 237; + top = 110; + color = "grey80"; + }; + + shape "NULL2" { cornerRadius = 1, { [17, 13] } }; + + solid "NullPanel2" { + shape = "NULL2"; + left = 219; + top = 129; + color = "grey80"; + }; + + shape "NULL3" { cornerRadius = 1, + { [0, 26], + [72, 26], [72, 13], [76, 13], [76, 26], + [149, 26], [149, 13], [153, 13], [153, 26], + [226, 26], [226, 0], [230, 0], [230, 26], + [284, 26], [285, 27], + [0, 27] } }; + + solid "NullPanel3" { + shape = "NULL3"; + left = 3; + top = 6; + color = "grey80"; + }; + + indicator.onColor = "green"; + indicator.offColor = "grey10"; + indicator.top = 4; + indicator.shape = "LED"; + indicator "HDDActivity" { onColor = "red"; left = 100; }; + indicator "Num Lock" { left = 108; }; + indicator "Caps Lock" { left = 114; }; + indicator "Scroll Lock" { left = 120; }; + indicator "Power" { left = 128; }; + + key.gap = 1; + key.color = "grey60"; + + section "Function" { + left = 2; + top = 5; + key.shape = "FN0"; + row { + top = 1; + keys { , { , 155 }, , }; + }; + row { + top = 14; + keys { , , , , + { , 6 }, , , , + { , 6 }, , , + }; + }; + }; // End of "Function" section + + section "Control" { + left= 2; + top = 109; + key.shape = "MODK"; + row { + top = 1; + keys { { , "NORM" }, , , + { , "SPCE" }, , + }; + }; + }; // End of "Control" section + + section "Editing" { + top = 5; + left = 233; + key.shape = "FN0"; + row { + top = 1; + keys { , , }; + }; + row { + top = 14; + keys { , , }; + }; + }; // End of "Editing" section + + section "Navigation" { + top = 114; + left = 236; + key.shape = "ARRS"; + row { + top = 1; + left = 17; + keys { }; + }; + row { + top = 15; + keys { , , }; + }; + }; // End of "Navigation" section + + shape "STIK" { cornerRadius = 4, { [7, 7] } }; + + solid "STIK" { + priority = 255; + color = "red"; + shape = "STIK"; + top = 85; + left = 126; + }; +}; + +// 85 keys +// US/English (FRU 02K4785). +xkb_geometry "us" { + include "ibm_vndr/thinkpad(common)" + description = "IBM ThinkPad 560Z/600/600E/A22E, US"; + + shape "RTRN" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; + shape "LFSH" { cornerRadius = 1, { [43, 18] }, { [2.5, 0], [40.5, 14] } }; + shape "BKSL" { cornerRadius = 1, { [28, 18] }, { [2.5, 0], [25.5, 14] } }; + + section "Alpha" { + left = 2; + top = 33; + key.gap = 1; + key.color = "grey60"; + key.shape = "NORM"; + row { + top = 1; + keys { , , , , , + , , , , , + , , , { , "BKSP" } + }; + }; + row { + top = 20; + keys { { , "TABK" }, + , , , , , + , , , , , + , , { , "BKSL" } + }; + }; + row { + top = 39; + keys { { , "CAPS" }, + , , , , , + , , , , , + , { , "RTRN" } + }; + }; + row { + top = 58; + keys { { , "LFSH" }, + , , , , , + , , , , , + { , "RTSH" } + }; + }; + }; // End of "Alpha" section +}; + +// 86 keys +// Tested on: DE/German, UK/English (FRU 02K4787). +xkb_geometry "intl" { + include "ibm_vndr/thinkpad(common)" + description = "IBM ThinkPad 560Z/600/600E/A22E, Intl"; + + shape "RTRN" { cornerRadius = 1, { [28, 0], [28, 37], [4, 37], [4, 18], + [0, 18], [0, 0] }, + { [25.5, 0], [25.5, 33], [6.5, 33], + [6.5, 14], [2.5, 14], [2.5, 0] } }; + shape "LFSH" { cornerRadius = 1, { [24, 18] }, { [2.5, 0], [21.5, 14] } }; + + section "Alpha" { + left = 2; + top = 33; + key.gap = 1; + key.color = "grey60"; + key.shape = "NORM"; + row { + top = 1; + keys { , , , , , + , , , , , + , , , { , "BKSP" } + }; + }; + row { + top = 20; + keys { { , "TABK" }, + , , , , , + , , , , , + , , { , "RTRN" } + }; + }; + row { + top = 39; + keys { { , "CAPS" }, + , , , , , + , , , , , + , + }; + }; + row { + top = 58; + keys { { , "LFSH" }, , + , , , , , + , , , , , + { , "RTSH" } + }; + }; + }; // End of "Alpha" section +}; -- cgit v1.2.1