Hi!
Add zaurus and support for the "L" keys for pc keyboards.
Need test.
ps:
Do not forget to set XENOCARA_USE_XKEYBOARD_CONFIG = Yes
when build xenocara.
--
Alexandr Shadchin
Index: data/xkeyboard-config/symbols/Makefile
===================================================================
RCS file: /cvs/xenocara/data/xkeyboard-config/symbols/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- data/xkeyboard-config/symbols/Makefile 12 Mar 2011 10:16:01 -0000
1.3
+++ data/xkeyboard-config/symbols/Makefile 12 Mar 2011 11:04:40 -0000
@@ -13,5 +13,8 @@ DATA= ad af al am ara at az ba bd be bg
tz ua us uz vn za altwin capslock compose ctrl empty eurosign 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>
Index: dist/xkeyboard-config/rules/base.ml_s.part
===================================================================
RCS file: /cvs/xenocara/dist/xkeyboard-config/rules/base.ml_s.part,v
retrieving revision 1.3
diff -u -p -r1.3 base.ml_s.part
--- dist/xkeyboard-config/rules/base.ml_s.part 12 Mar 2011 10:16:01 -0000
1.3
+++ dist/xkeyboard-config/rules/base.ml_s.part 12 Mar 2011 11:04:41 -0000
@@ -40,3 +40,4 @@
* $nonlatin = pc+us+%l%(v):2
* * = pc+%l%(v)
htcdream us de it = %l(htcdream)
+ zaurus * = pc+zaurus
Index: dist/xkeyboard-config/symbols/pc
===================================================================
RCS file: /cvs/xenocara/dist/xkeyboard-config/symbols/pc,v
retrieving revision 1.3
diff -u -p -r1.3 pc
--- dist/xkeyboard-config/symbols/pc 12 Mar 2011 10:16:01 -0000 1.3
+++ dist/xkeyboard-config/symbols/pc 12 Mar 2011 11:04:41 -0000
@@ -40,6 +40,9 @@ xkb_symbols "pc105" {
key <MENU> { [ Menu ] };
+ // "Sun LKeys" section
+ include "sun_vndr/us(left_funkeys)"
+
// begin modifier mappings
modifier_map Shift { Shift_L, Shift_R };
modifier_map Lock { Caps_Lock, ISO_Lock };
Index: dist/xkeyboard-config/symbols/zaurus
===================================================================
RCS file: dist/xkeyboard-config/symbols/zaurus
diff -N dist/xkeyboard-config/symbols/zaurus
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ dist/xkeyboard-config/symbols/zaurus 12 Mar 2011 11:04:41 -0000
@@ -0,0 +1,71 @@
+partial default alphanumeric_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 <RALT> { [ ISO_Level3_Shift ] };
+
+ 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)"
+};
Index: dist/xkeyboard-config/symbols/sun_vndr/us
===================================================================
RCS file: /cvs/xenocara/dist/xkeyboard-config/symbols/sun_vndr/us,v
retrieving revision 1.2
diff -u -p -r1.2 us
--- dist/xkeyboard-config/symbols/sun_vndr/us 10 Jan 2011 14:25:58 -0000
1.2
+++ dist/xkeyboard-config/symbols/sun_vndr/us 12 Mar 2011 11:04:41 -0000
@@ -202,16 +202,28 @@ xkb_symbols "left_funkeys" {
// The above symbols were chosen for better compatibility withother xkb
// mappings. The old mappings are kepy below in case someone needs them
- key <STOP> { [ L1, L1, SunStop ] };
- key <AGAI> { [ L2, L2, SunAgain ] };
- key <PROP> { [ L3, L3, SunProps ] };
- key <UNDO> { [ L4, L4, SunUndo ] };
- key <FRNT> { [ L5, L5, SunFront ] };
- key <COPY> { [ L6, L6, SunCopy ] };
- key <OPEN> { [ L7, L7, SunOpen ] };
- key <PAST> { [ L8, L8, SunPaste ] };
- key <FIND> { [ L9, L9, SunFind ] };
- key <CUT> { [ L10, L10, SunCut ] };
+ //key <STOP> { [ L1, L1, SunStop ] };
+ //key <AGAI> { [ L2, L2, SunAgain ] };
+ //key <PROP> { [ L3, L3, SunProps ] };
+ //key <UNDO> { [ L4, L4, SunUndo ] };
+ //key <FRNT> { [ L5, L5, SunFront ] };
+ //key <COPY> { [ L6, L6, SunCopy ] };
+ //key <OPEN> { [ L7, L7, SunOpen ] };
+ //key <PAST> { [ L8, L8, SunPaste ] };
+ //key <FIND> { [ L9, L9, SunFind ] };
+ //key <CUT> { [ L10, L10, SunCut ] };
+
+ // OpenBSD variant
+ key <STOP> { [ Cancel ], [ F11 ] };
+ key <AGAI> { [ Redo ], [ F12 ] };
+ key <PROP> { [ SunProps ], [ F13 ] };
+ key <UNDO> { [ Undo ], [ F14 ] };
+ key <FRNT> { [ SunFront ], [ F15 ] };
+ key <COPY> { [ SunCopy ], [ F16 ] };
+ key <OPEN> { [ SunOpen ], [ F17 ] };
+ key <PAST> { [ SunPaste ], [ F18 ] };
+ key <FIND> { [ Find ], [ F19 ] };
+ key <CUT> { [ SunCut ], [ F20 ] };
};
hidden
