merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE

6 files changed, 187 insertions, 12 deletions

diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h
index 9f86f9f..bc24ced 100644
--- a/include/X11/Xlib.h
+++ b/include/X11/Xlib.h
@@ -1,3 +1,4 @@
+/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.6 2003-12-20 00:28:22 kaleb Exp $ */
 /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */
 /* 
 
@@ -24,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/Xlib.h,v 3.25 2003/11/17 22:20:10 dawes Exp $ */
+/* $XFree86: xc/lib/X11/Xlib.h,v 3.26 2003/12/18 16:38:35 dawes Exp $ */
 
 
 /*
@@ -52,6 +53,10 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* USG */
 
+#if defined(SCO325) || defined(__USLC__)
+#include <stdint.h>
+#endif
+
 #include <X11/X.h>
 
 /* applications should not depend on these two headers being included! */
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 1ba8de7..6ee23a5 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -1,7 +1,8 @@
 XCOMM UTF-8 (Unicode) compose sequence
 XCOMM David.Monniaux@ens.fr
 XCOMM
-XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.9 2003/04/03 22:24:53 dawes Exp $
+XCOMM $XdotOrg: lib/X11/nls/en_US.UTF-8/Compose.pre,v 1.1.4.3 2003-12-20 00:28:23 kaleb Exp $
+XCOMM $XFree86: xc/nls/Compose/en_US.UTF-8,v 1.10 2003/12/05 04:10:28 dawes Exp $
 
 XCOMM Part 1 - Manual definitions
 
@@ -2337,6 +2338,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <A>	: "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <A>	: "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <A>	: "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <Acircumflex>		: "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1ea1>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ea1>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
@@ -2345,6 +2347,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <a>	: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <acircumflex>		: "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <acute> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
 <Multi_key> <apostrophe> <Abreve>	: "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
@@ -2461,6 +2464,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_breve> <combining_belowdot> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <U> <combining_belowdot> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <combining_belowdot> <A>	: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
+<dead_belowdot> <Abreve>		: "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
 <dead_breve> <U1ea1>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <U> <U1ea1>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <U1ea1>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
@@ -2473,6 +2477,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <dead_breve> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <U> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <Multi_key> <b> <combining_belowdot> <a>	: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
+<dead_belowdot> <abreve>		: "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
 <dead_belowdot> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <Multi_key> <exclam> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
 <combining_belowdot> <E>	: "Ẹ" U1EB8 # LATIN CAPITAL LETTER E WITH DOT BELOW
@@ -2577,6 +2582,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <E>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <Ecircumflex>	: "Ệ" U1EC6 # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1eb9>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1eb9>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
@@ -2585,6 +2591,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <e>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <ecircumflex>	: "ệ" U1EC7 # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
 <dead_hook> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <Multi_key> <question> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
 <combining_hook> <I>	: "Ỉ" U1EC8 # LATIN CAPITAL LETTER I WITH HOOK ABOVE
@@ -2695,6 +2702,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <O>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <Ocircumflex>	: "Ộ" U1ED8 # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <U1ecd>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <U1ecd>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <dead_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
@@ -2703,7 +2711,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <asciicircum> <exclam> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_circumflex> <combining_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <Multi_key> <asciicircum> <combining_belowdot> <o>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
+<dead_belowdot> <ocircumflex>	: "ộ" U1ED9 # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
 <dead_acute> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
+<dead_acute> <U01A0>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <acute> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <Ohorn>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <dead_acute> <dead_horn> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
@@ -2716,6 +2726,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_acute> <dead_horn> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <combining_acute> <Multi_key> <plus> <O>	: "Ớ" U1EDA # LATIN CAPITAL LETTER O WITH HORN AND ACUTE
 <dead_acute> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
+<dead_acute> <U01A1>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <acute> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <ohorn>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <dead_acute> <dead_horn> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
@@ -2728,6 +2739,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_acute> <dead_horn> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <combining_acute> <Multi_key> <plus> <o>	: "ớ" U1EDB # LATIN SMALL LETTER O WITH HORN AND ACUTE
 <dead_grave> <Ohorn>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
+<dead_grave> <U01A0>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <Ohorn>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
@@ -2737,6 +2749,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_grave> <dead_horn> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <combining_grave> <Multi_key> <plus> <O>	: "Ờ" U1EDC # LATIN CAPITAL LETTER O WITH HORN AND GRAVE
 <dead_grave> <ohorn>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
+<dead_grave> <U01A1>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <Multi_key> <grave> <ohorn>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
@@ -2746,6 +2759,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_grave> <dead_horn> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <combining_grave> <Multi_key> <plus> <o>	: "ờ" U1EDD # LATIN SMALL LETTER O WITH HORN AND GRAVE
 <dead_hook> <Ohorn>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
