PR 385 BugFix: german keymaps for amiga

[Peter Reich <peter_(_at_)_alles_(_dot_)_prima_(_dot_)_de>]

Hi,

I 've a Bugfix for PR 385 which i had sent a while ago. This Problem 
exists also in the 2.4 release.

One bug is in keymap/amiga. There are two default entries. Another bug is 
in geometry/amiga and geometry.dir where the "de" entry is missing.

Patchfile follows. To apply it cd to /usr/X11R6/lib/X11/xkb and run patch.



greetings

Peter

--- keymap/amiga.orig	Mon Dec 21 03:05:44 1998
+++ keymap/amiga	Mon Dec 21 02:11:14 1998
@@ -7,7 +7,7 @@
     xkb_geometry	{ include "amiga(usa1)"		};
 };
 
-default xkb_keymap "de" {
+xkb_keymap "de" {
     xkb_keycodes	{ include "amiga(de)"		};
     xkb_types		{ include "default"		};
     xkb_compatibility	{ include "default"		};
--- geometry/amiga.orig	Mon Dec 21 03:06:23 1998
+++ geometry/amiga	Mon Dec 21 03:10:55 1998
@@ -1,7 +1,7 @@
 // $XFree86: xc/programs/xkbcomp/geometry/amiga,v 3.0 1996/08/18 01:55:32 dawes Exp $
 default xkb_geometry "usa1" {
 
-    description= "Amiga (usa1)";
+    description= "Amiga 3000/4000 (usa1)";
     width= 490;
     height= 175;
 
@@ -64,7 +64,7 @@
 	row {
 	    top= 39;
 	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>, 
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
 		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
 		   <AC11>
 	    };
@@ -96,19 +96,150 @@
 	    keys { <DELE>, <HELP> };
 	};
 	row {
-	    top= 20;
-	    left = 19;
+	    top= 39;
+	    left = 20;
 	    keys { <UP> };
 	};
 	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <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" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Amiga 3000/4000 (de)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },
+	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };
+    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 14 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
 	    keys { <LEFT>, <DOWN>, <RGHT> };
 	};
     }; // End of "Editing" section
 
     section "Keypad" {
 	top= 56;
-	left= 382;
+	left= 392;
 	row {
 	    top= 1;
 	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
--- geometry.dir.orig	Mon Dec 21 03:14:32 1998
+++ geometry.dir	Mon Dec 21 03:15:21 1998
@@ -1,4 +1,5 @@
 -d------ -------- amiga(usa1)
+-------- -------- amiga(de)
 -d------ -------- ataritt(us)
 -------- -------- ataritt(de)
 -d------ -------- dell(dell101)

-----------------------------------------------------------------------
Peter Reich                                        peter_(_at_)_alles_(_dot_)_prima_(_dot_)_de

    Privater Internationaler Mail- und Informations- Austausch e. V.