From 8b943dc58edace4fa4db545d6600559d2c362a4b Mon Sep 17 00:00:00 2001 From: Deron Johnson Date: Thu, 6 Jan 2005 19:56:44 +0000 Subject: Integrate 6.8.2 RC2 changes. --- man/XGetWindowProperty.man | 3 ++- modules/im/ximcp/imInsClbk.c | 4 +--- nls/en_US.UTF-8/XLC_LOCALE.pre | 45 +++++++++++++++++++++--------------------- src/XlibInt.c | 11 ++++++----- src/xkb/XKBBind.c | 4 ++-- 5 files changed, 33 insertions(+), 34 deletions(-) diff --git a/man/XGetWindowProperty.man b/man/XGetWindowProperty.man index e0a8f94e..98f322cf 100644 --- a/man/XGetWindowProperty.man +++ b/man/XGetWindowProperty.man @@ -40,7 +40,7 @@ .\" of this documentation for any purpose. .\" It is provided ``as is'' without express or implied warranty. .\" -.\" $XFree86: xc/doc/man/X11/XGetWProp.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ +.\" $XFree86: xc/doc/man/X11/XGetWProp.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface @@ -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\^); diff --git a/modules/im/ximcp/imInsClbk.c b/modules/im/ximcp/imInsClbk.c index a6143f08..6dfcac4c 100644 --- a/modules/im/ximcp/imInsClbk.c +++ b/modules/im/ximcp/imInsClbk.c @@ -26,7 +26,7 @@ PERFORMANCE OF THIS SOFTWARE. makoto@sm.sony.co.jp ******************************************************************/ -/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.4 2003/11/17 22:20:11 dawes Exp $ */ +/* $XFree86: xc/lib/X11/imInsClbk.c,v 3.3 2003/05/27 22:26:26 tsi Exp $ */ #include #define NEED_EVENTS @@ -254,8 +254,6 @@ _XimUnRegisterIMInstantiateCallback( _XUnregisterFilter( display, RootWindow(display, 0), _XimFilterPropertyNotify, (XPointer)NULL ); - XSelectInput( display, RootWindow(display, 0), - NoEventMask ); } else picb->next = icb->next; diff --git a/nls/en_US.UTF-8/XLC_LOCALE.pre b/nls/en_US.UTF-8/XLC_LOCALE.pre index 9919a8d2..5bb70bbc 100644 --- a/nls/en_US.UTF-8/XLC_LOCALE.pre +++ b/nls/en_US.UTF-8/XLC_LOCALE.pre @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.3 2000/12/01 17:43:02 dawes Exp $ +XCOMM $XFree86: xc/nls/XLC_LOCALE/en_US.UTF-8,v 1.2 2000/02/29 03:09:07 dawes Exp $ XCOMM XLocale Database Sample for en_US.UTF-8 XCOMM @@ -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 diff --git a/src/XlibInt.c b/src/XlibInt.c index 6bb2d181..33c60973 100644 --- a/src/XlibInt.c +++ b/src/XlibInt.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XlibInt.c,v 3.39 2003/11/17 22:20:10 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XlibInt.c,v 3.38 2003/10/30 21:55:05 alanh Exp $ */ /* * XlibInt.c - Internal support routines for the C subroutine @@ -1281,9 +1281,10 @@ void _XReadPad( if (bytes_read > 0) { size -= bytes_read; if (iov[0].iov_len < bytes_read) { - iov[1].iov_len += iov[0].iov_len - bytes_read; + int pad_bytes_read = bytes_read - iov[0].iov_len; + iov[1].iov_len -= pad_bytes_read; iov[1].iov_base = - (char *)iov[1].iov_base + bytes_read - iov[0].iov_len; + (char *)iov[1].iov_base + pad_bytes_read; iov[0].iov_len = 0; } else { @@ -3345,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); @@ -3364,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); diff --git a/src/xkb/XKBBind.c b/src/xkb/XKBBind.c index 7ab1f2d3..5b4ae09d 100644 --- a/src/xkb/XKBBind.c +++ b/src/xkb/XKBBind.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/X11/XKBBind.c,v 3.20 2003/11/17 22:20:09 dawes Exp $ */ +/* $XFree86: xc/lib/X11/XKBBind.c,v 3.19 2003/05/27 22:26:25 tsi Exp $ */ /* the new monsters ate the old ones */ @@ -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) { -- cgit v1.2.1