xserver libxcb mesa git update 5 Mar 2011

2 files changed, 114 insertions, 41 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index 270b7a4d6..a56c1b700 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -1,41 +1,41 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
-
-symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
-ad af al \
-am apl ara \
-at az \
-ba bd be \
-bg br brai \
-bt bw by \
-ca cd \
-ch cn cz \
-de dk \
-ee es et epo \
-fi fo fr \
-gb ge gh gn \
-gr hr hu \
-ie il in iq \
-ir is it jp \
-ke kg kh \
-kr kz \
-la latam latin \
-lk lt lv \
-ma mao me \
-mk ml mm \
-mn mt mv \
-ng nl no np \
-pc ph pk pl pt \
-ro rs ru \
-se si sk sn \
-sy th \
-terminate \
-tj tm tr 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
-
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr

+

+symbolsdir = $(xkb_base)/symbols

+dist_symbols_DATA = \

+ad af al \

+am apl ara \

+at az \

+ba bd be \

+bg br brai \

+bt bw by \

+ca cd \

+ch cn cz \

+de dk \

+ee es et epo \

+fi fo fr \

+gb ge gh gn \

+gr hr hu \

+ie il in iq \

+ir is it jp \

+ke kg kh \

+kr kz \

+la latam latin \

+lk lt lv \

+ma mao me \

+mk ml mm \

+mn mt mv \

+ng nl no np \

+pc ph pk pl pt \

+ro rs ru \

+se si sk sn \

+sy th \

+terminate \

+tj tm tr tw 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

+

+dir_data = $(dist_symbols_DATA)

+

+include $(top_srcdir)/xkbrules.am

diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
new file mode 100644
index 000000000..8c50023bb
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -0,0 +1,73 @@
+// $XKeyboardConfig$

+

+partial default alphanumeric_keys

+xkb_symbols "tw" {

+

+    name[Group1]= "Taiwan";

+

+    include "us(basic)"

+

+    // Alphanumeric section

+    key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };

+    key <AE01> { [	   1,     exclam,         U030D,       exclamdown ] };

+    key <AE02> { [	   2,         at,         U0358,      twosuperior ] };

+    key <AE03> { [	   3, numbersign,       section,    threesuperior ] };

+    key <AE04> { [	   4,     dollar,           yen,         sterling ] };

+    key <AE05> { [	   5,    percent,      EuroSign,             cent ] };

+    key <AE06> { [         6,asciicircum, dead_circumflex,     dead_caron ] };

+    key <AE07> { [	   7,  ampersand,    dead_acute,         NoSymbol ] };

+    key <AE08> { [	   8,   asterisk,  dead_cedilla,        dead_horn ] };

+    key <AE09> { [	   9,  parenleft,   dead_ogonek,       dead_breve ] };

+    key <AE10> { [	   0, parenright, dead_abovedot,   dead_abovering ] };

+    key <AE11> { [     minus, underscore,   dead_macron,        plusminus ] };

+    key <AE12> { [     equal,       plus,      multiply,         division ] };

+

+    key <AD01> { [	   q,          Q,     paragraph,           degree ] };

+    key <AD03> { [	   e,          E,        eacute,           Eacute ] };

+    key <AD04> { [	   r,          R,         U1E5F,            U1E5E ] };

+    key <AD05> { [	   t,          T,         U1E6F,            U1E6E ] };

+    key <AD06> { [	   y,          Y,         U1E73,            U1E72 ] };

+    key <AD07> { [	   u,          U,         U0289,            U0244 ] };

+    key <AD08> { [	   i,          I,         U0268,            U0197 ] };

+    key <AD09> { [	   o,          O,        oslash,         Ooblique ] };

+

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

+    key <AC03> { [	   d,          D,         U1E0F,            U1E0E ] };

+    key <AC05> { [	   g,          G,           eng,              ENG ] };

+    key <AC10> { [ semicolon,      colon,         U02D0,   dead_diaeresis ] };

+    key <AC11> { [apostrophe,   quotedbl,         U02BC, dead_doubleacute ] };

+

+    key <AB03> { [	   c,          C,      ccedilla,         Ccedilla ] };

+    key <AB06> { [	   n,          N,        ntilde,           Ntilde ] };

+    key <AB07> { [	   m,          M,            mu,               mu ] };

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

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

+    key <AB10> { [     slash,   question,  questiondown,        dead_hook ] };

+    key <BKSL> { [ backslash,        bar,       notsign,        brokenbar ] };

+

+    include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "indigenous" {

+

+  name[Group1]= "Taiwan - Indigenous";

+

+  include "tw(tw)"

+

+  key <AC11> { [      U02BC,    quotedbl,      apostrophe, dead_doubleacute ] };

+

+  include "level3(ralt_switch)"

+};

+

+partial alphanumeric_keys

+xkb_symbols "saisiyat" {

+

+  name[Group1]= "Taiwan - Saisiyat";

+

+  include "tw(indigenous)"

+

+  key <AC10> { [ U02D0,      colon,         semicolon,   dead_diaeresis ] };

+

+  include "level3(ralt_switch)"

+};