xserver xkeyboard-config mesa git update 4 Marc 2011

1 files changed, 255 insertions, 233 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/ro b/xorg-server/xkeyboard-config/symbols/ro
index 9e9663cce..f37a60dac 100644
--- a/xorg-server/xkeyboard-config/symbols/ro
+++ b/xorg-server/xkeyboard-config/symbols/ro
@@ -1,233 +1,255 @@
-//

-// Complete set of Romanian keyboards as described in the new Romanian standard

-// SR 13392:2004 adopted in December 2004 by ASRO, "Asociatia de Standardizare 

-// din Romania".

-// 

-// The default mapping is the RO_US/Programmers layout because of the lack of 

-// Romanian hardware keyboards. The primary standard layout is implemented as 

-// the "std" variant. If you're determined to get cedillas as in ISO-8859-2  

-// (and not commabelow accents as in ISO-8859-16) use the defined variants 

-// "cedilla" for the default layout or "std_cedilla" for the standard one. 

-// Pre-Vista MS compatible layout included (use the "winkeys" variant).

-// 

-// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000

-// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001

-// Completed by Misu Moldovan, <dumol@gnome.ro> (C) 2001, 2004-2008.

-// v 1.4

-

-

-partial default alphanumeric_keys

-xkb_symbols "basic" {

-// This RO_US/Programmers layout, although the secondary layout in the 

-// Romanian standard, has always been the "de facto" standard in the 

-// Linux/Unix world. It is implemented here as the default layout and it's

-// fully compatible with an US keyboard (Euro on AltGr+5 doesn't count).

-

-    include "us"

-

-    name[Group1]="Romania";

-

-    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };

-    key <AE02> { [ 2,                     at,  dead_caron		  ] };

-    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };

-    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };

-    key <AE05> { [ 5,                percent,  dead_abovering		  ] };

-    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };

-    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };

-    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };

-    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };

-    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };

-    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };

-    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };

-    key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };

-    key <AD02> { [ w,                      W,  ssharp	 	          ] };

-    key <AD03> { [ e,                      E,  EuroSign  	          ] };

-    key <AD05> { [ t,                      T,  0x100021b,       0x100021a ] };

-    key <AD08> { [ i,                      I,  icircumflex,   Icircumflex ] };

-    key <AD10> { [ p,                      P,  section 			  ] };

-    key <AD11> { [ bracketleft,    braceleft,  doublelowquotemark 	  ] };

-    key <AD12> { [ bracketright,  braceright,  rightdoublequotemark 	  ] };

-    key <AC01> { [ a,                      A,  abreve,             Abreve ] };

-    key <AC02> { [ s,                      S,  0x1000219,       0x1000218 ] };

-    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };

-    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };

-    key <LSGT> { [ backslash,            bar                              ] };

-    key <AB03> { [ c,                      C,  copyright 	       	  ] };

-    key <AB08> { [ comma, 	        less,  guillemotleft	          ] };

-    key <AB09> { [ period, 	     greater,  guillemotright 	          ] };

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys

-xkb_symbols "cedilla" {

-    // Variant of the basic layout with cedillas.

-    // Implements S and T with cedilllas as in ISO-8859-2.

-    // Included for compatibility reasons (this used to be the def variant).

-

-    include "ro(basic)"

-

-    name[Group1]="Romania - Cedilla";

-

-    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };

-    key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };

-};

-

-partial alphanumeric_keys

-xkb_symbols "std" {

-    // Primary layout in the new Romanian standard.

-    // Implemented here as a variant because of the lack of hardware 

-    // Romanian keyboards and because of the predilection of Romanian

-    // X users towards the secondary layout from the new standard.

-

-    include "us"

-

-    name[Group1]="Romania - Standard";

-

-    key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };

-    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };

-    key <AE02> { [ 2,                     at,  dead_caron		  ] };

-    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };

-    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };

-    key <AE05> { [ 5,                percent,  dead_abovering		  ] };

-    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };

-    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };

-    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };

-    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };

-    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };

-    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };

-    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };

-    key <AD03> { [ e,                      E,  EuroSign  	          ] };

-    key <AD10> { [ p,                      P,  section 			  ] };

