geometry: Fix pc(abnt2)

- Remove include of pc(105) which caused key overlaps
- Missing additional key in keypad

1 files changed, 108 insertions, 4 deletions

diff --git a/geometry/pc b/geometry/pc
index f64b94fa..4f7948a2 100644
--- a/geometry/pc
+++ b/geometry/pc
@@ -828,22 +828,81 @@ xkb_geometry "jp106" {
 
 // Added for Brazilian ABNT2 by Ricardo Y. Igarashi <iga(at)that.com.br>.
 xkb_geometry "abnt2" {
-    include "pc(pc105)"
 
     description= "Brazilian ABNT2";
+    width= 470;
+    height= 180;
+
+    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" {
-        { [0,0],[ 28,0],[28,37],[4,37],[4,18],[0,18] } ,
-        { [2,1],[ 26,1],[26,36],[5,36],[5,18],[2,18] } };
-    shape "RTSH" { { [ 31,18] }, { [2,1], [ 29,16] } };
+        { [0,0], [28,0], [28,37], [5,37], [5,18], [0,18] } ,
+        { [2,1], [26,1], [26,35], [7,35], [7,16], [2,16] } ,
+        approx = { [5,0], [28,37] } };
+    shape "CAPS" { { [ 33,18] }, { [2,1], [ 31,16] } };
+    shape "LFSH" { { [ 25,18] }, { [2,1], [ 23,16] } };
+    shape "RTSH" { { [ 31,18] }, { [2,1], [29,16] } };
+    shape "MODK" { { [ 27,18] }, { [2,1], [ 25,16] } };
+    shape "SMOD" { { [ 23,18] }, { [2,1], [ 21,16] } };
+    shape "SPCE" { { [113,18] }, { [2,1], [111,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=  22;
+	left= 377;
+	color= "grey10";
+    };
+
+    indicator.onColor= "green";
+    indicator.offColor= "green30";
+    indicator.top= 37;
+    indicator.shape= "LED";
+    indicator "Num Lock"     { left= 382; };
+    indicator "Caps Lock"    { left= 407; };
+    indicator "Scroll Lock"  { left= 433; };
+    text.top= 25;
+    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= 22;
+	row {
+	    top= 1;
+	    keys {  { <ESC>, color="grey20" },
+		    { <FK01>, 20 }, <FK02>, <FK03>, <FK04>,
+		    { <FK05>, 11 }, <FK06>, <FK07>, <FK08>,
+		    { <FK09>, 11 }, <FK10>, <FK11>, <FK12>,
+		    { <PRSC>, 8 }, <SCLK>, <PAUS>
+	    };
+	};
+    }; // End of "Function" section
+
     section "Alpha" {
 	top= 61;
 	row {
+	    top= 1;
+	    keys { <TLDE>, <AE01>, <AE02>, <AE03>, <AE04>,
+		   <AE05>, <AE06>, <AE07>, <AE08>, <AE09>,
+		   <AE10>, <AE11>, <AE12>,
+		   { <BKSP>, "BKSP", color="grey20" }
+	    };
+	};
+	row {
 	    top= 20;
 	    keys { { <TAB>, "TABK", color="grey20" },
 		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
@@ -867,12 +926,49 @@ xkb_geometry "abnt2" {
 		    { <RTSH>, "RTSH", color="grey20" }
 	    };
 	};
+	row {
+	    top= 77;
+	    key.shape= "SMOD";
+	    key.color= "grey20";
+	    keys { { <LCTL>, "MODK" }, <LWIN>, <LALT>,
+		   { <SPCE>, "SPCE", color="white" },
+		   <RALT>, <RWIN>, <MENU>, <RCTL>
+	    };
+	};
     }; // End of "Alpha" section
 
+    section "Editing" {
+	top= 61;
+	left= 312;
+	key.color= "grey20";
+	row {
+	    top= 1;
+	    keys { <INS>, <HOME>, <PGUP> };
+	};
+        row {
+	    top= 20;
+	    keys { <DELE>, <END>, <PGDN> };
+	};
+	row {
+	    top= 58;
+	    left= 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 77;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
     section "Keypad" {
 	top= 61;
 	left= 376;
 	row {
+	    top= 1;
+	    key.color= "grey20";
+	    keys { <NMLK>, <KPDV>, <KPMU>, <KPSU> };
+	};
+	row {
 	    top= 20;
 	    keys { <KP7>, <KP8>, <KP9>, { <KPAD>, color="grey20" } };
 	};
@@ -880,6 +976,14 @@ xkb_geometry "abnt2" {
 	    top= 39;
 	    keys { <KP4>, <KP5>, <KP6>, { <KPPT>, color="grey20" } };
 	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPAD", color="grey20" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDL> };
+	};
     }; // End of "Keypad" section
 
 }; // End of "abnt2" geometry