+<dead_hook> <U01A0>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Ohorn>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
@@ -2755,6 +2769,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_hook> <dead_horn> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <combining_hook> <Multi_key> <plus> <O>	: "Ở" U1EDE # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <ohorn>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
+<dead_hook> <U01A1>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <ohorn>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
@@ -2764,6 +2779,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_hook> <dead_horn> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <combining_hook> <Multi_key> <plus> <o>	: "ở" U1EDF # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
 <dead_tilde> <Ohorn>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
+<dead_tilde> <U01A0>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Ohorn>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
@@ -2773,6 +2789,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_tilde> <dead_horn> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <combining_tilde> <Multi_key> <plus> <O>	: "Ỡ" U1EE0 # LATIN CAPITAL LETTER O WITH HORN AND TILDE
 <dead_tilde> <ohorn>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
+<dead_tilde> <U01A1>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <Multi_key> <asciitilde> <ohorn>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
@@ -2782,6 +2799,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_tilde> <dead_horn> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <combining_tilde> <Multi_key> <plus> <o>	: "ỡ" U1EE1 # LATIN SMALL LETTER O WITH HORN AND TILDE
 <dead_belowdot> <Ohorn>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
+<dead_belowdot> <U01A0>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Ohorn>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
@@ -2791,6 +2809,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_belowdot> <dead_horn> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <combining_belowdot> <Multi_key> <plus> <O>	: "Ợ" U1EE2 # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <ohorn>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
+<dead_belowdot> <U01A1>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <ohorn>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <o>	: "ợ" U1EE3 # LATIN SMALL LETTER O WITH HORN AND DOT BELOW
@@ -2812,6 +2831,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <Multi_key> <question> <u>	: "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <combining_hook> <u>	: "ủ" U1EE7 # LATIN SMALL LETTER U WITH HOOK ABOVE
 <dead_acute> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
+<dead_acute> <U01AF>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <Uhorn>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <dead_acute> <dead_horn> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
@@ -2824,6 +2844,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_acute> <dead_horn> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <combining_acute> <Multi_key> <plus> <U>	: "Ứ" U1EE8 # LATIN CAPITAL LETTER U WITH HORN AND ACUTE
 <dead_acute> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
+<dead_acute> <U01B0>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <acute> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <Multi_key> <apostrophe> <uhorn>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <dead_acute> <dead_horn> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
@@ -2836,6 +2857,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_acute> <dead_horn> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <combining_acute> <Multi_key> <plus> <u>	: "ứ" U1EE9 # LATIN SMALL LETTER U WITH HORN AND ACUTE
 <dead_grave> <Uhorn>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
+<dead_grave> <U01AF>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <Uhorn>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
@@ -2845,6 +2867,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_grave> <dead_horn> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <combining_grave> <Multi_key> <plus> <U>	: "Ừ" U1EEA # LATIN CAPITAL LETTER U WITH HORN AND GRAVE
 <dead_grave> <uhorn>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
+<dead_grave> <U01B0>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <Multi_key> <grave> <uhorn>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_grave> <dead_horn> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_grave> <Multi_key> <plus> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
@@ -2854,6 +2877,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_grave> <dead_horn> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <combining_grave> <Multi_key> <plus> <u>	: "ừ" U1EEB # LATIN SMALL LETTER U WITH HORN AND GRAVE
 <dead_hook> <Uhorn>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
+<dead_hook> <U01AF>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <Uhorn>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
@@ -2863,6 +2887,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_hook> <dead_horn> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <combining_hook> <Multi_key> <plus> <U>	: "Ử" U1EEC # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <uhorn>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
+<dead_hook> <U01B0>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <Multi_key> <question> <uhorn>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <dead_horn> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_hook> <Multi_key> <plus> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
@@ -2872,6 +2897,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_hook> <dead_horn> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <combining_hook> <Multi_key> <plus> <u>	: "ử" U1EED # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
 <dead_tilde> <Uhorn>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
+<dead_tilde> <U01AF>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <Uhorn>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
@@ -2881,6 +2907,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_tilde> <dead_horn> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <combining_tilde> <Multi_key> <plus> <U>	: "Ữ" U1EEE # LATIN CAPITAL LETTER U WITH HORN AND TILDE
 <dead_tilde> <uhorn>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
+<dead_tilde> <U01B0>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <Multi_key> <asciitilde> <uhorn>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_tilde> <dead_horn> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_tilde> <Multi_key> <plus> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
@@ -2890,6 +2917,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_tilde> <dead_horn> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <combining_tilde> <Multi_key> <plus> <u>	: "ữ" U1EEF # LATIN SMALL LETTER U WITH HORN AND TILDE
 <dead_belowdot> <Uhorn>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
