? install-sh
? missing
? olpc-xkeyboard-config.patch
? upd.log
? xkb
? xkb-olpc-old.tar.gz
? po/stamp-it
Index: keycodes/evdev
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/keycodes/evdev,v
retrieving revision 1.4
diff -u -p -r1.4 evdev
--- keycodes/evdev	31 Aug 2006 21:44:13 -0000	1.4
+++ keycodes/evdev	11 Jun 2007 10:25:04 -0000
@@ -143,11 +143,15 @@ default xkb_keycodes "evdev" {
 	<FK23> = 201;
 	<FK24> = 202;
 
+	// Keys that are generated on the OLPC keyboard.
+	<AB11> = 219;
+
 	// Keys that are generated on Japanese keyboards
 
 	<HZTG> =  93;	// Hankaku/Zenkakau toggle
 	<HKTG> = 101;	// Hiragana/Katakana toggle
-	<AB11> = 211;	// backslash/underscore
+	// FIXME: conflicts with OLPC definition
+	//<AB11> = 211;	// backslash/underscore
 	<HENK> = 100;	// Henkan
 	<MUHE> = 102;	// Muhenkan
 	<AE13> = 132;	// Yen
@@ -242,7 +246,8 @@ default xkb_keycodes "evdev" {
 	<I216> = 216;	// #define KEY_FASTFORWARD         208
 	<I217> = 217;	// #define KEY_BASSBOOST           209
 	<I218> = 218;	// #define KEY_PRINT               210
-	<I219> = 219;	// #define KEY_HP                  211
+	// FIXME: conflicts with OLPC definition
+	//<I219> = 219;	// #define KEY_HP                  211
 	<I220> = 220;	// #define KEY_CAMERA              212
 	<I221> = 221;	// #define KEY_SOUND               213
 	<I222> = 222;	// #define KEY_QUESTION            214
@@ -275,3 +280,35 @@ default xkb_keycodes "evdev" {
 
 	alias <ALGR> = <RALT>;
 };
+
+xkb_keycodes "olpc" {
+	include "evdev(evdev)"
+
+	// OLPC alalog sliders
+	<AK01> = 218;
+	<AK02> = 191;
+	<AK03> = 219;
+	<AK04> = 192;
+	<AK05> = 220;
+	<AK06> = 193;
+	<AK07> = 221;
+	//AK98 is unmapped
+
+	<AK09> = 222;
+	<AK10> = 194;
+	<AK11> = 223;
+	<AK12> = 195;
+	<AK13> = 224;
+	<AK14> = 196;
+	<AK15> = 225;
+	//AK16 is unmapped
+
+	<AK17> = 226;
+	<AK18> = 197;
+	<AK19> = 227;
+	<AK20> = 198;
+	<AK21> = 228;
+	<AK22> = 199;
+	<AK23> = 229;
+	//AK24 is unmapped
+};
Index: symbols/ara
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/ara,v
retrieving revision 1.6
diff -u -p -r1.6 ara
--- symbols/ara	18 Sep 2006 13:25:31 -0000	1.6
+++ symbols/ara	11 Jun 2007 10:25:04 -0000
@@ -218,3 +218,51 @@ xkb_symbols "buckwalter" {
 
     // End alphanumeric section
 };
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    include "ara(basic)"
+    name[Group1]= "Arabic - OLPC";
+
+    // As part of the olpc design some changes were made to the Arabic
+    // keyboard design. Major changes are:
+    //
+    //  * Removed the lam-alef single character. Poeple type as they
+    //    pronounce, and lam-alef is just a visual formatting of the
+    //    sequence and is not often used on the keyboard. It is
+    //    similar to the Allah single character, which is also not on
+    //    the keyboard.
+    //  * Moved the following keys:
+    //     o Thal from TLDE to AB05: Due to space limitation on the
+    //       keybaord, but also accessibility
+    //     o Shadda from TLDE to AD05
+    //  * Placed currency letters on number keys and moved the ^ and &
+    //    characters to lower keys (This change is worth revisiting
+    //    before end of test period)
+
+    key <TLDE> {  [           grave,      asciitilde  ] };
+
+    key <AE06> { [                6,        sterling  ] };
+    key <AE07> { [                7,        EuroSign  ] };
+
+    key <AD05> {  [      Arabic_feh,   Arabic_shadda  ] };
+
+    key <AD08> {  [      Arabic_heh,        division  ] };
+    key <AD11> {  [     Arabic_jeem                   ] };
+    key <AD12> {  [      Arabic_dal                   ] };
+
+    key <AC01> {  [    Arabic_sheen,            less  ] };
+    key <AC02> {  [     Arabic_seen,         greater  ] };
+    key <AC05> {  [      Arabic_lam,       ampersand  ] };
+    key <AC10> {  [      Arabic_kaf                   ] };
+    key <AC11> {  [      Arabic_tah                   ] };
+
+    key <BKSL> {  [       backslash,             bar  ] };
+
+
+    // REH isolated form?
+    key <AB04> {  [       Arabic_ra,  Arabic_kasratan ] };
+    key <AB05> {  [     Arabic_thal,      asciicircum ] };
+    // Language key
+    key <AB11> {  [  ISO_Next_Group,   ISO_Prev_Group ] };
+};
Index: symbols/br
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/br,v
retrieving revision 1.10
diff -u -p -r1.10 br
--- symbols/br	20 Nov 2006 19:18:02 -0000	1.10
+++ symbols/br	11 Jun 2007 10:25:04 -0000
@@ -63,3 +63,36 @@ xkb_symbols "nodeadkeys" {
     key <AC11>	{ [asciitilde, asciicircum ]	};
     key <AB10>	{ [ semicolon,      colon, dead_belowdot,    abovedot ]	};
 };
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "us(basic)"
+
+    Name[Group1] = "Brazil - OLPC";
+
+    key <TLDE> { [   apostrophe,	quotedbl                                ] };
+
+    key <AE01>	{ [           1,          exclam,   onesuperior                 ] };
+    key <AE02>	{ [           2,	      at,   twosuperior                 ] };
+    key <AE03>	{ [           3,      numbersign, threesuperior                 ] };
+    key <AE04>	{ [           4,	  dollar,      sterling                 ] };
+    key <AE05>	{ [           5,	 percent,          cent                 ] };
+    key <AE06>	{ [           6,  dead_diaeresis,       notsign                 ] };
+    key <AE12>  { [       equal,	    plus,       section                 ] };
+
+    key <AD03> { [            e,	       E,      EuroSign                 ] };
+    key <AD11> { [   dead_acute,      dead_grave                                ] };
+    key <AD12> { [  bracketleft,       braceleft,     0x10000AA                 ] };
+    
+    key <AC10> { [     ccedilla,	Ccedilla	                        ] };
+    key <AC11> { [   dead_tilde, dead_circumflex	                        ] };
+    key <BKSL> { [ bracketright,      braceright,     0x10000BA	                ] };
+
+    key <AB01> { [            z,	       Z,	    bar                 ] };
+    key <AB03> { [            c,	       C,     0x10020A2	                ] };
+    key <AB09> { [       period,	 greater,     backslash                 ] };
+    key <AB10> { [    semicolon,           colon                                ] };
+    key <AB11> { [        slash,	question,        degree, ISO_Next_Group ] };
+    include "level3(ralt_switch)"
+};
Index: symbols/es
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/es,v
retrieving revision 1.13
diff -u -p -r1.13 es
--- symbols/es	26 Jan 2007 23:02:18 -0000	1.13
+++ symbols/es	11 Jun 2007 10:25:04 -0000
@@ -146,5 +146,38 @@ xkb_symbols "mac" {
 
     include "es"
     name[Group1]= "Spain - Macintosh";
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+
+    include "us(basic)"
+
+    Name[Group1] = "Argentina - OLPC";
+
+    key <TLDE> { [          bar,         degree	                 ] };
+    key <AE02> { [            2,       quotedbl,              at ] };
+    key <AE03> { [            3,     dead_grave,      numbersign ] };
+    key <AE05> { [            5,	percent, dead_circumflex ] };
+    key <AE06> { [            6,      ampersand,         notsign ] };
+    key <AE07> { [            7,          slash,       backslash ] };
+    key <AE08> { [            8,      parenleft	                 ] };
+    key <AE09> { [            9,     parenright	                 ] };
+    key <AE10> { [            0,          equal                  ] };
+    key <AE11> { [   apostrophe,       question                  ] };
+    key <AE12> { [   exclamdown,   questiondown                  ] };
+
+    key <AD03> { [            e,              E,        EuroSign ] };
+    key <AD11> { [   dead_acute, dead_diaeresis	                 ] };
+    key <AD12> { [  bracketleft,      braceleft                  ] };
+    
+    key <AC10> { [       ntilde,	 Ntilde                  ] };
+    key <AC11> { [         plus,       asterisk,      dead_tilde ] };
+    key <BKSL> { [ bracketright,     braceright                  ] };
 
+    key <AB08> { [        comma,      semicolon                  ] };
+    key <AB09> { [       period,          colon                  ] };
+    key <AB10> { [        minus,     underscore                  ] };
+    key <AB11> { [         less,        greater,  ISO_Next_Group ] };
+    include "level3(ralt_switch)"
 };
