merge XFree86 RC2 (4.3.99.902) from vendor branch

parent 2f9610b9
/* $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! */
......
This diff is collapsed.
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
......
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
......
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
/* $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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment