Commit f77694a4 authored by Alexander Gottwald's avatar Alexander Gottwald

Import changes from XORG-6.8.2

parent 10d08801
......@@ -153,6 +153,7 @@ long *\fIbytes_after_return\fP\^, unsigned char **\fIprop_return\fP\^);
.HP
Atom *XListProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
*\fInum_prop_return\fP\^);
.HP
int XChangeProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
\fIproperty\fP\^, Atom \fItype\fP\^, int \fIformat\fP\^, int \fImode\fP\^,
unsigned char *\fIdata\fP\^, int \fInelements\fP\^);
......
......@@ -254,8 +254,6 @@ _XimUnRegisterIMInstantiateCallback(
_XUnregisterFilter( display, RootWindow(display, 0),
_XimFilterPropertyNotify,
(XPointer)NULL );
XSelectInput( display, RootWindow(display, 0),
NoEventMask );
}
else
picb->next = icb->next;
......
......@@ -326,7 +326,7 @@ en_US.UTF-8/Compose: pd_US.UTF-8
en_US.UTF-8/Compose: ph_PH.UTF-8
en_US.UTF-8/Compose: pl_PL.UTF-8
en_US.UTF-8/Compose: pp_AN.UTF-8
en_US.UTF-8/Compose: pt_BR.UTF-8
pt_BR.UTF-8/Compose: pt_BR.UTF-8
en_US.UTF-8/Compose: pt_PT.UTF-8
en_US.UTF-8/Compose: ro_RO.UTF-8
en_US.UTF-8/Compose: ru_RU.UTF-8
......
......@@ -11,19 +11,8 @@ on_demand_loading True
object_name generic
XCOMM fs0 class
XCOMM fs0 class (7 bit ASCII)
fs0 {
charset {
name ISO10646-1
}
font {
primary ISO10646-1
}
}
XCOMM We leave the legacy encodings in for the moment, because we don't
XCOMM have that many ISO10646 fonts yet.
XCOMM fs1 class (7 bit ASCII)
fs1 {
charset {
name ISO8859-1:GL
}
......@@ -32,8 +21,8 @@ fs1 {
vertical_rotate all
}
}
XCOMM fs2 class (ISO8859 families)
fs2 {
XCOMM fs1 class (ISO8859 families)
fs1 {
charset {
name ISO8859-1:GR
}
......@@ -41,8 +30,8 @@ fs2 {
primary ISO8859-1:GR
}
}
XCOMM fs3 class (Kanji)
fs3 {
XCOMM fs2 class (Kanji)
fs2 {
charset {
name JISX0208.1983-0:GL
}
......@@ -50,8 +39,8 @@ fs3 {
primary JISX0208.1983-0:GL
}
}
XCOMM fs4 class (Korean Character)
fs4 {
XCOMM fs3 class (Korean Character)
fs3 {
charset {
name KSC5601.1987-0:GL
}
......@@ -59,8 +48,8 @@ fs4 {
primary KSC5601.1987-0:GL
}
}
XCOMM fs5 class (Chinese Han Character)
fs5 {
XCOMM fs4 class (Chinese Han Character)
fs4 {
charset {
name GB2312.1980-0:GL
}
......@@ -68,8 +57,8 @@ fs5 {
primary GB2312.1980-0:GL
}
}
XCOMM fs6 class (Half Kana)
fs6 {
XCOMM fs5 class (Half Kana)
fs5 {
charset {
name JISX0201.1976-0:GR
}
......@@ -78,6 +67,16 @@ fs6 {
vertical_rotate all
}
}
XCOMM ISO10646 should come last so the fonts above will actually be used
XCOMM fs6 class
fs6 {
charset {
name ISO10646-1
}
font {
primary ISO10646-1
}
}
END XLC_FONTSET
XCOMM
......
XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.2.2.2 2004-09-15 16:33:23 ago Exp $
XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.2.2.3 2005-02-11 10:53:09 ago 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
......@@ -355,7 +355,7 @@ en_US.UTF-8/XLC_LOCALE: pd_US.UTF-8
en_US.UTF-8/XLC_LOCALE: ph_PH.UTF-8
en_US.UTF-8/XLC_LOCALE: pl_PL.UTF-8
en_US.UTF-8/XLC_LOCALE: pp_AN.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_BR.UTF-8
pt_BR.UTF-8/XLC_LOCALE: pt_BR.UTF-8
en_US.UTF-8/XLC_LOCALE: pt_PT.UTF-8
en_US.UTF-8/XLC_LOCALE: ro_RO.UTF-8
en_US.UTF-8/XLC_LOCALE: ru_RU.UTF-8
......
This diff is collapsed.
# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
#
# XI18N objects table for pt_BR.UTF-8 locale
#
XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open
XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister
XOM common/xomGeneric _XomGenericOpenOM # XOM_open
XCOMM XLocale Database Sample for pt_BR.UTF-8
XCOMM
XCOMM Based on XLocale Database Sample for en_US.UTF-8
XCOMM
XCOMM
XCOMM XLC_FONTSET category
XCOMM
XLC_FONTSET
on_demand_loading True
object_name generic
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 (Kanji)
fs2 {
charset {
name JISX0208.1983-0:GL
}
font {
primary JISX0208.1983-0:GL
}
}
XCOMM fs3 class (Korean Character)
fs3 {
charset {
name KSC5601.1987-0:GL
}
font {
primary KSC5601.1987-0:GL
}
}
XCOMM fs4 class (Chinese Han Character)
fs4 {
charset {
name GB2312.1980-0:GL
}
font {
primary GB2312.1980-0:GL
}
}
XCOMM fs5 class (Half Kana)
fs5 {
charset {
name JISX0201.1976-0:GR
}
font {
primary JISX0201.1976-0:GR
vertical_rotate all
}
}
XCOMM ISO10646 is last, per Roland Mainz in
XCOMM http://bugs.freedesktop.org/show_bug.cgi?id=1896
fs6 {
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 JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
JISX0208.1983-1:GL; JISX0208.1983-1:GR
}
XCOMM cs3 class
cs3 {
side GL
length 2
ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
KSC5601.1987-1:GL; KSC5601.1987-1:GR
}
XCOMM cs4 class
cs4 {
side GR
length 2
ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR
}
XCOMM cs5 class
cs5 {
side GR
length 1
ct_encoding JISX0201.1976-0:GR
}
XCOMM cs6 class
cs6 {
side none
ct_encoding ISO10646-1
}
END XLC_XLOCALE
......@@ -3346,7 +3346,7 @@ int _XOpenFile(path, flags)
int flags;
{
char buf[MAX_PATH];
char* bufp;
char* bufp = NULL;
int ret = -1;
UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
......@@ -3365,7 +3365,7 @@ void* _XFopenFile(path, mode)
_Xconst char* mode;
{
char buf[MAX_PATH];
char* bufp;
char* bufp = NULL;
void* ret = NULL;
UINT olderror = SetErrorMode (SEM_FAILCRITICALERRORS);
......
......@@ -363,7 +363,7 @@ XkbRefreshKeyboardMapping(register XkbMapNotifyEvent *event)
if (xkbi->flags&XkbMapPending)
changes= xkbi->changes;
else bzero(&changes,sizeof(XkbChangesRec));
else bzero(&changes,sizeof(changes));
XkbNoteMapChanges(&changes,event,XKB_XLIB_MAP_MASK);
LockDisplay(dpy);
if ((rtrn=XkbGetMapChanges(dpy,xkbi->desc,&changes))!=Success) {
......
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