Index: symbols/inet
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/inet,v
retrieving revision 1.52
diff -u -p -r1.52 inet
--- symbols/inet	23 Apr 2007 22:09:07 -0000	1.52
+++ symbols/inet	11 Jun 2007 10:25:04 -0000
@@ -18,7 +18,7 @@
 // setxkbmap 'my_kb_layout' -variant 'my_kb_variant' -model 'my_eak_type'
 
 // All keyboards listed here should be also mentioned in
-// xc/programs/xkbcomp/rules/xfree86, xfree86.lst and xfree86.xml.
+// rules/base, base.lst and base.xml.
 
 // Evdev Standardized Keycodes
 partial alphanumeric_keys
Index: symbols/ng
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/ng,v
retrieving revision 1.2
diff -u -p -r1.2 ng
--- symbols/ng	11 Oct 2006 19:32:35 -0000	1.2
+++ symbols/ng	11 Jun 2007 10:25:04 -0000
@@ -54,3 +54,11 @@ xkb_symbols "hausa" {
     key <AB10> { [   scedilla,   Scedilla,     slash,    question ] };
 
 };
+
+partial alphanumeric_keys 
+xkb_symbols "olpc" {
+
+    name[Group1]="Nigerian - OLPC";
+
+    include "ng(basic)"
+};
Index: symbols/pc
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/pc,v
retrieving revision 1.7
diff -u -p -r1.7 pc
--- symbols/pc	2 Jan 2007 20:56:55 -0000	1.7
+++ symbols/pc	11 Jun 2007 10:25:04 -0000
@@ -143,3 +143,37 @@ xkb_symbols "editing" {
     key <RGHT> {	[  Right		]	};
 };
 