-    key <AD11> { [ abreve, 	      Abreve,  bracketleft,     braceleft ] };

-    key <AD12> { [ icircumflex,  Icircumflex,  bracketright,   braceright ] };

-    key <BKSL> { [ acircumflex,  Acircumflex,  backslash,             bar ] };

-    key <AC02> { [ s, 			   S,  ssharp			  ] };

-    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };

-    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };

-    key <AC10> { [ 0x1000219,	   0x1000218,  semicolon, 	    colon ] };

-    key <AC11> { [ 0x100021b,	   0x100021a,  apostrophe, 	 quotedbl ] };

-    key <LSGT> { [ backslash,            bar                              ] };

-    key <AB03> { [ c,                      C,  copyright 	       	  ] };

-    key <AB08> { [ comma, 	   semicolon,  less, 	    guillemotleft ] };

-    key <AB09> { [ period,             colon,  greater,    guillemotright ] };

-

-    key <KPDL> { [ KP_Delete,   KP_Separator ] };

-

-    include "level3(ralt_switch)"

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "std_cedilla" {

-    // Variant of the "std" layout with cedillas.

-    // Implements S and T with cedillas as in ISO-8859-2.

-    // Included for compatibility reasons.

-

-    include "ro(std)"

-

-    name[Group1]="Romania - Standard (Cedilla)";

-

-    key <AC10> { [ scedilla, 	    Scedilla ] };

-    key <AC11> { [ tcedilla, 	    Tcedilla ] };

-};

-

-

-partial alphanumeric_keys

-xkb_symbols "winkeys" {

-    // Describes the differences between a very simple US/ASCII

-    // keyboard and a very simple Romanian keybaord

-    // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003

-

-    include "latin"

-

-    name[Group1]="Romania - Winkeys";

-

-    // Alphanumeric section

-    key <TLDE> { [ bracketright, bracketleft            ]       };

-

-    key <AE01> { [            1,      exclam,  asciitilde, asciitilde   ] };

-    key <AE02> { [            2,    quotedbl,          at,         at   ] };

-    key <AE03> { [            3,  numbersign, asciicircum,asciicircum   ] };

-    key <AE04> { [            4,    currency            ]       };

-    key <AE05> { [            5,     percent,      degree,     degree   ] };

-    key <AE06> { [            6,   ampersand            ]       };

-    key <AE07> { [            7,       slash,       grave,      grave   ] };

-    key <AE08> { [            8,   parenleft            ]       };

-    key <AE09> { [            9,  parenright            ]       };

-    key <AE10> { [            0,       equal            ]       };

-    key <AE11> { [         plus,    question            ]       };

-    key <AE12> { [   apostrophe,    asterisk            ]       };

-

-    key <AD01> { [           q,           Q,    backslash,  backslash   ] };

-    key <AD02> { [           w,           W,          bar,        bar   ] };

-    key <AD03> { [           e,           E,     EuroSign,   EuroSign   ] };

-    key <AD05> { [           t,           T             ]       };

-    key <AD06> { [           z,           Z             ]       };

-    key <AD07> { [           u,           U             ]       };

-    key <AD08> { [           i,           I             ]       };

-    key <AD11> { [      abreve,      Abreve,     division,   division   ] };

-    key <AD12> { [ icircumflex, Icircumflex,     multiply,   multiply   ] };

-

-    key <AC04> { [           f,           F             ]       };

-    key <AC05> { [           g,           G             ]       };

-    key <AC10> { [    scedilla,    Scedilla,       dollar,     dollar   ] };

-    key <AC11> { [    tcedilla,    Tcedilla,       ssharp,     ssharp   ] };

-

-    key <AB01> { [           y,           Y             ]       };

-    key <AB05> { [           b,           B,    braceleft,  braceleft   ] };

-    key <AB06> { [           n,           N,   braceright, braceright   ] };

-    key <AB07> { [           m,           M,      section,    section   ] };

-    key <AB08> { [       comma,   semicolon,         less,       less   ] };

-    key <AB09> { [      period,       colon,      greater,    greater   ] };

-    key <AB10> { [       minus,  underscore             ]       };

-

-    key <BKSL> { [ acircumflex, Acircumflex             ]       };

-

-    // End alphanumeric section, begin "Keypad"

-    include "kpdl(comma)"

-    // End "Keypad" section

-

-    include "level3(ralt_switch)"

-

-};

