summaryrefslogtreecommitdiff
path: root/geometry
diff options
context:
space:
mode:
authorsvu <svu>2006-04-08 01:06:51 +0000
committersvu <svu>2006-04-08 01:06:51 +0000
commit68100c25a277d52968bc9e7d4a33423e334e0eec (patch)
tree00543f6397a7ac7f91ad35dabb6b3f160c0863dd /geometry
parentfee86435c2b82c3bd4f8c7f4606ce920f16af4cb (diff)
downloadxkeyboard-config-68100c25a277d52968bc9e7d4a33423e334e0eec.tar.gz
xkeyboard-config-68100c25a277d52968bc9e7d4a33423e334e0eec.tar.bz2
xkeyboard-config-68100c25a277d52968bc9e7d4a33423e334e0eec.zip
fixed mac geometry, b.fd.o#4714
Diffstat (limited to 'geometry')
-rw-r--r--geometry/macintosh161
1 files changed, 159 insertions, 2 deletions
diff --git a/geometry/macintosh b/geometry/macintosh
index f97251fc..5ecdcf8c 100644
--- a/geometry/macintosh
+++ b/geometry/macintosh
@@ -7,6 +7,11 @@
// - Added a special Macintosh sysctl key
// - Minor changes (Function keys shape, LED position...)
+// Minor changes
+// - Mail address above is no longer valid
+// - Changed {L,R}MTA to {L,R}WIN, which are defined
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
default xkb_geometry "macintosh" {
description= "Apple Extended Keyboard II";
@@ -115,9 +120,9 @@ default xkb_geometry "macintosh" {
row {
top= 77;
keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
- { <LMTA>, "LMTA" },
+ { <LWIN>, "LMTA" },
{ <SPCE>, "SPCE" },
- { <RMTA>, "RMTA" },
+ { <RWIN>, "RMTA" },
{ <RALT>, "RALT" }, { <RCTL>, "RCTL" }
};
};
@@ -172,3 +177,155 @@ default xkb_geometry "macintosh" {
}; // End of "Keypad" section
}; // End of "default" geometry
+
+
+// This section describes the geometry of the "Apple Pro" keyboard
+// included with NewWorld desktop machines
+//
+// It adds four new keysyms, labeled SDDN, SDUP, SDNO, EJCT.
+//
+// 2005/10 -- Simon Vallet <svallet@gmail.com>
+
+xkb_geometry "applepro" {
+
+ description= "Apple Pro Keyboard";
+ width = 455;
+ height = 150;
+
+ shape.cornerRadius= 1;
+ shape "NORM" { { [ 18, 18] }, { [2, 1], [ 16, 15] } };
+ shape "FUNC" { { [ 18, 21] }, { [2, 1], [ 16, 16] } };
+ shape "BKSP" { { [ 38, 18] }, { [2, 1], [ 36, 15] } };
+ shape "TAB" { { [ 29, 18] }, { [2, 1], [ 26, 15] } };
+ shape "LFSH" { { [ 28, 18] }, { [2, 1], [ 26, 15] } };
+ shape "RTSH" { { [ 47, 18] }, { [2, 1], [ 45, 15] } };
+
+ shape "RTRN" {
+ { [0,0],[27,0],[27,37],[4,37],[4,18],[0,18] },
+ { [2,1],[25,1],[25,34],[6,34],[6,15],[2,15] } };
+
+ shape "CAPS" { { [ 32, 18] }, { [2, 1], [ 26, 15] } };
+ shape "LCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+ shape "RCTL" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+ shape "LALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+ shape "RALT" { { [ 23, 20] }, { [2, 1], [ 21, 17] } };
+ shape "LMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+ shape "RMTA" { { [ 28, 20] }, { [2, 1], [ 26, 17] } };
+ shape "SPCE" { { [121, 20] }, { [3, 1], [118, 17] } };
+ shape "BOTM" { { [ 18, 20] }, { [2, 1], [ 16, 17] } };
+
+ shape "KP0" { { [ 37, 20] }, { [2, 1], [ 35, 17] } };
+ shape "KPEN" { { [ 18, 39] }, { [2, 1], [ 16, 36] } };
+
+ section.left = 7;
+ row.left = 1;
+ key.gap = 1;
+ key.shape = "NORM";
+
+ section "Function" {
+ key.shape = "FUNC";
+ top = 26;
+ row {
+ top= 1;
+ keys { <ESC>,
+ { <FK01>, 14 }, <FK02>, <FK03>, <FK04>,
+ { <FK05>, 14 }, <FK06>, <FK07>, <FK08>,
+ { <FK09>, 14 }, <FK10>, <FK11>, <FK12>,
+ { <PRSC>, 11 }, <SCLK>, <PAUS>,
+ { <SDDN>, 11 }, <SDUP>, <SDNO>, <EJCT>
+ };
+ };
+ }; // End of "Function" section
+
+
+ section "Alpha" {
+ top = 48;
+ row {
+ top= 1;
+ keys { <TLDE>, <AE01>, <AE02>, <AE03>,
+ <AE04>, <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+ <AE10>, <AE11>, <AE12>, { <BKSP>, "BKSP" }
+ };
+ };
+ row {
+ top= 20;
+ keys { { <TAB>, "TAB" }, <AD01>, <AD02>, <AD03>,
+ <AD04>, <AD05>, <AD06>, <AD07>, <AD08>, <AD09>,
+ <AD10>, <AD11>, <AD12>, { <RTRN>, "RTRN" }
+ };
+ };
+ row {
+ top= 39;
+ keys { { <CAPS>, "CAPS" }, <AC01>, <AC02>, <AC03>,
+ <AC04>, <AC05>, <AC06>, <AC07>, <AC08>, <AC09>,
+ <AC10>, <AC11>, <BKSL>
+ };
+ };
+ row {
+ top= 58;
+ keys { { <LFSH>, "LFSH" }, <LSGT>, <AB01>, <AB02>,
+ <AB03>, <AB04>, <AB05>, <AB06>, <AB07>, <AB08>,
+ <AB09>, <AB10>, { <RTSH>, "RTSH" }
+ };
+ };
+ row {
+ top= 77;
+ keys { { <LCTL>, "LCTL" }, { <LALT>, "LALT" },
+ { <LWIN>, "LMTA" },
+ { <SPCE>, "SPCE" },
+ { <RWIN>, "RMTA" },
+ { <RALT>, "RALT" }, { <RCTL>, "RCTL" }
+ };
+ };
+ }; // End of "Alpha" section
+
+ section "Editing" {
+ top = 48;
+ left = 303;
+ row {
+ top= 1;
+ keys { <INS>, <HOME>, <PGUP> };
+ };
+ row {
+ top= 20;
+ keys { <DELE>, <END>, <PGDN> };
+ };
+ row {
+ top= 58;
+ left= 20;
+ keys { <UP> };
+ };
+ row {
+ top= 77;
+ key.shape = "BOTM";
+ keys { <LEFT>, <DOWN>, <RGHT> };
+ };
+ }; // End of "Editing" section
+
+ // Begin of "Keypad" section
+ section "Keypad" {
+ top = 48;
+ left = 370;
+ row {
+ top= 1;
+ keys { <NMLK>, <KPEQ>, <KPDV>, <KPMU> };
+ };
+ row {
+ top= 20;
+ keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+ };
+ row {
+ top= 39;
+ keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+ };
+ row {
+ top= 58;
+ keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+ };
+ row {
+ top= 77;
+ keys { { <KP0>, "KP0" }, { <KPDL>, "BOTM" } };
+ };
+ }; // End of "Keypad" section
+
+}; // End of "applepro" geometry