+// definition for the OLPC keyboards
+alphanumeric_keys
+xkb_symbols "olpc" {
+    include "pc(pc105)"
+
+    // Analog sliders (FN + top row)
+
+    key <AK01> { [ A1  ] };
+    key <AK02> { [ A2  ] };
+    key <AK03> { [ A3  ] };
+    key <AK04> { [ A4  ] };
+    key <AK05> { [ A5  ] };
+    key <AK06> { [ A6  ] };
+    key <AK07> { [ A7  ] };
+    //AK08 is unmapped
+
+    key <AK09> { [ A9  ] };
+    key <AK10> { [ A10 ] };
+    key <AK11> { [ A11 ] };
+    key <AK12> { [ A12 ] };
+    key <AK13> { [ A13 ] };
+    key <AK14> { [ A14 ] };
+    key <AK15> { [ A15 ] };
+    //AK16 is unmapped
+
+    key <AK17> { [ A17 ] };
+    key <AK18> { [ A18 ] };
+    key <AK19> { [ A19 ] };
+    key <AK20> { [ A20 ] };
+    key <AK21> { [ A21 ] };
+    key <AK22> { [ A22 ] };
+    key <AK23> { [ A23 ] };
+    //AK24 is unmapped
+};
Index: symbols/th
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/th,v
retrieving revision 1.6
diff -u -p -r1.6 th
--- symbols/th	16 Jan 2005 02:18:20 -0000	1.6
+++ symbols/th	11 Jun 2007 10:25:04 -0000
@@ -186,3 +186,63 @@ xkb_symbols "tis" {
 
     key <BKSL> {	[ Thai_khokhon,		Thai_khokhuat	]	};
 };