-

-// Crimean Tatar (Crimean Turkish) layouts.

-partial

-xkb_symbols "crh_f" {

-    include "tr(crh_f)"

-

-    name[Group1]="Romania - Crimean Tatar (Turkish F)";

-};

-

-partial

-xkb_symbols "crh_alt" {

-    include "tr(crh_alt)"

-

-    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";

-};

-

-partial

-xkb_symbols "crh_dobruca1" {

-    include "tr(crh)"

-

-    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";

-

-    key <AD05>	{ [         t,          T,       tcedilla,       Tcedilla ]	};

-    key <AD10>	{ [         p,          P,         abreve,         Abreve ]	};

-

-    key <AC04>	{ [         f,          F,         ibreve,         Ibreve ]	};

-    key <AC07>	{ [    iacute,     Iacute,              j,              J ]	};

-

-    key <AB07>	{ [         m,          M,      trademark,      masculine ]	};

-};

-

-partial

-xkb_symbols "crh_dobruca2" {

-    include "ro(crh_dobruca1)"

-

-    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";

-

-    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};

-    key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};

-};

+//
+// Complete set of Romanian keyboards as described in the new Romanian standard
+// SR 13392:2004 adopted in December 2004 by ASRO, "Asociatia de Standardizare 
+// din Romania".
+// 
+// The default mapping is the RO_US/Programmers layout because of the lack of 
+// Romanian hardware keyboards. The primary standard layout is implemented as 
+// the "std" variant. If you're determined to get cedillas as in ISO-8859-2  
+// (and not commabelow accents as in ISO-8859-16) use the defined variants 
+// "cedilla" for the default layout or "std_cedilla" for the standard one. 
+// Pre-Vista MS compatible layout included (use the "winkeys" variant).
+// 
+// Created by Cristian Gafton, <gafton@redhat.com> (C) 2000
+// Modified by Marius Andreiana, <mandreiana@yahoo.com> (C) 2001
+// Completed by Misu Moldovan, <dumol@gnome.ro> (C) 2001, 2004-2008.
+// v 1.4
+
+
+partial default alphanumeric_keys
+xkb_symbols "basic" {
+// This RO_US/Programmers layout, although the secondary layout in the 
+// Romanian standard, has always been the "de facto" standard in the 
+// Linux/Unix world. It is implemented here as the default layout and it's
+// fully compatible with an US keyboard (Euro on AltGr+5 doesn't count).
+
+    include "us"
+
+    name[Group1]="Romania";
+
+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
+    key <AD01> { [ q,                      Q,  acircumflex,   Acircumflex ] };
+    key <AD02> { [ w,                      W,  ssharp	 	          ] };
+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
+    key <AD05> { [ t,                      T,  0x100021b,       0x100021a ] };
+    key <AD08> { [ i,                      I,  icircumflex,   Icircumflex ] };
+    key <AD10> { [ p,                      P,  section 			  ] };
+    key <AD11> { [ bracketleft,    braceleft,  doublelowquotemark 	  ] };
+    key <AD12> { [ bracketright,  braceright,  rightdoublequotemark 	  ] };
+    key <AC01> { [ a,                      A,  abreve,             Abreve ] };
+    key <AC02> { [ s,                      S,  0x1000219,       0x1000218 ] };
+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
+    key <LSGT> { [ backslash,            bar                              ] };
+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
+    key <AB08> { [ comma, 	        less,  guillemotleft	          ] };
+    key <AB09> { [ period, 	     greater,  guillemotright 	          ] };
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+xkb_symbols "cedilla" {
+    // Variant of the basic layout with cedillas.
+    // Implements S and T with cedilllas as in ISO-8859-2.
+    // Included for compatibility reasons (this used to be the def variant).
+
+    include "ro(basic)"
+
+    name[Group1]="Romania - Cedilla";
+
+    key <AD05> { [ t,                      T,  tcedilla,	 Tcedilla ] };
+    key <AC02> { [ s,                      S,  scedilla,	 Scedilla ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "std" {
+    // Primary layout in the new Romanian standard.
+    // Implemented here as a variant because of the lack of hardware 
+    // Romanian keyboards and because of the predilection of Romanian
+    // X users towards the secondary layout from the new standard.
+
+    include "us"
+
+    name[Group1]="Romania - Standard";
+
+    key <TLDE> { [ doublelowquotemark, rightdoublequotemark, grave, asciitilde ] };
+    key <AE01> { [ 1,                 exclam,  dead_tilde		  ] };
+    key <AE02> { [ 2,                     at,  dead_caron		  ] };
+    key <AE03> { [ 3,             numbersign,  dead_circumflex 	  	  ] };
+    key <AE04> { [ 4,                 dollar,  dead_breve		  ] };
+    key <AE05> { [ 5,                percent,  dead_abovering		  ] };
+    key <AE06> { [ 6,            asciicircum,  dead_ogonek		  ] };
+    key <AE07> { [ 7,              ampersand,  dead_grave		  ] };
+    key <AE08> { [ 8,               asterisk,  dead_abovedot		  ] };
+    key <AE09> { [ 9,              parenleft,  dead_acute		  ] };
+    key <AE10> { [ 0,             parenright,  dead_doubleacute	  	  ] };
+    key <AE11> { [ minus,         underscore,  dead_diaeresis,     endash ] };
+    key <AE12> { [ equal,               plus,  dead_cedilla,    plusminus ] };
+    key <AD03> { [ e,                      E,  EuroSign  	          ] };
+    key <AD10> { [ p,                      P,  section 			  ] };
+    key <AD11> { [ abreve, 	      Abreve,  bracketleft,     braceleft ] };
+    key <AD12> { [ icircumflex,  Icircumflex,  bracketright,   braceright ] };
+    key <BKSL> { [ acircumflex,  Acircumflex,  backslash,             bar ] };
+    key <AC02> { [ s, 			   S,  ssharp			  ] };
+    key <AC03> { [ d,                      D,  dstroke,  	  Dstroke ] };
+    key <AC09> { [ l,                      L,  lstroke,  	  Lstroke ] };
+    key <AC10> { [ 0x1000219,	   0x1000218,  semicolon, 	    colon ] };
+    key <AC11> { [ 0x100021b,	   0x100021a,  apostrophe, 	 quotedbl ] };
+    key <LSGT> { [ backslash,            bar                              ] };
+    key <AB03> { [ c,                      C,  copyright 	       	  ] };
+    key <AB08> { [ comma, 	   semicolon,  less, 	    guillemotleft ] };
+    key <AB09> { [ period,             colon,  greater,    guillemotright ] };
+
+    key <KPDL> { [ KP_Delete,   KP_Separator ] };
+
+    include "level3(ralt_switch)"
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "std_cedilla" {
+    // Variant of the "std" layout with cedillas.
+    // Implements S and T with cedillas as in ISO-8859-2.
+    // Included for compatibility reasons.
+
+    include "ro(std)"
+
+    name[Group1]="Romania - Standard (Cedilla)";
+
+    key <AC10> { [ scedilla, 	    Scedilla ] };
+    key <AC11> { [ tcedilla, 	    Tcedilla ] };
+};
+
+
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+    // Describes the differences between a very simple US/ASCII
+    // keyboard and a very simple Romanian keybaord
+    // Created by Manfred Pohler, <Manfred.Pohler@t-online.de> (C) 2003
+
+    include "latin"
+
+    name[Group1]="Romania - Winkeys";
+
+    // Alphanumeric section
+    key <TLDE> { [ bracketright, bracketleft            ]       };
+
+    key <AE01> { [            1,      exclam,  asciitilde, asciitilde   ] };
+    key <AE02> { [            2,    quotedbl,          at,         at   ] };
+    key <AE03> { [            3,  numbersign, asciicircum,asciicircum   ] };
+    key <AE04> { [            4,    currency            ]       };
+    key <AE05> { [            5,     percent,      degree,     degree   ] };
+    key <AE06> { [            6,   ampersand            ]       };
+    key <AE07> { [            7,       slash,       grave,      grave   ] };
+    key <AE08> { [            8,   parenleft            ]       };
+    key <AE09> { [            9,  parenright            ]       };
+    key <AE10> { [            0,       equal            ]       };
+    key <AE11> { [         plus,    question            ]       };
+    key <AE12> { [   apostrophe,    asterisk            ]       };
+
+    key <AD01> { [           q,           Q,    backslash,  backslash   ] };
+    key <AD02> { [           w,           W,          bar,        bar   ] };
+    key <AD03> { [           e,           E,     EuroSign,   EuroSign   ] };
+    key <AD05> { [           t,           T             ]       };
+    key <AD06> { [           z,           Z             ]       };
+    key <AD07> { [           u,           U             ]       };
+    key <AD08> { [           i,           I             ]       };
+    key <AD11> { [      abreve,      Abreve,     division,   division   ] };
+    key <AD12> { [ icircumflex, Icircumflex,     multiply,   multiply   ] };
+
+    key <AC04> { [           f,           F             ]       };
+    key <AC05> { [           g,           G             ]       };
+    key <AC10> { [    scedilla,    Scedilla,       dollar,     dollar   ] };
+    key <AC11> { [    tcedilla,    Tcedilla,       ssharp,     ssharp   ] };
+
+    key <AB01> { [           y,           Y             ]       };
+    key <AB05> { [           b,           B,    braceleft,  braceleft   ] };
+    key <AB06> { [           n,           N,   braceright, braceright   ] };
+    key <AB07> { [           m,           M,      section,    section   ] };
+    key <AB08> { [       comma,   semicolon,         less,       less   ] };
+    key <AB09> { [      period,       colon,      greater,    greater   ] };
+    key <AB10> { [       minus,  underscore             ]       };
+
+    key <BKSL> { [ acircumflex, Acircumflex             ]       };
+
+    // End alphanumeric section, begin "Keypad"
+    include "kpdl(comma)"
+    // End "Keypad" section
+
+    include "level3(ralt_switch)"
+
+};
+
+// Crimean Tatar (Crimean Turkish) layouts.
+partial
+xkb_symbols "crh_f" {
+    include "tr(crh_f)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish F)";
+};
+
+partial
+xkb_symbols "crh_alt" {
+    include "tr(crh_alt)"
+
+    name[Group1]="Romania - Crimean Tatar (Turkish Alt-Q)";
+};
+
+partial
+xkb_symbols "crh_dobruca1" {
+    include "tr(crh)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-1 Q)";
+
+    key <AD05>	{ [         t,          T,       tcedilla,       Tcedilla ]	};
+    key <AD10>	{ [         p,          P,         abreve,         Abreve ]	};
+
+    key <AC04>	{ [         f,          F,         ibreve,         Ibreve ]	};
+    key <AC07>	{ [    iacute,     Iacute,              j,              J ]	};
+
+    key <AB07>	{ [         m,          M,      trademark,      masculine ]	};
+};
+
+partial
+xkb_symbols "crh_dobruca2" {
+    include "ro(crh_dobruca1)"
+
+    name[Group1]="Romania - Crimean Tatar (Dobruca-2 Q)";
+
+    key <AC04>	{ [         f,          F,          iacute,          Iacute ]	};
+    key <AC07>	{ [    ibreve,     Ibreve,               j,               J ]	};
+};
+
+// EXTRAS:
+
+partial alphanumeric_keys
+xkb_symbols "ergonomic" {
+    // This layout is optimized for fast touch-typing in Romanian on a
+    // US keyboard, and works by swapping out symbols infrequently used
+    // in written Romanian (q,w,y,k) in favor of native ones, thus reducing
+    // the need to use modifier keys.
+    // Created by Gabriel Somlo, <somlo@cmu.edu> (C) 2011
+
+    include "ro(basic)"
+
+    name[Group1]="Romania - Ergonomic Touchtype";
+
+    key <AD01> { [ abreve,            Abreve,  q,                       Q ] };
+    key <AD02> { [ 0x1000219,      0x1000218,  w,                       W ] };
+    key <AD06> { [ 0x100021b,      0x100021a,  y,                       Y ] };
+    key <AC01> { [ a,                      A,  acircumflex,   Acircumflex ] };
+    key <AC08> { [ icircumflex,  Icircumflex,  k,                       K ] };
+};
+