diff options
| author | Alexander Gottwald <ago@freedesktop.org> | 2004-09-15 16:31:16 +0000 |
|---|---|---|
| committer | Alexander Gottwald <ago@freedesktop.org> | 2004-09-15 16:31:16 +0000 |
| commit | 10d08801a302ea09fb3a86fc73c1764092d84566 (patch) | |
| tree | 948491e4062e776c24c603d557bca4beed7a4488 | |
| parent | ef2795129ec16eba8fd08a30f4131268a6e99f1e (diff) | |
| download | xorg-lib-libX11-10d08801a302ea09fb3a86fc73c1764092d84566.tar.gz | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGE
73 files changed, 196 insertions, 118 deletions
diff --git a/include/X11/Xlib.h b/include/X11/Xlib.h index d0df0a54..c8742864 100644 --- a/include/X11/Xlib.h +++ b/include/X11/Xlib.h @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.4.2.2 2004-03-18 12:00:23 ago Exp $ */ +/* $XdotOrg: lib/X11/include/X11/Xlib.h,v 1.1.4.4.2.3 2004-09-15 16:33:18 ago Exp $ */ /* $Xorg: Xlib.h,v 1.6 2001/02/09 02:03:38 xorgcvs Exp $ */ /* diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h index eaa97388..4ff7fb6e 100644 --- a/include/X11/Xlibint.h +++ b/include/X11/Xlibint.h @@ -386,6 +386,7 @@ extern LockInfoPtr _Xglobal_lock; #define XlibDisplayReadEvents (1L << 5) /* in _XReadEvents */ #define XlibDisplayReply (1L << 5) /* in _XReply */ #define XlibDisplayWriting (1L << 6) /* in _XFlushInt, _XSend */ +#define XlibDisplayDfltRMDB (1L << 7) /* mark if RM db from XGetDefault */ /* * X Protocol packetizing macros. @@ -1297,6 +1298,15 @@ extern void _XSetClipRectangles ( int n, int ordering); +Status _XGetWindowAttributes( + register Display *dpy, + Window w, + XWindowAttributes *attr); + +int _XPutBackEvent ( + register Display *dpy, + register XEvent *event); + _XFUNCPROTOEND #endif /* _XLIBINT_H_ */ diff --git a/include/X11/Xutil.h b/include/X11/Xutil.h index 931cfd0f..82dab7d5 100644 --- a/include/X11/Xutil.h +++ b/include/X11/Xutil.h @@ -247,12 +247,19 @@ typedef struct _XComposeStatus { #define IsMiscFunctionKey(keysym) \ (((KeySym)(keysym) >= XK_Select) && ((KeySym)(keysym) <= XK_Break)) +#ifdef XK_XKB_KEYS #define IsModifierKey(keysym) \ ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \ || (((KeySym)(keysym) >= XK_ISO_Lock) && \ ((KeySym)(keysym) <= XK_ISO_Last_Group_Lock)) \ || ((KeySym)(keysym) == XK_Mode_switch) \ || ((KeySym)(keysym) == XK_Num_Lock)) +#else +#define IsModifierKey(keysym) \ + ((((KeySym)(keysym) >= XK_Shift_L) && ((KeySym)(keysym) <= XK_Hyper_R)) \ + || ((KeySym)(keysym) == XK_Mode_switch) \ + || ((KeySym)(keysym) == XK_Num_Lock)) +#endif /* * opaque reference to Region data type */ diff --git a/man/IsCursorKey.man b/man/IsCursorKey.man index 742ee24b..a490a7d0 100644 --- a/man/IsCursorKey.man +++ b/man/IsCursorKey.man @@ -1,4 +1,4 @@ -.\" $XdotOrg: lib/X11/man/IsCursorKey.man,v 1.1.4.2.2.2 2004-03-29 12:18:00 ago Exp $ +.\" $XdotOrg: lib/X11/man/IsCursorKey.man,v 1.1.4.2.2.3 2004-09-15 16:31:16 ago Exp $ .\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium .\" .\" Permission is hereby granted, free of charge, to any person obtaining diff --git a/man/XAddHost.man b/man/XAddHost.man index 64008814..0c0cfeb3 100644 --- a/man/XAddHost.man +++ b/man/XAddHost.man @@ -47,7 +47,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAddHost.man,v 1.3 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.1.4.2.2.2 2004-03-18 12:00:22 ago Exp $ +.\" $XdotOrg: lib/X11/man/XAddHost.man,v 1.1.4.2.2.3 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man index 138114d5..efe1b065 100644 --- a/man/XAllocSizeHints.man +++ b/man/XAllocSizeHints.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XASHints.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocSizeHints.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XAllocSizeHints.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man index a244f44a..259e2791 100644 --- a/man/XAllocStandardColormap.man +++ b/man/XAllocStandardColormap.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XASCmap.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocStandardColormap.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XAllocStandardColormap.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man index 54ffc719..29097752 100644 --- a/man/XAllocWMHints.man +++ b/man/XAllocWMHints.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAWMHints.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XAllocWMHints.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XAllocWMHints.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XAnyEvent.man b/man/XAnyEvent.man index f9dafc51..d7655d08 100644 --- a/man/XAnyEvent.man +++ b/man/XAnyEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XAnyEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XAnyEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XAnyEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XButtonEvent.man b/man/XButtonEvent.man index b39d01b6..f72e02bb 100644 --- a/man/XButtonEvent.man +++ b/man/XButtonEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XButEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XButtonEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XButtonEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man index 84c96463..8b1a7ef9 100644 --- a/man/XChangeKeyboardControl.man +++ b/man/XChangeKeyboardControl.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCKCntrl.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XChangeKeyboardControl.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XChangeKeyboardControl.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man index 7844aa8b..9805c592 100644 --- a/man/XChangeKeyboardMapping.man +++ b/man/XChangeKeyboardMapping.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCKMping.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XChangeKeyboardMapping.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XChangeKeyboardMapping.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCirculateEvent.man b/man/XCirculateEvent.man index 3ccf0d9c..ea2f43fb 100644 --- a/man/XCirculateEvent.man +++ b/man/XCirculateEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCirEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCirculateEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCirculateEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCirculateRequestEvent.man b/man/XCirculateRequestEvent.man index 376456d5..6b6e5905 100644 --- a/man/XCirculateRequestEvent.man +++ b/man/XCirculateRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCirREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCirculateRequestEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCirculateRequestEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XClientMessageEvent.man b/man/XClientMessageEvent.man index fcb7215c..982a4157 100644 --- a/man/XClientMessageEvent.man +++ b/man/XClientMessageEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCMEvent.man,v 1.2 2001/01/27 18:19:56 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XClientMessageEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XClientMessageEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XColormapEvent.man b/man/XColormapEvent.man index 4e14fa48..0ab3da13 100644 --- a/man/XColormapEvent.man +++ b/man/XColormapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCmpEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XColormapEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XColormapEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureEvent.man b/man/XConfigureEvent.man index 4370a231..a4f44be5 100644 --- a/man/XConfigureEvent.man +++ b/man/XConfigureEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureRequestEvent.man b/man/XConfigureRequestEvent.man index ab9ffa42..2cb96d63 100644 --- a/man/XConfigureRequestEvent.man +++ b/man/XConfigureRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConREven.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureRequestEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureRequestEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man index cce75389..b5038d37 100644 --- a/man/XConfigureWindow.man +++ b/man/XConfigureWindow.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XConfWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XConfigureWindow.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XConfigureWindow.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man index b31f4fed..0ea54c13 100644 --- a/man/XCreateColormap.man +++ b/man/XCreateColormap.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreCmap.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateColormap.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCreateColormap.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateGC.man b/man/XCreateGC.man index 5505a7fd..6d4dbbc9 100644 --- a/man/XCreateGC.man +++ b/man/XCreateGC.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreGC.man,v 1.6 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateGC.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCreateGC.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man index cb47db5e..e4410f68 100644 --- a/man/XCreateWindow.man +++ b/man/XCreateWindow.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCreateWindowEvent.man b/man/XCreateWindowEvent.man index cadbd1da..52008662 100644 --- a/man/XCreateWindowEvent.man +++ b/man/XCreateWindowEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCWEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCreateWindowEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCreateWindowEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XCrossingEvent.man b/man/XCrossingEvent.man index 154cde93..3b061279 100644 --- a/man/XCrossingEvent.man +++ b/man/XCrossingEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XCroEvent.man,v 1.2 2001/01/27 18:19:57 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XCrossingEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XCrossingEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDestroyWindowEvent.man b/man/XDestroyWindowEvent.man index cd1abc15..5b0773a4 100644 --- a/man/XDestroyWindowEvent.man +++ b/man/XDestroyWindowEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDWEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XDestroyWindowEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XDestroyWindowEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDrawArc.man b/man/XDrawArc.man index 4297c5ee..b45ecad6 100644 --- a/man/XDrawArc.man +++ b/man/XDrawArc.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDrArc.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XDrawArc.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XDrawArc.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XDrawText.man b/man/XDrawText.man index d1989ead..42e27017 100644 --- a/man/XDrawText.man +++ b/man/XDrawText.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XDrText.man,v 1.4 2003/04/28 22:17:54 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XDrawText.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XDrawText.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man index 9bd6d942..48f267c5 100644 --- a/man/XErrorEvent.man +++ b/man/XErrorEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XErrEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XErrorEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XErrorEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XExposeEvent.man b/man/XExposeEvent.man index ff770cde..9442387a 100644 --- a/man/XExposeEvent.man +++ b/man/XExposeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XExpEvent.man,v 1.2 2001/01/27 18:19:58 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XExposeEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XExposeEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XFocusChangeEvent.man b/man/XFocusChangeEvent.man index 9126216f..d0efc84d 100644 --- a/man/XFocusChangeEvent.man +++ b/man/XFocusChangeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XFCEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XFocusChangeEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XFocusChangeEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XFontSetExtents.man b/man/XFontSetExtents.man index fb292e5b..49ddc5c0 100644 --- a/man/XFontSetExtents.man +++ b/man/XFontSetExtents.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XFSExt.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XFontSetExtents.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XFontSetExtents.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man index c1f0bc75..eec5b0d6 100644 --- a/man/XGetVisualInfo.man +++ b/man/XGetVisualInfo.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGetVInfo.man,v 1.4 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XGetVisualInfo.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XGetVisualInfo.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man index bbe5baa3..283b4644 100644 --- a/man/XGetWindowAttributes.man +++ b/man/XGetWindowAttributes.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGetWAttr.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XGetWindowAttributes.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XGetWindowAttributes.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGraphicsExposeEvent.man b/man/XGraphicsExposeEvent.man index 8ca6ce7d..42a3d862 100644 --- a/man/XGraphicsExposeEvent.man +++ b/man/XGraphicsExposeEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGEEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XGraphicsExposeEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XGraphicsExposeEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XGravityEvent.man b/man/XGravityEvent.man index a9426580..a3954755 100644 --- a/man/XGravityEvent.man +++ b/man/XGravityEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XGEvent.man,v 1.2 2001/01/27 18:19:59 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XGravityEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XGravityEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XKeymapEvent.man b/man/XKeymapEvent.man index 0f666fcb..16825bc8 100644 --- a/man/XKeymapEvent.man +++ b/man/XKeymapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XKMapEven.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XKeymapEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XKeymapEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XLoadFont.man b/man/XLoadFont.man index b41ed652..fff6a867 100644 --- a/man/XLoadFont.man +++ b/man/XLoadFont.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XLoadFont.man,v 1.3 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XLoadFont.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XMapEvent.man b/man/XMapEvent.man index 2121fe9f..ae3bacfe 100644 --- a/man/XMapEvent.man +++ b/man/XMapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XMEvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XMapEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XMapEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XMapRequestEvent.man b/man/XMapRequestEvent.man index 411c09b3..32f26af5 100644 --- a/man/XMapRequestEvent.man +++ b/man/XMapRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XMREvent.man,v 1.2 2001/01/27 18:20:01 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XMapRequestEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XMapRequestEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XPropertyEvent.man b/man/XPropertyEvent.man index 7b133318..09b2ed3a 100644 --- a/man/XPropertyEvent.man +++ b/man/XPropertyEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XPEvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XPropertyEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XPropertyEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XReparentEvent.man b/man/XReparentEvent.man index 9ed64552..3c688b21 100644 --- a/man/XReparentEvent.man +++ b/man/XReparentEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XREvent.man,v 1.2 2001/01/27 18:20:02 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XReparentEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XReparentEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XResizeRequestEvent.man b/man/XResizeRequestEvent.man index 60ebff05..34ae0767 100644 --- a/man/XResizeRequestEvent.man +++ b/man/XResizeRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XRREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XResizeRequestEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XResizeRequestEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionClearEvent.man b/man/XSelectionClearEvent.man index 91caf933..85e606b4 100644 --- a/man/XSelectionClearEvent.man +++ b/man/XSelectionClearEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSCEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionClearEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionClearEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionEvent.man b/man/XSelectionEvent.man index 9a9cc3d4..c3c0223e 100644 --- a/man/XSelectionEvent.man +++ b/man/XSelectionEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSEvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XSelectionRequestEvent.man b/man/XSelectionRequestEvent.man index b3034c19..8f5d95b7 100644 --- a/man/XSelectionRequestEvent.man +++ b/man/XSelectionRequestEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSREvent.man,v 1.2 2001/01/27 18:20:03 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XSelectionRequestEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XSelectionRequestEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man index d29a1409..10890b23 100644 --- a/man/XStringListToTextProperty.man +++ b/man/XStringListToTextProperty.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XSLTTProp.man,v 1.5 2003/04/28 22:17:56 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XStringListToTextProperty.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XUnmapEvent.man b/man/XUnmapEvent.man index ef8c81dc..23fb6b1b 100644 --- a/man/XUnmapEvent.man +++ b/man/XUnmapEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XUmapEven.man,v 1.2 2001/01/27 18:20:06 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XUnmapEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:11 ago Exp $ +.\" $XdotOrg: lib/X11/man/XUnmapEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XVisibilityEvent.man b/man/XVisibilityEvent.man index c98a6b9f..3250ba02 100644 --- a/man/XVisibilityEvent.man +++ b/man/XVisibilityEvent.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XVEvent.man,v 1.3 2001/08/13 19:34:52 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XVisibilityEvent.man,v 1.1.4.1.2.1 2004-03-17 20:25:11 ago Exp $ +.\" $XdotOrg: lib/X11/man/XVisibilityEvent.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XcmsColor.man b/man/XcmsColor.man index 77880fd6..2e1c1001 100644 --- a/man/XcmsColor.man +++ b/man/XcmsColor.man @@ -40,7 +40,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XcmsClr.man,v 3.4 2001/01/27 18:20:06 dawes Exp $ -.\" $XdotOrg: lib/X11/man/XcmsColor.man,v 1.1.4.1.2.1 2004-03-17 20:25:11 ago Exp $ +.\" $XdotOrg: lib/X11/man/XcmsColor.man,v 1.1.4.1.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man index 236aef67..e62ca452 100644 --- a/man/XmbDrawText.man +++ b/man/XmbDrawText.man @@ -42,7 +42,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XmbDTxt.man,v 1.4 2003/04/28 22:17:58 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.2.2.2 2004-03-29 15:45:29 ago Exp $ +.\" $XdotOrg: lib/X11/man/XmbDrawText.man,v 1.1.4.2.2.3 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man index e1e89a2f..bc358ad9 100644 --- a/man/XmbTextListToTextProperty.man +++ b/man/XmbTextListToTextProperty.man @@ -43,7 +43,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XTLTTProp.man,v 1.6 2003/04/28 22:17:57 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.2.2.2 2004-03-29 15:45:29 ago Exp $ +.\" $XdotOrg: lib/X11/man/XmbTextListToTextProperty.man,v 1.1.4.2.2.3 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man index 863bacb8..5926e17a 100644 --- a/man/XrmInitialize.man +++ b/man/XrmInitialize.man @@ -41,7 +41,7 @@ .\" It is provided ``as is'' without express or implied warranty. .\" .\" $XFree86: xc/doc/man/X11/XInitial.man,v 1.4 2003/04/28 22:17:55 herrb Exp $ -.\" $XdotOrg: lib/X11/man/XrmInitialize.man,v 1.1.4.2.2.1 2004-03-17 20:25:08 ago Exp $ +.\" $XdotOrg: lib/X11/man/XrmInitialize.man,v 1.1.4.2.2.2 2004-09-15 16:31:16 ago Exp $ .\" .ds xT X Toolkit Intrinsics \- C Language Interface .ds xW Athena X Widgets \- C Language X Toolkit Interface diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c index 21ddedfe..2baa2fe5 100644 --- a/modules/im/ximcp/imDefLkup.c +++ b/modules/im/ximcp/imDefLkup.c @@ -463,7 +463,7 @@ _XimGetWindowEventmask( Xim im = (Xim )ic->core.im; XWindowAttributes atr; - if (!XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr)) + if (!_XGetWindowAttributes(im->core.display, ic->core.focus_window, &atr)) return 0; return (EVENTMASK)atr.your_event_mask; } diff --git a/modules/im/ximcp/imLcFlt.c b/modules/im/ximcp/imLcFlt.c index 85130137..e038c5f1 100644 --- a/modules/im/ximcp/imLcFlt.c +++ b/modules/im/ximcp/imLcFlt.c @@ -73,7 +73,7 @@ _XimLocalFilter(d, w, ev, client_data) ic->private.local.composed = p; /* return back to client KeyPressEvent keycode == 0 */ ev->xkey.keycode = 0; - XPutBackEvent(d, ev); + _XPutBackEvent(d, ev); /* initialize internal state for next key sequence */ ic->private.local.context = ((Xim)ic->core.im)->private.local.top; return(True); diff --git a/modules/om/generic/omGeneric.c b/modules/om/generic/omGeneric.c index 452f0ef2..57c31410 100644 --- a/modules/om/generic/omGeneric.c +++ b/modules/om/generic/omGeneric.c @@ -1055,6 +1055,7 @@ parse_fontdata( return True; } Xfree(font_data->xlfd_name); + font_data->xlfd_name = NULL; return False; } break; diff --git a/nls/locale.alias.pre b/nls/locale.alias.pre index 8798861e..74cb255e 100644 --- a/nls/locale.alias.pre +++ b/nls/locale.alias.pre @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.2.2.1 2004-03-17 20:29:48 ago Exp $ +XCOMM $XdotOrg: lib/X11/nls/locale.alias.pre,v 1.1.4.2.2.2 2004-09-15 16:33:23 ago 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. diff --git a/nls/locale.dir.pre b/nls/locale.dir.pre index 9216f04f..812132ec 100644 --- a/nls/locale.dir.pre +++ b/nls/locale.dir.pre @@ -1,4 +1,4 @@ -XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.2.2.1 2004-03-17 20:29:48 ago Exp $ +XCOMM $XdotOrg: lib/X11/nls/locale.dir.pre,v 1.1.4.2.2.2 2004-09-15 16:33:23 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 diff --git a/nls/zh_CN.UTF-8/XLC_LOCALE.pre b/nls/zh_CN.UTF-8/XLC_LOCALE.pre index fbdb9673..49151e19 100644 --- a/nls/zh_CN.UTF-8/XLC_LOCALE.pre +++ b/nls/zh_CN.UTF-8/XLC_LOCALE.pre @@ -2,7 +2,7 @@ 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.6.1 2004-03-17 20:29:50 ago Exp $ +XCOMM $XdotOrg: lib/X11/nls/zh_CN.UTF-8/XLC_LOCALE.pre,v 1.1.6.2 2004-09-15 16:33:23 ago Exp $ XCOMM $XFree86$ XCOMM diff --git a/src/ConnDis.c b/src/ConnDis.c index 213c199e..e9ad33a1 100644 --- a/src/ConnDis.c +++ b/src/ConnDis.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.2.2.1 2004-03-17 20:28:23 ago Exp $ */ +/* $XdotOrg: lib/X11/src/ConnDis.c,v 1.1.4.2.2.2 2004-09-15 16:33:18 ago Exp $ */ /* $Xorg: ConnDis.c,v 1.8 2001/02/09 02:03:31 xorgcvs Exp $ */ /* @@ -58,7 +58,7 @@ in this Software without prior written authorization from The Open Group. #include "Xintconn.h" -/* prototyes */ +/* prototypes */ static void GetAuthorization( XtransConnInfo trans_conn, int family, @@ -147,10 +147,10 @@ _X11TransConnectDisplay ( int connect_stat; #ifdef LOCALCONN struct utsname sys; +#endif #ifdef TCPCONN char *tcphostname = NULL; /* A place to save hostname pointer */ #endif -#endif p = display_name; @@ -283,19 +283,19 @@ _X11TransConnectDisplay ( #if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN) if (!pprotocol) { - if (!phostname) + if (!phostname) { #if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) pprotocol = copystring ("local", 5); +#if defined(TCPCONN) + tcphostname = copystring("localhost", 9); +#endif + } else + { #endif pprotocol = copystring ("tcp", 3); + } } -#else -#if defined(AMRPCCONN) - if (!pprotocol) { - pprotocol = copystring ("amcon", 5); - } -#endif #endif #if defined(UNIXCONN) || defined(LOCALCONN) || defined(OS2PIPECONN) @@ -325,7 +325,7 @@ _X11TransConnectDisplay ( } #endif -#if defined(LOCALCONN) && defined(TCPCONN) +#if defined(TCPCONN) connect: #endif /* @@ -339,6 +339,7 @@ _X11TransConnectDisplay ( (pdpynum ? strlen(pdpynum) : 0); if (olen > sizeof addrbuf) address = Xmalloc (olen); } + if (!address) goto bad; sprintf(address,"%s/%s:%d", pprotocol ? pprotocol : "", @@ -397,6 +398,7 @@ _X11TransConnectDisplay ( } if (address != addrbuf) Xfree (address); + address = addrbuf; if( trans_conn == NULL ) goto bad; @@ -428,6 +430,9 @@ _X11TransConnectDisplay ( if (phostname) Xfree (phostname); if (pdpynum) Xfree (pdpynum); if (pscrnum) Xfree (pscrnum); +#ifdef TCPCONN + if (tcphostname) Xfree (tcphostname); +#endif GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay, auth_namep, auth_namelenp, auth_datap, auth_datalenp); @@ -442,8 +447,9 @@ _X11TransConnectDisplay ( if (saddr) free ((char *) saddr); if (pprotocol) Xfree (pprotocol); if (phostname) Xfree (phostname); + if (address && address != addrbuf) { Xfree(address); address = addrbuf; } -#if defined(LOCALCONN) && defined(TCPCONN) +#if defined(TCPCONN) if (tcphostname) { pprotocol = copystring("tcp", 3); phostname = tcphostname; @@ -580,13 +586,6 @@ _XSendClientPrefix (dpy, client, auth_proto, auth_string, prefix) #endif #ifdef SECURE_RPC -#if defined(sun) && defined(SVR4) /* && ????? */ -/* - * I'm aware this is backwards, but #define'ing PORTMAP, as suggested in the - * man pages, doesn't work either. - */ -#define authdes_seccreate authdes_create -#endif #include <rpc/rpc.h> #ifdef ultrix #include <time.h> @@ -1099,14 +1098,14 @@ GetAuthorization( /* Port number */ for (i=2; i<4; i++) xdmcp_data[j++] = ((char *)addr)[i]; - break; } else { /* Fake data to keep the data aligned. Otherwise the the server will bail about incorrect timing data */ - for (i = 0; i < 8; i++) { + for (i = 0; i < 6; i++) { xdmcp_data[j++] = 0; } } + break; } #endif /* AF_INET6 */ #ifdef AF_UNIX @@ -1122,15 +1121,20 @@ GetAuthorization( static unsigned long unix_addr = 0xFFFFFFFF; unsigned long the_addr; unsigned short the_port; + unsigned long the_utime; + struct timeval tp; + X_GETTIMEOFDAY(&tp); _XLockMutex(_Xglobal_lock); the_addr = unix_addr--; _XUnlockMutex(_Xglobal_lock); + the_utime = (unsigned long) tp.tv_usec; the_port = getpid (); - - xdmcp_data[j++] = (the_addr >> 24) & 0xFF; - xdmcp_data[j++] = (the_addr >> 16) & 0xFF; - xdmcp_data[j++] = (the_addr >> 8) & 0xFF; + + xdmcp_data[j++] = (the_utime >> 24) & 0xFF; + xdmcp_data[j++] = (the_utime >> 16) & 0xFF; + xdmcp_data[j++] = ((the_utime >> 8) & 0xF0) + | ((the_addr >> 8) & 0x0F); xdmcp_data[j++] = (the_addr >> 0) & 0xFF; xdmcp_data[j++] = (the_port >> 8) & 0xFF; xdmcp_data[j++] = (the_port >> 0) & 0xFF; diff --git a/src/GetDflt.c b/src/GetDflt.c index 6146ca49..3c7ba344 100644 --- a/src/GetDflt.c +++ b/src/GetDflt.c @@ -239,8 +239,9 @@ XGetDefault( */ LockDisplay(dpy); if (dpy->db == NULL) { - dpy->db = InitDefaults(dpy); - } + dpy->db = InitDefaults(dpy); + dpy->flags |= XlibDisplayDfltRMDB; + } UnlockDisplay(dpy); names[0] = XrmStringToName(progname); diff --git a/src/GetWAttrs.c b/src/GetWAttrs.c index c5e9d438..527675fc 100644 --- a/src/GetWAttrs.c +++ b/src/GetWAttrs.c @@ -24,7 +24,6 @@ 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$ */ #define NEED_REPLIES #include "Xlibint.h" @@ -84,10 +83,11 @@ _XWAttrsHandler( return True; } -Status XGetWindowAttributes(dpy, w, attr) - register Display *dpy; - Window w; - XWindowAttributes *attr; +Status +_XGetWindowAttributes( + register Display *dpy, + Window w, + XWindowAttributes *attr) { xGetGeometryReply rep; register xResourceReq *req; @@ -96,7 +96,6 @@ Status XGetWindowAttributes(dpy, w, attr) _XAsyncHandler async; _XWAttrsState async_state; - LockDisplay(dpy); GetResReq(GetWindowAttributes, w, req); async_state.attr_seq = dpy->request; @@ -113,14 +112,10 @@ Status XGetWindowAttributes(dpy, w, attr) if (!_XReply (dpy, (xReply *)&rep, 0, xTrue)) { DeqAsyncHandler(dpy, &async); - UnlockDisplay(dpy); - SyncHandle(); return (0); } DeqAsyncHandler(dpy, &async); if (!async_state.attr) { - UnlockDisplay(dpy); - SyncHandle(); return (0); } attr->x = cvtINT16toInt (rep.x); @@ -138,8 +133,22 @@ Status XGetWindowAttributes(dpy, w, attr) break; } } + return(1); +} + +Status +XGetWindowAttributes( + Display *dpy, + Window w, + XWindowAttributes *attr) +{ + Status ret; + + LockDisplay(dpy); + ret = _XGetWindowAttributes(dpy, w, attr); UnlockDisplay(dpy); SyncHandle(); - return(1); + + return ret; } @@ -1,5 +1,5 @@ /* $Xorg: Host.c,v 1.4 2001/02/09 02:03:33 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/Host.c,v 1.1.4.1.2.2 2004-03-18 12:00:23 ago Exp $ */ +/* $XdotOrg: lib/X11/src/Host.c,v 1.1.4.1.2.3 2004-09-15 16:33:18 ago Exp $ */ /* Copyright 1986, 1998 The Open Group @@ -35,7 +35,7 @@ of the copyright holder. X Window System is a trademark of The Open Group. */ -/* $XFree86: xc/lib/X11/Host.c,v 1.4 2001/12/14 19:54:01 dawes Exp $ */ +/* $XFree86: xc/lib/X11/Host.c,v 1.3 2001/01/17 19:41:37 dawes Exp $ */ /* this might be rightly regarded an os dependent file */ diff --git a/src/LiHosts.c b/src/LiHosts.c index 90d8ee50..201ae0c4 100644 --- a/src/LiHosts.c +++ b/src/LiHosts.c @@ -1,5 +1,5 @@ /* $Xorg: LiHosts.c,v 1.4 2001/02/09 02:03:34 xorgcvs Exp $ */ -/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.1.6.1 2004-03-18 12:00:23 ago Exp $ */ +/* $XdotOrg: lib/X11/src/LiHosts.c,v 1.1.6.2 2004-09-15 16:33:18 ago Exp $ */ /* Copyright 1986, 1998 The Open Group diff --git a/src/OpenDis.c b/src/OpenDis.c index b5e2b49a..78d56f65 100644 --- a/src/OpenDis.c +++ b/src/OpenDis.c @@ -570,6 +570,12 @@ XOpenDisplay ( u.vp = (xVisualType *) (((char *) u.vp) + sz_xVisualType); } + if (dp->depth == 32 && getenv ("XLIB_SKIP_ARGB_VISUALS")) + { + Xfree (dp->visuals); + dp->visuals = NULL; + dp->nvisuals = 0; + } } else { dp->visuals = (Visual *) NULL; } @@ -761,7 +767,8 @@ void _XFreeDisplayStructure(dpy) if (dpy->xkb_info) (*dpy->free_funcs->xkb)(dpy); - if (dpy->db) + /* if RM database was allocated by XGetDefault() free it */ + if (dpy->db && (dpy->flags & XlibDisplayDfltRMDB)) XrmDestroyDatabase(dpy->db); if (dpy->screens) { diff --git a/src/PolyReg.c b/src/PolyReg.c index 66c50c4b..90bec77e 100644 --- a/src/PolyReg.c +++ b/src/PolyReg.c @@ -517,6 +517,8 @@ XPolygonRegion(Pts, Count, rule) } return(region); } + + if (Count < 2) return region; if (! (pETEs = (EdgeTableEntry *) Xmalloc((unsigned) (sizeof(EdgeTableEntry) * Count)))) diff --git a/src/PutBEvent.c b/src/PutBEvent.c index 2260359f..c8499360 100644 --- a/src/PutBEvent.c +++ b/src/PutBEvent.c @@ -33,16 +33,14 @@ from The Open Group. #include "Xlibint.h" int -XPutBackEvent (dpy, event) - register Display *dpy; - register XEvent *event; +_XPutBackEvent ( + register Display *dpy, + register XEvent *event) { register _XQEvent *qelt; - LockDisplay(dpy); if (!dpy->qfree) { if ((dpy->qfree = (_XQEvent *) Xmalloc (sizeof (_XQEvent))) == NULL) { - UnlockDisplay(dpy); return 0; } dpy->qfree->next = NULL; @@ -56,6 +54,18 @@ XPutBackEvent (dpy, event) if (dpy->tail == NULL) dpy->tail = qelt; dpy->qlen++; - UnlockDisplay(dpy); return 0; } + +int +XPutBackEvent ( + register Display * dpy, + register XEvent *event) + { + int ret; + + LockDisplay(dpy); + ret = _XPutBackEvent(dpy, event); + UnlockDisplay(dpy); + return ret; + } diff --git a/src/SetLocale.c b/src/SetLocale.c index b669d410..7a00eb0c 100644 --- a/src/SetLocale.c +++ b/src/SetLocale.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.2.2.1 2004-03-17 20:28:24 ago Exp $ */ +/* $XdotOrg: lib/X11/src/SetLocale.c,v 1.1.4.2.2.2 2004-09-15 16:33:18 ago Exp $ */ /* $Xorg: SetLocale.c,v 1.4 2001/02/09 02:03:36 xorgcvs Exp $ */ /* @@ -348,6 +348,11 @@ void XrmSetDatabase( XrmDatabase database) { LockDisplay(display); + /* destroy database if set up imlicitely by XGetDefault() */ + if (display->db && (display->flags & XlibDisplayDfltRMDB)) { + XrmDestroyDatabase(display->db); + display->flags &= ~XlibDisplayDfltRMDB; + } display->db = database; UnlockDisplay(display); } diff --git a/src/util/makekeys.c b/src/util/makekeys.c index 768f5e8b..f7e28f18 100644 --- a/src/util/makekeys.c +++ b/src/util/makekeys.c @@ -1,4 +1,5 @@ /* $Xorg: makekeys.c,v 1.5 2001/02/09 02:03:40 xorgcvs Exp $ */ +/* $XdotOrg: lib/X11/src/util/makekeys.c,v 1.1.4.1.2.2 2004-09-15 16:33:20 ago Exp $ */ /* Copyright 1990, 1998 The Open Group @@ -60,7 +61,7 @@ char buf[1024]; int main(int argc, char *argv[]) { - int ksnum; + int ksnum = 0; int max_rehash; Signature sig; register int i, j, k, z; @@ -71,27 +72,43 @@ main(int argc, char *argv[]) int best_z = 0; int num_found; KeySym val; + char key[128]; + char alias[128]; - for (ksnum = 0; 1; (void)fgets(buf, sizeof(buf), stdin)) { - i = scanf("#define XK_%s 0x%lx", buf, &info[ksnum].val); - if (i == EOF) - break; - if (i != 2) - continue; + + while (fgets(buf, sizeof(buf), stdin)) { + i = sscanf(buf, "#define XK_%127s 0x%lx", key, &info[ksnum].val); + if (i != 2) { + i = sscanf(buf, "#define XK_%127s XK_%127s", key, alias); + if (i != 2) + continue; + for (i = ksnum - 1; i >= 0; i--) { + if (strcmp(info[i].name, alias) == 0) { + info[ksnum].val = info[i].val; + break; + } + } + if (i < 0) { /* Didn't find a match */ + fprintf(stderr, + "can't find matching definition %s for keysym %s\n", + alias, key); + continue; + } + } if (info[ksnum].val == XK_VoidSymbol) info[ksnum].val = 0; if (info[ksnum].val > 0xffff) { fprintf(stderr, "ignoring illegal keysym (%s), remove it from .h file!\n", - buf); + key); continue; } - name = malloc((unsigned)strlen(buf)+1); + name = malloc((unsigned)strlen(key)+1); if (!name) { fprintf(stderr, "makekeys: out of memory!\n"); exit(1); } - (void)strcpy(name, buf); + (void)strcpy(name, key); info[ksnum].name = name; ksnum++; if (ksnum == KTNUM) { diff --git a/src/xcms/HVC.c b/src/xcms/HVC.c index 938ee6a3..38042a4b 100644 --- a/src/xcms/HVC.c +++ b/src/xcms/HVC.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.2.2.1 2004-03-17 20:28:23 ago Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/HVC.c,v 1.1.4.2.2.2 2004-09-15 16:33:18 ago Exp $ */ /* $Xorg: HVC.c,v 1.3 2000/08/17 19:44:36 cpqbld Exp $ */ /* diff --git a/src/xcms/cmsColNm.c b/src/xcms/cmsColNm.c index de02ea19..08b3bd93 100644 --- a/src/xcms/cmsColNm.c +++ b/src/xcms/cmsColNm.c @@ -1,4 +1,4 @@ -/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.2.2.1 2004-03-17 20:28:25 ago Exp $ */ +/* $XdotOrg: lib/X11/src/xcms/cmsColNm.c,v 1.1.4.2.2.2 2004-09-15 16:33:18 ago Exp $ */ /* $Xorg: cmsColNm.c,v 1.3 2000/08/17 19:45:09 cpqbld Exp $ */ /* diff --git a/src/xlibi18n/XlcDL.c b/src/xlibi18n/XlcDL.c index 76194e00..7988bdb9 100644 --- a/src/xlibi18n/XlcDL.c +++ b/src/xlibi18n/XlcDL.c @@ -42,7 +42,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* $XFree86: xc/lib/X11/XlcDL.c,v 1.12 2003/04/13 19:22:19 dawes Exp $ */ -/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.2.2.1 2004-03-17 20:28:25 ago Exp $ */ +/* $XdotOrg: lib/X11/src/xlibi18n/XlcDL.c,v 1.1.4.2.2.2 2004-09-15 16:33:18 ago Exp $ */ #include <stdio.h> #if defined(hpux) diff --git a/src/xlibi18n/lcUTF8.c b/src/xlibi18n/lcUTF8.c index 0994e965..9caaf2eb 100644 --- a/src/xlibi18n/lcUTF8.c +++ b/src/xlibi18n/lcUTF8.c @@ -1750,7 +1750,12 @@ create_tofontcs_conv( } while (count-- > 0) { XlcCharSet charset = _XlcGetCharSet(*value++); - const char *name = charset->encoding_name; + const char *name; + + if (charset == (XlcCharSet) NULL) + continue; + + name = charset->encoding_name; /* If it wasn't already encountered... */ for (k = num - 1; k >= 0; k--) if (!strcmp(preferred[k]->name, name)) |