Commit 10d08801 authored by Alexander Gottwald's avatar Alexander Gottwald

Pull XORG-6_8_0 to CYGWIN branch

parent ef279512
/* $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 $ */
/*
......
......@@ -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_ */
......@@ -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
*/
......
.\" $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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -1055,6 +1055,7 @@ parse_fontdata(
return True;
}
Xfree(font_data->xlfd_name);
font_data->xlfd_name = NULL;
return False;
}
break;
......
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.
......
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
......
......@@ -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
......
/* $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,9 +147,9 @@ _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;
......
......@@ -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);
......
......@@ -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.