From a067e4f1a4660ef51d27652115598201e6483951 Mon Sep 17 00:00:00 2001
From: shadchin <shadchin@openbsd.org>
Date: Sun, 10 Apr 2011 17:49:13 +0000
Subject: [PATCH] Add support for zaurus

ok matthieu@
---
 data/xkeyboard-config/symbols/Makefile     |  5 +-
 dist/xkeyboard-config/rules/base.ml_s.part |  1 +
 dist/xkeyboard-config/symbols/zaurus       | 69 ++++++++++++++++++++++
 3 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 dist/xkeyboard-config/symbols/zaurus

diff --git a/data/xkeyboard-config/symbols/Makefile b/data/xkeyboard-config/symbols/Makefile
index f18a85a2a..54aa360b8 100644
--- a/data/xkeyboard-config/symbols/Makefile
+++ b/data/xkeyboard-config/symbols/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 2011/04/10 17:10:21 jasper Exp $
+#	$OpenBSD: Makefile,v 1.5 2011/04/10 17:49:13 shadchin Exp $
 
 SUBDIR=		digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr \
 		nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
@@ -14,5 +14,8 @@ DATA=	ad af al am apl ara at az ba bd be bg br brai bt bw by ca cd ch cn cz \
 	rupeesign group inet keypad kpdl level3 level5 nbsp olpc shift \
 	srvr_ctrl typo
 
+# OpenBSD customization
+DATA+=	zaurus
+
 .include <bsd.xorg.mk>
 .include <bsd.subdir.mk>
diff --git a/dist/xkeyboard-config/rules/base.ml_s.part b/dist/xkeyboard-config/rules/base.ml_s.part
index 5d3b46d61..5e3dc02eb 100644
--- a/dist/xkeyboard-config/rules/base.ml_s.part
+++ b/dist/xkeyboard-config/rules/base.ml_s.part
@@ -37,5 +37,6 @@
   olpc		*			=	olpc+%l%(v)
  $thinkpads   	br			=	pc+br(thinkpad)
   htcdream	$htcdreamlayouts	=	%l(htcdream)
+  zaurus	*			=	pc+zaurus
   *	   	$nonlatin		=	pc+us+%l%(v):2
   *		*			=	pc+%l%(v)
diff --git a/dist/xkeyboard-config/symbols/zaurus b/dist/xkeyboard-config/symbols/zaurus
new file mode 100644
index 000000000..6a2021596
--- /dev/null
+++ b/dist/xkeyboard-config/symbols/zaurus
@@ -0,0 +1,69 @@
+default partial alphanumeric_keys modifier_keys
+xkb_symbols "basic" {
+	name[Group1]= "US/ASCII";
+
+	// Upper row
+	key <AE01> { [ 1, exclam ] };
+	key <AE02> { [ 2, quotedbl ] };
+	key <AE03> { [ 3, numbersign ] };
+	key <AE04> { [ 4, dollar ] };
+	key <AE05> { [ 5, percent ] };
+	key <AE06> { [ 6, ampersand ] };
+	key <AE07> { [ 7, quoteright ] };
+	key <AE08> { [ 8, parenleft ] };
+	key <AE09> { [ 9, parenright ] };
+	key <AE10> { [ 0, asciitilde ] };
+
+	key <AD01> { [ q, Q ] };
+	key <AD02> { [ w, W, asciicircum ] };
+	key <AD03> { [ e, E, equal ] };
+	key <AD04> { [ r, R, plus ] };
+	key <AD05> { [ t, T, bracketleft ] };
+	key <AD06> { [ y, Y, bracketright ] };
+	key <AD07> { [ u, U, braceleft ] };
+	key <AD08> { [ i, I, braceright ] };
+	key <AD09> { [ o, O ] };
+	key <AD10> { [ p, P ] };
+
+	key <TAB> { [ Tab, ISO_Left_Tab, Caps_Lock ] };
+
+	key <AC01> { [ a, A ] };
+	key <AC02> { [ s, S ] };
+	key <AC03> { [ d, D, quoteleft ] };
+	key <AC04> { [ f, F, backslash ] };
+	key <AC05> { [ g, G, semicolon ] };
+	key <AC06> { [ h, H, colon ] };
+	key <AC07> { [ j, J, asterisk ] };
+	key <AC08> { [ k, K, yen ] };
+	key <AC09> { [ l, L, bar ] };
+
+	key <LFSH> { [ Shift_L ] };
+	key <AB01> { [ z, Z ] };
+	key <AB02> { [ x, X, SunCut ] };
+	key <AB03> { [ c, C, SunCopy ] };
+	// XXX Removed SunPaste from line below
+	// because it triggers a bug in xterm translations.
+	key <AB04> { [ v, V ] };
+	key <AB05> { [ b, B, underscore ] };
+	key <AB06> { [ n, N ] };
+	key <AB07> { [ m, M ] };
+	key <RTSH> { [ Shift_R ] };
+	key <RTRN> { [ Return ] };
+
+	key <LCTL> { [ Control_L ] };
+	key <AE11> { [ minus, minus, at ] };
+	key <SPCE> { [ space ] };
+	key <AB08> { [ comma, slash, less ] };
+	key <AB09> { [ period, question, greater ] };
+	// End alphanumeric section
+
+	// keypad
+	key <UP> { [ Up, Up, Prior ] };
+	key <LEFT> { [ Left, Left, Home ] };
+	key <DOWN> { [ Down, Down, Next ] };
+	key <RGHT> { [ Right, Right, End ] };
+
+	key <ESC> { [ Escape ] };
+
+	include "level3(ralt_switch)"
+};