[n810] Added 1 patch by Chris Leach <cxl000@hotmail.com> to update RX…

…-44 symbol keymap and add nokiarx44 geometry for N810.
sailfishos · Nov 25, 2013 · 2810aca · 2810aca
1 parent 92190ab
commit 2810aca
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 2 deletions.
diff --git a/xkeyboard-config/geometry/nokia b/xkeyboard-config/geometry/nokia
@@ -8,7 +8,7 @@ default xkb_geometry "nokiarx51" {
 
     shape.cornerRadius= 1.5;
     shape "NORM"  { { [18,15] } };
-    shape "SPCE"  { { [36,15] } };
+    shape "SPCE"  { { [54,15] } };
     shape "FRAME" { cornerRadius= 2.5, { [243,54] } };
 
     solid "FRAME" {
@@ -51,3 +51,54 @@ default xkb_geometry "nokiarx51" {
     }; // End of "Keys" section
 
 }; // End of "rx51" geometry
+
+xkb_geometry "nokiarx44" {
+
+    description= "Nokia RX-44";
+    width= 346.5; // 11x8.5mm + 2x11mm border
+    height= 102.0; // 4x7mm + 2x3mm border
+
+    shape.cornerRadius= 1.5;
+    shape "NORM"  { { [25.5,21.0] } };
+    shape "FUNC"  { { [38.25,21.0] } };
+    shape "SPCE"  { { [76.5,21.0] } };
+
+    section.left= 33.0;
+    row.left= 0.0;
+    key.shape= "NORM";
+    key.gap= 0;
+    section "Keys" {
+	top= 0;
+	row {
+	    top= 9.0;
+	    keys { <AD01>, <AD02>, <AD03>, <AD04>, <AD05>,
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>,
+		   <BKSP>
+	    };
+	};
+	row {
+	    top= 30.0;
+	    keys { <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC11>,
+		   <RTRN>
+	    };
+	};
+	row {
+	    top= 51.0;
+	    keys { <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+		   <AB06>, <AB07>, <AC10>, <AE11>, <AE12>,
+		   <RTRN>
+	    };
+	};
+	row {
+	    top= 72.0;
+	    keys { { <FN>, "FUNC", color="grey20" },
+		   <LFSH>, <COMP>,
+		   { <SPCE>, "SPCE", color="grey20" },
+		   <AB08>, <AB09>, <RCTL>,
+                   { <LFSH>, "FUNC", color="grey20" }
+	    };
+	};
+    }; // End of "Keys" section
+
+}; // End of "rx44" geometry
diff --git a/xkeyboard-config/symbols/nokia_vndr/Makefile.am b/xkeyboard-config/symbols/nokia_vndr/Makefile.am
@@ -3,4 +3,6 @@ symbolsdir = $(xkb_base)/symbols/nokia_vndr
 dist_symbols_DATA = \
 rx-44 \
 rx-51 \
+rm-680 \
+rm-680-b2 \
 su-8w
diff --git a/xkeyboard-config/symbols/nokia_vndr/rx-44 b/xkeyboard-config/symbols/nokia_vndr/rx-44
@@ -269,7 +269,7 @@ xkb_symbols "base" {
 
     key <COMP>	{	[	Multi_key,		Multi_key,		Multi_key,		Multi_key		]	};
     key <LFSH>	{	[	Shift_L,		Shift_L,		Shift_L,		Shift_L			]	};
-    key <FN>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
+    key <LALT>	{	[	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift,	ISO_Level3_Shift	]	};
     key <SPCE>	{	[	space,			space,			space,			space			]	};
     key <RCTL>	{	[	Control_R,		Control_R,		Control_R,		Control_R		]	};
     key <TAB>	{	[	Tab,			Tab,			Tab,			Tab			]	};