+<dead_belowdot> <U01AF>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <Uhorn>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
@@ -2899,6 +2927,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
 <combining_belowdot> <dead_horn> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <combining_belowdot> <Multi_key> <plus> <U>	: "Ự" U1EF0 # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <uhorn>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
+<dead_belowdot> <U01B0>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <Multi_key> <exclam> <uhorn>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <dead_horn> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
 <dead_belowdot> <Multi_key> <plus> <u>	: "ự" U1EF1 # LATIN SMALL LETTER U WITH HORN AND DOT BELOW
diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre
index e33ea45..2a669de 100644
--- a/nls/locale.alias.pre
+++ b/nls/locale.alias.pre
@@ -1,3 +1,4 @@
+XCOMM	$XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.3 2003-12-20 00:28:22 kaleb Exp $
 XCOMM	$Xorg: locale.alias,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains alias name of locale.
@@ -5,7 +6,7 @@ XCOMM	Each alias name is described within one line.
 XCOMM	The first word is the alias name (simplified locale name)
 XCOMM	the second word is full locale name.
 XCOMM
-XCOMM	$XFree86: xc/nls/locale.alias,v 1.63 2003/08/06 14:04:00 eich Exp $
+XCOMM	$XFree86: xc/nls/locale.alias,v 1.64 2003/12/18 04:14:22 dawes Exp $
 XCOMM
 
 POSIX:						C
@@ -676,14 +677,13 @@ yi_US.cp1255:					yi_US.CP1255
 yi_US.microsoftcp1255:				yi_US.CP1255
 yi_US.microsoft-cp1255:				yi_US.CP1255
 yi_US.MICROSOFT-CP1255:				yi_US.CP1255
-zh_CN:						zh_CN.gbk
+zh_CN:						zh_CN.gb2312
 zh_CN.Big5:					zh_TW.big5
 zh_CN.EUC:					zh_CN.eucCN
-zh_CN.GB2312:					zh_CN.eucCN
+zh_CN.GB2312:					zh_CN.gb2312
 zh_CN.GBK:					zh_CN.gbk
 zh_CN.big5:					zh_TW.big5
 zh_CN.euc:					zh_CN.eucCN
-zh_CN.gb2312:					zh_CN.eucCN
 zh_CN.utf8:					zh_CN.UTF-8
 zh_HK:						zh_HK.big5hkscs
 zh_HK.Big5hkscs:				zh_HK.big5hkscs
diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre
index d3db1b4..38a3170 100644
--- a/nls/locale.dir.pre
+++ b/nls/locale.dir.pre
@@ -1,10 +1,11 @@
+XCOMM	$XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.3 2003-12-20 00:28:22 kaleb Exp $
 XCOMM	$Xorg: locale.dir,v 1.3 2000/08/17 19:46:48 cpqbld Exp $
 XCOMM
 XCOMM	This file contains locale database file names
 XCOMM	The first word is the locale database file name and
 XCOMM	the second word is the full locale name.
 XCOMM
-XCOMM	$XFree86: xc/nls/locale.dir,v 1.43 2003/08/06 14:04:00 eich Exp $
+XCOMM	$XFree86: xc/nls/locale.dir,v 1.44 2003/12/18 04:14:22 dawes Exp $
 XCOMM
 
 C/XLC_LOCALE:				C
@@ -218,9 +219,8 @@ iso8859-1/XLC_LOCALE:			wa_BE.ISO8859-1
 iso8859-15/XLC_LOCALE:			wa_BE.ISO8859-15
 microsoft-cp1255/XLC_LOCALE:		yi_US.CP1255
 zh_CN/XLC_LOCALE:			zh_CN.eucCN
-zh_CN/XLC_LOCALE:			zh_CN.GB2312
+zh_CN/XLC_LOCALE:			zh_CN.gb2312
 zh_CN.gbk/XLC_LOCALE:			zh_CN.gbk
-zh_CN.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
 zh_HK.big5/XLC_LOCALE:			zh_HK.big5
 zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.big5-hkscs
 zh_HK.big5hkscs/XLC_LOCALE:		zh_HK.Big5-HKSCS
@@ -369,7 +369,7 @@ en_US.UTF-8/XLC_LOCALE:			ur_PK.UTF-8
 en_US.UTF-8/XLC_LOCALE:			vi_VN.UTF-8
 en_US.UTF-8/XLC_LOCALE:			wa_BE.UTF-8
 en_US.UTF-8/XLC_LOCALE:			yi_US.UTF-8