+
+partial alphanumeric_keys 
+xkb_symbols "olpc" {
+
+    name[Group1]= "Thailand - OLPC";
+    // The OLPC thai layout
+    // walter@laptop.org
+
+    key <TLDE> { [ 0x1000E4F,  0x1000E5B ] };
+    key <AE01> { [ 0x1000E3F,  0x1000E45 ] };
+    key <AE02> { [     slash,  0x1000E51 ] };
+    key <AE03> { [     minus,  0x1000E52 ] };
+    key <AE04> { [ 0x1000E20,  0x1000E53 ] };
+    key <AE05> { [ 0x1000E16,  0x1000E54 ] };
+    key <AE06> { [ 0x1000E38,  0x1000E39 ] };
+    key <AE07> { [ 0x1000E36,  0x1000E4E ] };
+    key <AE08> { [ 0x1000E04,  0x1000E55 ] };
+    key <AE09> { [ 0x1000E15,  0x1000E56 ] };
+    key <AE10> { [ 0x1000E08,  0x1000E57 ] };
+    key <AE11> { [ 0x1000E02,  0x1000E58 ] };
+    key <AE12> { [ 0x1000E0A,  0x1000E59 ] };
+
+    key <AD01> { [ 0x1000E46,  0x1000E50 ] };
+    key <AD02> { [ 0x1000E44,   quotedbl ] };
+    key <AD03> { [ 0x1000E33,  0x1000E0E ] };
+    key <AD04> { [ 0x1000E1E,  0x1000E11 ] };
+    key <AD05> { [ 0x1000E30,  0x1000E18 ] };
+    key <AD06> { [ 0x1000E31,  0x1000E4D ] };
+    key <AD07> { [ 0x1000E35,  0x1000E4A ] };
+    key <AD08> { [ 0x1000E23,  0x1000E13 ] };
+    key <AD09> { [ 0x1000E19,  0x1000E2F ] };
+    key <AD10> { [ 0x1000E22,  0x1000E0D ] };
+    key <AD11> { [ 0x1000E1A,  0x1000E10 ] };
+    key <AD12> { [ 0x1000E25,      comma ] };
+
+    key <AC01> { [ 0x1000E1F,  0x1000E24 ] };
+    key <AC02> { [ 0x1000E2B,  0x1000E06 ] };
+    key <AC03> { [ 0x1000E01,  0x1000E0F ] };
+    key <AC04> { [ 0x1000E14,  0x1000E42 ] };
+    key <AC05> { [ 0x1000E40,  0x1000E0C ] };
+    key <AC06> { [ 0x1000E49,  0x1000E47 ] };
+    key <AC07> { [ 0x1000E48,  0x1000E4B ] };
+    key <AC08> { [ 0x1000E32,  0x1000E29 ] };
+    key <AC09> { [ 0x1000E2A,  0x1000E28 ] };
+    key <AC10> { [ 0x1000E27,  0x1000E0B ] };
+    key <AC11> { [ 0x1000E07,     period ] };
+    key <BKSL> { [ 0x1000E05,  0x1000E03 ] };
+
+    key <AB01> { [ 0x1000E1C,  parenleft ] };
+    key <AB02> { [ 0x1000E1B, parenright ] };
+    key <AB03> { [ 0x1000E41,  0x1000E09 ] };
+    key <AB04> { [ 0x1000E2D,  0x1000E2E ] };
+    key <AB05> { [ 0x1000E34,  0x1000E3A ] };
+    key <AB06> { [ 0x1000E37,  0x1000E4C ] };
+    key <AB07> { [ 0x1000E17,   question ] };
+    key <AB08> { [ 0x1000E21,  0x1000E12 ] };
+    key <AB09> { [ 0x1000E43,  0x1000E2C ] };
+    key <AB10> { [ 0x1000E1D,  0x1000E26 ] };
+    key <AB11> { [ ISO_Next_Group, ISO_Prev_Group ] };
+};
Index: symbols/us
===================================================================
RCS file: /cvs/xlibs/xkbdesc/xkeyboard-config/symbols/us,v
retrieving revision 1.29
diff -u -p -r1.29 us
--- symbols/us	29 Apr 2007 17:01:02 -0000	1.29
+++ symbols/us	11 Jun 2007 10:25:05 -0000
@@ -509,3 +509,57 @@ xkb_symbols "mac" {
     include "us"
     name[Group1]= "U.S. English - Macintosh";
 };
+
+partial alphanumeric_keys
+xkb_symbols "olpc" {
+    name[Group1]= "U.S. English - OLPC International";
+
+    include "us(basic)"
+
+    // OLPC international US English keyboard layout.
+
+    // It's a little different from the usual international layout.
+
+
+    key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };
+    key <AE01> { [	   1,     exclam,    exclamdown,       exclamdown ] };
+    key <AE02> { [         2,         at,  questiondown,     questiondown ] };
+    key <AE03> { [	   3, numbersign,       section,          section ] };
+    key <AE04> { [	   4,     dollar,      sterling,         sterling ] };
+    key <AE05> { [	   5,    percent,      EuroSign,         EuroSign ] };
+    key <AE06> { [         6,asciicircum,       notsign,          notsign ] };
+    key <AE07> { [         7,  ampersand,     0x1000325,        0x1000325 ] };
+    key <AE08> { [         8,   asterisk,     0x1000324,        0x1000324 ] };
+    key <AE09> { [         9,  parenleft,     0x1000320,        0x1000320 ] };
+    key <AE10> { [         0, parenright,     0x1000327,        0x1000327 ] };
+    key <AE11> { [     minus, underscore,     0x1000323,        0x1000323 ] };
+    key <AE12> { [     equal,       plus,     0x1000330,        0x1000330 ] };
+
+
+    key <AD03> { [         e,          E,           oe,               OE ] };
+    key <AD09> { [         o,          O,       oslash,           Oslash ] };
+    key <AD10> { [         p,          P,    0x100030A,        0x100030A ] };
+    key <AD11> { [ bracketleft,  braceleft,  0x1000300,        0x1000300 ] };
+    key <AD12> { [bracketright, braceright,  0x1000301,        0x1000301 ] };
+
+    key <AC01>	{ [         a,          A,          ae,               AE ] };
+    key <AC02>	{ [         s,          S,      ssharp,           ssharp ] };
+    key <AC03>	{ [         d,          D,         eth,              ETH ] };
+    key <AC10>  { [ semicolon,	    colon,   0x1000303,        0x1000303 ] };
+    key <AC11>  { [ apostrophe,	 quotedbl,   0x1000302,        0x1000302 ] };
+    key <BKSL>  { [ backslash,        bar,   0x100030C,        0x100030C ] };
+
+    key <AB03>	{ [         c,          C,    ccedilla,         Ccedilla ] };
+    key <AB06>  { [         n,          N,      ntilde,           Ntilde ] };
+    key <AB08>  { [     comma,       less,   0x1000307,        0x1000307 ] };
+    key <AB09>  { [    period,    greater,   0x1000308,        0x1000308 ] };
+    key <AB10>  { [     slash,   question,   0x1000304,        0x1000304 ] };
+    key <AB11>	{ [  multiply,   division, ISO_Next_Group, ISO_Prev_Group ] };
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "olpc2" {
+    include "us(olpc)"
+    key <AB11>	{ [ ISO_Next_Group, ISO_Prev_Group ] };
+};