-en_US.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
+zh_CN.UTF-8/XLC_LOCALE:			zh_CN.UTF-8
 zh_TW.UTF-8/XLC_LOCALE:			zh_TW.UTF-8
 #ifdef __uxp__
 ja.U90/XLC_LOCALE:			ja_JP.U90
diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 0000000..c1f3037
--- /dev/null
+++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre
@@ -0,0 +1,140 @@
+XCOMM     XFree86 NLS for Chinese locale zh_CN.UTF-8
+XCOMM          Modified from xc/nls/XLC_LOCALE/en_US.UTF-8
+XCOMM          by James Su <suzhe@turbolinux.com.cn>
+XCOMM
+XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.4.1 2003-12-20 00:28:23 kaleb Exp $
+XCOMM $XFree86: xc/nls/XLC_LOCALE/zh_CN.UTF-8,v 1.3 2003/12/18 04:18:00 dawes Exp $
+
+XCOMM 
+XCOMM  XLC_FONTSET category
+XCOMM 
+XLC_FONTSET
+
+on_demand_loading      True
+
+object_name            generic
+
+XCOMM  We leave the legacy encodings in for the moment, because we don't
+XCOMM  have that many ISO10646 fonts yet.
+XCOMM  fs0 class (7 bit ASCII)
+fs0    {
+       charset {
+               name    ISO8859-1:GL
+       }
+       font    {
+               primary         ISO8859-1:GL
+               vertical_rotate all
+       }
+}
+
+XCOMM  fs1 class (ISO8859 families)
+fs1    {
+       charset {
+               name    ISO8859-1:GR
+       }
+       font    {
+               primary ISO8859-1:GR
+       }
+}
+
+XCOMM  fs2 class (Chinese Han Character)
+fs2    {
+       charset {
+               name    GB2312.1980-0:GL
+       }
+       font    {
+               primary GB2312.1980-0:GL
+       }
+}
+
+XCOMM  fs3 class (Chinese Han Character GBK)
+fs3    {
+       charset {
+               name    GBK-0:GLGR
+       }
+       font    {
+               primary GBK-0:GLGR
+               substitute GB13000.1993-1:GLGR
+       }
+}
+
+XCOMM 	fs4 class (Kanji)
+fs4	{
+	charset	{
+		name	JISX0208.1983-0:GL
+	}
+	font	{
+		primary	JISX0208.1983-0:GL
+	}
+}
+
+XCOMM   fs5 class (Korean Character)
+fs5	{
+	charset	{
+		name	KSC5601.1987-0:GL
+	}
+	font	{
+		primary	KSC5601.1987-0:GL
+	}
+}
+
+XCOMM	fs6 class (Half Kana)
+fs6	{
+	charset	{
+		name	JISX0201.1976-0:GR
+	}
+	font	{
+		primary		JISX0201.1976-0:GR
+		vertical_rotate	all
+	}
+}
+
+XCOMM  fs7 class
+fs7    {
+       charset {
+               name    ISO10646-1
+       }
+       font    {
+               primary ISO10646-1
+       }
+}
+END XLC_FONTSET
+
+XCOMM 
+XCOMM  XLC_XLOCALE category
+XCOMM 
+XLC_XLOCALE
+
+encoding_name          UTF-8
+mb_cur_max             6
+state_depend_encoding  False
+
+XCOMM  cs0 class
+cs0    {
+       side            GL:Default
+       length          1
+       ct_encoding     ISO8859-1:GL
+}
+
+XCOMM  cs1 class
+cs1     {
+        side            GR:Default
+        length          1
+        ct_encoding     ISO8859-1:GR
+}
+ 
+XCOMM  cs2 class
+cs2     {
+        side            GR
+        length          2
+        ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
+}
+
+XCOMM  cs3 class
+cs3    {
+       side            none
+       ct_encoding     ISO10646-1
+}
+
+END XLC_XLOCALE
+
diff --git a/src/ConnDis.c b/src/ConnDis.c
index 739d49b..fbe821d 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.3 2003-12-06 13:24:22 kaleb Exp $ */
+/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.4 2003-12-20 00:28:22 kaleb Exp $ */
 /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */
 /*
  
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/X11/ConnDis.c,v 3.28 2003/12/02 23:33:17 herrb Exp $ */
+/* $XFree86: xc/lib/X11/ConnDis.c,v 3.29 2003/12/19 02:05:37 dawes Exp $ */
 
 /* 
  * This file contains operating system dependencies.
@@ -36,6 +36,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xlibint.h>
 #include <X11/Xtrans.h>
 #include <X11/Xauth.h>
+#include <X11/Xdmcp.h>
 #include <stdio.h>
 #include <ctype.h>