diff options
| -rw-r--r-- | XEVIstr.h | 14 | ||||
| -rw-r--r-- | XLbx.h | 15 | ||||
| -rw-r--r-- | XShm.h | 27 | ||||
| -rw-r--r-- | XTest.h | 1 | ||||
| -rw-r--r-- | Xag.h | 5 | ||||
| -rw-r--r-- | Xagsrv.h | 7 | ||||
| -rw-r--r-- | Xagstr.h | 18 | ||||
| -rw-r--r-- | Xcupstr.h | 3 | ||||
| -rw-r--r-- | Xdbe.h | 4 | ||||
| -rw-r--r-- | Xext.h | 9 | ||||
| -rw-r--r-- | dpms.h | 18 | ||||
| -rw-r--r-- | dpmsstr.h | 2 | ||||
| -rw-r--r-- | extutil.h | 25 | ||||
| -rw-r--r-- | lbxbuf.h | 12 | ||||
| -rw-r--r-- | lbxbufstr.h | 4 | ||||
| -rw-r--r-- | lbxdeltastr.h | 14 | ||||
| -rw-r--r-- | lbximage.h | 7 | ||||
| -rw-r--r-- | lbxopts.h | 9 | ||||
| -rw-r--r-- | lbxstr.h | 4 | ||||
| -rw-r--r-- | lbxzlib.h | 14 | ||||
| -rw-r--r-- | multibuf.h | 57 | ||||
| -rw-r--r-- | multibufst.h | 160 | ||||
| -rw-r--r-- | security.h | 9 | ||||
| -rw-r--r-- | securstr.h | 3 | ||||
| -rw-r--r-- | shape.h | 4 | ||||
| -rw-r--r-- | shmstr.h | 35 | ||||
| -rw-r--r-- | sync.h | 11 |
27 files changed, 425 insertions, 66 deletions
@@ -21,15 +21,21 @@ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ +/* $XFree86: xc/include/extensions/XEVIstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */ + #ifndef _EVISTR_H_ #define _EVISTR_H_ -#include "XEVI.h" + +#include <X11/extensions/XEVI.h> + #define VisualID CARD32 #define EVINAME "Extended-Visual-Information" #define XEVI_MAJOR_VERSION 1 /* current version numbers */ #define XEVI_MINOR_VERSION 0 + typedef CARD32 VisualID32; #define sz_VisualID32 4 + typedef struct _xExtendedVisualInfo { VisualID core_visual_id B32; INT8 screen; @@ -42,12 +48,14 @@ typedef struct _xExtendedVisualInfo { CARD16 num_colormap_conflicts B16; } xExtendedVisualInfo; #define sz_xExtendedVisualInfo 16 + typedef struct _XEVIQueryVersion { CARD8 reqType; /* always XEVIReqCode */ CARD8 xeviReqType; /* always X_EVIQueryVersion */ CARD16 length B16; } xEVIQueryVersionReq; #define sz_xEVIQueryVersionReq 4 + typedef struct { BYTE type; /* X_Reply */ CARD8 unused; @@ -62,6 +70,7 @@ typedef struct { CARD32 pad4 B32; } xEVIQueryVersionReply; #define sz_xEVIQueryVersionReply 32 + typedef struct _XEVIGetVisualInfoReq { CARD8 reqType; /* always XEVIReqCode */ CARD8 xeviReqType; /* always X_EVIGetVisualInfo */ @@ -69,6 +78,7 @@ typedef struct _XEVIGetVisualInfoReq { CARD32 n_visual B32; } xEVIGetVisualInfoReq; #define sz_xEVIGetVisualInfoReq 8 + typedef struct _XEVIGetVisualInfoReply { BYTE type; /* X_Reply */ CARD8 unused; @@ -82,5 +92,7 @@ typedef struct _XEVIGetVisualInfoReply { CARD32 pad3 B32; } xEVIGetVisualInfoReply; #define sz_xEVIGetVisualInfoReply 32 + #undef VisualID + #endif /* _EVISTR_H_ */ @@ -20,6 +20,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/* $XFree86: xc/include/extensions/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */ #ifndef _XLBX_H_ #define _XLBX_H_ @@ -127,8 +128,20 @@ #ifndef _XLBX_SERVER_ +#include <X11/Xdefs.h> +#include <X11/Xlib.h> + _XFUNCPROTOBEGIN +Bool XLbxQueryExtension( +#if NeedFunctionPrototypes + Display* /* dpy */, + int* /* requestp */, + int* /* event_basep */, + int* /* error_basep */ +#endif +); + Bool XLbxQueryVersion( #if NeedFunctionPrototypes Display* /* dpy */, @@ -137,6 +150,8 @@ Bool XLbxQueryVersion( #endif ); +int XLbxGetEventBase(Display *dpy); + _XFUNCPROTOEND #endif @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/XShm.h,v 1.10 2002/11/08 00:46:27 alanh Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -72,7 +73,19 @@ _XFUNCPROTOBEGIN Bool XShmQueryExtension( #if NeedFunctionPrototypes - Display* /* dpy */ + Display* /* dpy */ +#endif +); + +int XShmGetEventBase( +#if NeedFunctionPrototypes + Display* /* dpy */ +#endif +); + +int XShmGetEventBase( +#if NeedFunctionPrototypes + Display* /* dpy */ #endif ); @@ -159,6 +172,18 @@ Pixmap XShmCreatePixmap( _XFUNCPROTOEND +#else /* _XSHM_SERVER_ */ + +#include "screenint.h" +#include "pixmap.h" +#include "gc.h" + +extern void ShmRegisterFbFuncs( +#if NeedFunctionPrototypes + ScreenPtr /* pScreen */ +#endif +); + #endif #endif @@ -24,6 +24,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/XTest.h,v 3.3 2001/12/14 19:53:28 dawes Exp $ */ #ifndef _XTEST_H_ #define _XTEST_H_ @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -51,11 +52,7 @@ from The Open Group. #ifndef _XAG_SERVER_ -#if NeedVarargsPrototypes #include <stdarg.h> -#else -#include <varargs.h> -#endif _XFUNCPROTOBEGIN @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.4 2001/12/20 19:25:43 tsi Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -28,6 +29,10 @@ from The Open Group. #ifndef _XAGSRV_H_ #define _XAGSRV_H_ +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + extern void XagExtensionInit( #if NeedFunctionPrototypes void @@ -87,5 +92,7 @@ extern void XagGetDeltaInfo ( #endif ); +_XFUNCPROTOEND + #endif /* _XAGSRV_H_ */ @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/Xagstr.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */ /* Copyright 1996, 1998, 2001 The Open Group @@ -28,7 +29,7 @@ from The Open Group. #ifndef _XAGSTR_H_ /* { */ #define _XAGSTR_H_ -#include "Xag.h" +#include <X11/extensions/Xag.h> #define XAppGroup CARD32 @@ -43,16 +44,16 @@ from The Open Group. #define XagWindowTypeWin16 3 /* - * Redefine some basic types used by structures defined herein. This allows - * both the library and server to view communicated data as 32-bit entities, - * thus preventing problems on 64-bit architectures where libXext sees this - * data as 64 bits and the server sees it as 32 bits. - */ - +* Redefine some basic types used by structures defined herein. This allows +* both the library and server to view communicated data as 32-bit entities, +* thus preventing problems on 64-bit architectures where libXext sees this +* data as 64 bits and the server sees it as 32 bits. +*/ + #define Colormap CARD32 #define VisualID CARD32 #define Window CARD32 - + typedef struct _XagQueryVersion { CARD8 reqType; /* always XagReqCode */ CARD8 xagReqType; /* always X_XagQueryVersion */ @@ -168,7 +169,6 @@ typedef struct _XagDestroyAssoc { #define sz_xXagDestroyAssocReq 8 #undef XAppGroup - /* * Cancel the previous redefinition of the basic types, thus restoring their * X.h definitions. @@ -25,11 +25,12 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/Xcupstr.h,v 3.6 2001/12/14 19:53:28 dawes Exp $ */ #ifndef _XCUPSTR_H_ /* { */ #define _XCUPSTR_H_ -#include "Xcup.h" +#include <X11/extensions/Xcup.h> #define XCUPNAME "TOG-CUP" @@ -30,7 +30,7 @@ * Header file for Xlib-related DBE * *****************************************************************************/ - +/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */ #ifndef XDBE_H #define XDBE_H @@ -39,7 +39,7 @@ /* INCLUDES */ #include <X11/Xfuncproto.h> -#include "Xdbeproto.h" +#include <X11/extensions/Xdbeproto.h> /* DEFINES */ @@ -23,6 +23,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/Xext.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */ #ifndef _XEXT_H_ #define _XEXT_H_ @@ -41,7 +42,13 @@ extern int (*XSetExtensionErrorHandler( #endif ) #endif -))(); +))( +#if NeedNestedPrototypes + Display *, + char *, + char * +#endif +); extern int XMissingExtension( #if NeedFunctionPrototypes @@ -26,12 +26,13 @@ dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ +/* $XFree86: xc/include/extensions/dpms.h,v 3.5 2001/01/17 17:53:20 dawes Exp $ */ /* * HISTORY */ /* - * @(#)$RCSfile$ $Revision$ (DEC) $Date$ + * @(#)RCSfile: dpms.h,v Revision: 1.1.4.2 (DEC) Date: 1995/11/21 19:34:17 */ @@ -40,5 +41,20 @@ Equipment Corporation. #define DPMSModeSuspend 2 #define DPMSModeOff 3 +#ifndef DPMS_SERVER + +#include <X11/X.h> +#include <X11/Xmd.h> + +extern Bool DPMSQueryExtension(Display *, int *, int *); +extern Status DPMSGetVersion(Display *, int *, int *); +extern Bool DPMSCapable(Display *); +extern Status DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16); +extern Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *); +extern Status DPMSEnable(Display *); +extern Status DPMSDisable(Display *); +extern Status DPMSForceLevel(Display *, CARD16); +extern Status DPMSInfo(Display *, CARD16 *, BOOL *); +#endif @@ -31,7 +31,7 @@ Equipment Corporation. * HISTORY */ /* - * @(#)$RCSfile$ $Revision$ (DEC) $Date$ + * @(#)RCSfile: dpmsstr.h,v Revision: 1.1.4.2 (DEC) Date: 1995/11/21 19:34:19 */ @@ -31,10 +31,13 @@ in this Software without prior written authorization from The Open Group. * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND * ARE SUBJECT TO CHANGE! */ +/* $XFree86: xc/include/extensions/extutil.h,v 1.9 2001/12/14 19:53:28 dawes Exp $ */ #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ +#include <X11/extensions/Xext.h> + /* * We need to keep a list of open displays since the Xlib display list isn't * public. We also have to per-display info in a separate block since it isn't @@ -182,8 +185,7 @@ extern XExtDisplayInfo *XextFindDisplay( * something that is called many, many times would be bad. */ #define XEXT_GENERATE_FIND_DISPLAY(proc,extinfo,extname,hooks,nev,data) \ -XExtDisplayInfo *proc (dpy) \ - register Display *dpy; \ +XExtDisplayInfo *proc (Display *dpy) \ { \ XExtDisplayInfo *dpyinfo; \ if (!extinfo) { if (!(extinfo = XextCreateExtension())) return NULL; } \ @@ -192,21 +194,20 @@ XExtDisplayInfo *proc (dpy) \ return dpyinfo; \ } +#define XEXT_FIND_DISPLAY_PROTO(proc) \ + XExtDisplayInfo *proc(Display *dpy) + #define XEXT_GENERATE_CLOSE_DISPLAY(proc,extinfo) \ -int proc (dpy, codes) \ - Display *dpy; \ - XExtCodes *codes; \ +int proc (Display *dpy, XExtCodes *codes) \ { \ return XextRemoveDisplay (extinfo, dpy); \ } +#define XEXT_CLOSE_DISPLAY_PROTO(proc) \ + int proc(Display *dpy, XExtCodes *codes) + #define XEXT_GENERATE_ERROR_STRING(proc,extname,nerr,errl) \ -char *proc (dpy, code, codes, buf, n) \ - Display *dpy; \ - int code; \ - XExtCodes *codes; \ - char *buf; \ - int n; \ +char *proc (Display *dpy, int code, XExtCodes *codes, char *buf, int n) \ { \ code -= codes->first_error; \ if (code >= 0 && code < nerr) { \ @@ -218,4 +219,6 @@ char *proc (dpy, code, codes, buf, n) \ return (char *)0; \ } +#define XEXT_ERROR_STRING_PROTO(proc) \ + char *proc(Display *dpy, int code, XExtCodes *codes, char *buf, int n) #endif @@ -38,8 +38,14 @@ typedef struct _zlibbuffer *ZlibBufferPtr; -extern int InitZlibBuffer(); -extern void FreeZlibBuffer(); -extern char *ReserveOutBuf(); +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + +extern int InitZlibBuffer(ZlibBufferPtr b, int size); +extern void FreeZlibBuffer(ZlibBufferPtr b); +extern char *ReserveOutBuf(ZlibBufferPtr outbuf, int outlen); + +_XFUNCPROTOEND #endif /* _BUFFER_H_ */ diff --git a/lbxbufstr.h b/lbxbufstr.h index 8eefa26..9313e34 100644 --- a/lbxbufstr.h +++ b/lbxbufstr.h @@ -22,10 +22,12 @@ * SOFTWARE. * */ +/* $XFree86: xc/include/extensions/lbxbufstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */ + #ifndef _BUFFERSTR_H_ #define _BUFFERSTR_H_ -#include "lbxbuf.h" +#include <X11/extensions/lbxbuf.h> /* * ZLIB Input/Output buffer diff --git a/lbxdeltastr.h b/lbxdeltastr.h index 9856b7a..a8e4cb3 100644 --- a/lbxdeltastr.h +++ b/lbxdeltastr.h @@ -88,4 +88,18 @@ typedef struct { } lbxMotionDeltaEvent; #define sz_lbxMotionDeltaEvent 8 +extern int LBXInitDeltaCache ( LBXDeltasPtr pcache, int nDeltas, + int maxDeltasize ); +extern void LBXFreeDeltaCache ( LBXDeltasPtr pcache ); +extern int LBXDeltaMinDiffs ( LBXDeltasPtr pcache, unsigned char *inmsg, + int inmsglen, int maxdiff, int *pindex ); +extern void LBXEncodeDelta ( LBXDeltasPtr pcache, unsigned char *inmsg, + int ndiff, int index, unsigned char *buf ); +extern int LBXDecodeDelta ( LBXDeltasPtr pcache, xLbxDiffItem *deltas, + int ndiff, int index, unsigned char **buf ); +extern void LBXAddDeltaOut ( LBXDeltasPtr pcache, unsigned char *inmsg, + int inmsglen ); +extern void LBXAddDeltaIn ( LBXDeltasPtr pcache, unsigned char *inmsg, + int inmsglen ); + #endif /* LBX_DELTA_STRUCT_H */ @@ -25,10 +25,15 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. ******************************************************************************/ +/* $XFree86: xc/include/extensions/lbximage.h,v 1.4 2001/12/20 19:28:54 tsi Exp $ */ #ifndef _LBX_IMAGE_H_ #define _LBX_IMAGE_H_ +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + typedef struct _LbxBitmapCompMethod { char *methodName; @@ -110,7 +115,6 @@ typedef struct _LbxPixmapCompMethod { } LbxPixmapCompMethod; - extern int LbxImageEncodePackBits ( #if NeedFunctionPrototypes char * /* inbuf */, @@ -157,6 +161,7 @@ int /* reverse_bits */ #endif ); +_XFUNCPROTOEND #define LBX_IMAGE_COMPRESS_SUCCESS 0 #define LBX_IMAGE_COMPRESS_NO_SUPPORT 1 @@ -21,6 +21,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/* $XFree86: xc/include/extensions/lbxopts.h,v 1.6 2001/10/28 03:32:26 tsi Exp $ */ #ifndef _LBX_OPTS_H_ #define _LBX_OPTS_H_ @@ -51,7 +52,7 @@ (size) = LBX_OPT_SMALLLEN_SIZE; \ } \ else { \ - (len) = LBX_OPT_BIGLEN_MIN + (p)[1] << 8 | (p)[2]; \ + (len) = ((LBX_OPT_BIGLEN_MIN + (p)[1]) << 8) | (p)[2]; \ (size) = LBX_OPT_BIGLEN_SIZE; \ } @@ -85,13 +86,17 @@ struct iovec { }; #else +#ifndef Lynx #include <sys/uio.h> +#else +#include <uio.h> +#endif #endif typedef void *LbxStreamCompHandle; typedef struct _LbxStreamOpts { - LbxStreamCompHandle (*streamCompInit)(); + LbxStreamCompHandle (*streamCompInit)(int fd, pointer arg); pointer streamCompArg; int (*streamCompStuffInput)( int fd, @@ -20,11 +20,12 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ +/* $XFree86: xc/include/extensions/lbxstr.h,v 1.3 2001/11/23 19:21:30 dawes Exp $ */ #ifndef _LBXSTR_H_ #define _LBXSTR_H_ -#include "XLbx.h" +#include <X11/extensions/XLbx.h> #define LBXNAME "LBX" @@ -37,7 +38,6 @@ * data as 32-bit quantities and another entity viewing the same data as 64-bit * quantities. */ - #define XID CARD32 #define Atom CARD32 #define Colormap CARD32 @@ -47,4 +47,18 @@ #define ZLIB_COMPRESSED(p) ((p)[0] & ZLIB_COMPRESS_FLAG) +struct ZlibInfo; + +extern void * ZlibInit ( int fd, int level ); +extern void ZlibFree ( struct ZlibInfo *comp ); +extern int ZlibFlush ( int fd ); +extern int ZlibStuffInput ( int fd, unsigned char *buffer, int buflen ); +extern void ZlibCompressOn ( int fd ); +extern void ZlibCompressOff ( int fd ); +extern int ZlibWrite ( int fd, unsigned char *buffer, int buflen ); +extern int ZlibWriteV ( int fd, struct iovec *iov, int iovcnt ); +extern int ZlibRead ( int fd, unsigned char *buffer, int buflen ); +extern int ZlibInputAvail ( int fd ); + + #endif /* _ZLIB_H_ */ @@ -24,6 +24,8 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */ + #ifndef _MULTIBUF_H_ #define _MULTIBUF_H_ @@ -294,13 +296,58 @@ _XFUNCPROTOEND #else +#include "scrnintstr.h" + typedef Bool (* mbInitFunc)(); -extern void RegisterMultibufferInit(); -extern void RegisterDoubleBufferHardware(); -extern int CreateImageBuffers (); -extern void DestroyImageBuffers (); -extern int DisplayImageBuffers (); +struct _mbufScreen; /* declared in multibufst.h */ + +extern void RegisterMultibufferInit( +#if NeedFunctionPrototypes + ScreenPtr /* pScreen */, + Bool (* /* bufMultibufferInit */)( +#if NeedNestedPrototypes + ScreenPtr /* pScreen */, + struct _mbufScreen * /* pMBScreen */ +#endif + ) +#endif +); + +struct xMbufBufferInfo; /* declared in multibufst.h */ + +extern void RegisterDoubleBufferHardware( +#if NeedFunctionPrototypes + ScreenPtr /* pScreen */, + int /* nInfo */, + struct xMbufBufferInfo * /* pInfo */, + DevUnion * /* frameBuffer */, + DevUnion /* selectPlane */, + void (* /* CopyBufferBitsFunc */ )(), + void (* /* DrawSelectPlaneFunc */ )() +#endif +); + +extern int CreateImageBuffers ( +#if NeedFunctionPrototypes + WindowPtr /* pWin */, + int /* nbuf */, + XID * /* ids */, + int /* action */, + int /* hint */ +#endif +); +extern void DestroyImageBuffers ( +#if NeedFunctionPrototypes + WindowPtr /* pWin */ +#endif +); +extern int DisplayImageBuffers ( +#if NeedFunctionPrototypes + XID * /* ids */, + int /* nbuf */ +#endif +); #endif /* _MULTIBUF_SERVER_ */ #endif /* _MULTIBUF_H_ */ diff --git a/multibufst.h b/multibufst.h index 50d3436..01eac0f 100644 --- a/multibufst.h +++ b/multibufst.h @@ -24,6 +24,8 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */ + #ifndef _MULTIBUFST_H_ #define _MULTIBUFST_H_ @@ -33,10 +35,10 @@ in this Software without prior written authorization from The Open Group. #include "multibuf.h" #ifdef _MULTIBUF_SERVER_ -#include "input.h" +#include "inputstr.h" #endif -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define MbufGetReq(name,req,info) GetReq (name, req); \ req->reqType = info->codes->major_opcode; \ req->mbufReqType = X_##name; @@ -51,7 +53,7 @@ in this Software without prior written authorization from The Open Group. #define VisualID CARD32 #define Multibuffer CARD32 -typedef struct { +typedef struct xMbufBufferInfo { CARD32 visualID B32; /* associated visual */ CARD16 maxBuffers B16; /* maximum supported buffers */ CARD8 depth; /* depth of visual (redundant) */ @@ -263,7 +265,11 @@ typedef struct { CARD16 width B16; CARD16 height B16; CARD16 borderWidth B16; +#if defined(__cplusplus) || defined(c_plusplus) + CARD16 c_class B16; +#else CARD16 class B16; +#endif VisualID visual B32; CARD32 mask B32; } xMbufCreateStereoWindowReq; /* followed by value list */ @@ -303,7 +309,7 @@ typedef struct { pSTRUCT2->FUNC_NAME = tmpFn; \ } -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) +#if !defined(UNIXCPP) || defined(ANSICPP) #define WRAP_SCREEN_FUNC(pSCREEN,pPRIV,FUNC_NAME, PRIV_FUNC_NAME) \ { \ if ((pPRIV->funcsWrapped & FUNC_NAME##Mask) == 0) \ @@ -355,6 +361,64 @@ typedef struct { } #endif +/* The _Multibuffer and _Multibuffers structures below refer to each other, + * so we need this forward declaration + */ +typedef struct _Multibuffers *MultibuffersPtr; + +/* + * per-Multibuffer data + */ + +typedef struct _Multibuffer { + MultibuffersPtr pMultibuffers; /* associated window data */ + Mask eventMask; /* MultibufferClobberNotifyMask|ExposureMask|MultibufferUpdateNotifyMask */ + Mask otherEventMask; /* mask of all other clients event masks */ + OtherClients *otherClients; /* other clients that want events */ + int number; /* index of this buffer into array */ + int side; /* always Mono */ + int clobber; /* Unclobbered, PartiallyClobbered, FullClobbered */ + PixmapPtr pPixmap; /* associated pixmap */ +} MultibufferRec, *MultibufferPtr; + +/* + * per-window data + */ + +typedef struct _Multibuffers { + WindowPtr pWindow; /* associated window */ + int numMultibuffer; /* count of buffers */ + int refcnt; /* ref count for delete */ + int displayedMultibuffer; /* currently active buffer */ + int updateAction; /* Undefined, Background, Untouched, Copied */ + int updateHint; /* Frequent, Intermittent, Static */ + int windowMode; /* always Mono */ + + TimeStamp lastUpdate; /* time of last update */ + + unsigned short width, height; /* last known window size */ + short x, y; /* for static gravity */ + + MultibufferPtr buffers; /* array of numMultibuffer buffers */ +} MultibuffersRec; + +/* + * per-screen data + */ +typedef struct _MultibufferScreen { + PositionWindowProcPtr PositionWindow; /* pWin, x,y */ +} MultibufferScreenRec, *MultibufferScreenPtr; + +/* + * per display-image-buffers request data. + */ + +typedef struct _DisplayRequest { + struct _DisplayRequest *next; + TimeStamp activateTime; + ClientPtr pClient; + XID id; +} DisplayRequestRec, *DisplayRequestPtr; #define DestroyWindowMask (1L<<0) #define PositionWindowMask (1L<<1) @@ -370,9 +434,23 @@ extern int MultibufferWindowIndex; extern RESTYPE MultibufferDrawableResType; -extern void MultibufferUpdate(); /* pMbuffer, time */ -extern void MultibufferExpose(); /* pMbuffer, pRegion */ -extern void MultibufferClobber(); /* pMbuffer */ +extern void MultibufferUpdate( /* pMbuffer, time */ +#if NeedFunctionPrototypes + MultibufferPtr /* pMultibuffer */, + CARD32 /* time */ +#endif + ); +extern void MultibufferExpose( /* pMbuffer, pRegion */ +#if NeedFunctionPrototypes + MultibufferPtr /* pMultibuffer */, + RegionPtr /* pRegion */ +#endif + ); +extern void MultibufferClobber( /* pMbuffer */ +#if NeedFunctionPrototypes + MultibufferPtr /* pMultibuffer */ +#endif + ); typedef struct _mbufWindow *mbufWindowPtr; @@ -429,22 +507,70 @@ typedef struct _mbufScreen { long mbufWindowCount; /* count of multibuffered windows */ /* Wrap pScreen->DestroyWindow */ - Bool (* DestroyWindow)(); /* pWin */ + DestroyWindowProcPtr DestroyWindow; long funcsWrapped; /* flags which functions are wrapped */ /* Initialized by device-dependent section */ int nInfo; /* number of buffer info rec's */ xMbufBufferInfo *pInfo; /* buffer info (for Normal buffers) */ - int (* CreateImageBuffers)(); /* pWin, nbuf, ids, action, hint */ - void (* DestroyImageBuffers)(); /* pWin */ - void (* DisplayImageBuffers)(); /* pScrn, ppMBWin, ppMBBuffer, nbuf */ - void (* ClearImageBufferArea)(); /* pMBBuffer, x,y, w,h, exposures */ - Bool (* ChangeMBufferAttributes)(); /* pMBWindow, vmask */ - Bool (* ChangeBufferAttributes)(); /* pMBBuffer, vmask */ - void (* DeleteBufferDrawable)(); /* pDrawable */ - void (* WrapScreenFuncs)(); /* pScreen */ - void (* ResetProc)(); /* pScreen */ + int (* CreateImageBuffers)( +#if NeedNestedPrototypes + WindowPtr /* pWin */, + int /* nbuf */, + XID * /* ids */, + int /* action */, + int /* hint */ +#endif + ); + void (* DestroyImageBuffers)( +#if NeedNestedPrototypes + WindowPtr /* pWin */ +#endif + ); + void (* DisplayImageBuffers)( +#if NeedNestedPrototypes + ScreenPtr /* pScreen */, + mbufBufferPtr * /* ppMBBuffer */, + mbufWindowPtr * /* ppMBWindow */, + int /* nbuf */ +#endif + ); + void (* ClearImageBufferArea)( +#if NeedNestedPrototypes + mbufBufferPtr /* pMBBuffer */, + short /* x */, + short /* y */, + unsigned short /* width */, + unsigned short /* height */, + Bool /* exposures */ +#endif + ); + Bool (* ChangeMBufferAttributes)( /* pMBWindow, vmask */ +#if NeedNestedPrototypes + /* FIXME */ +#endif + ); + Bool (* ChangeBufferAttributes)( /* pMBBuffer, vmask */ +#if NeedNestedPrototypes + /* FIXME */ +#endif + ); + void (* DeleteBufferDrawable)( +#if NeedNestedPrototypes + DrawablePtr /* pDrawable */ +#endif + ); + void (* WrapScreenFuncs)( +#if NeedNestedPrototypes + ScreenPtr /* pScreen */ +#endif + ); + void (* ResetProc)( +#if NeedNestedPrototypes + ScreenPtr /* pScreen */ +#endif + ); DevUnion devPrivate; } mbufScreenRec, *mbufScreenPtr; @@ -24,6 +24,7 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/security.h,v 1.4 2002/11/08 00:46:27 alanh Exp $ */ #ifndef _SECURITY_H #define _SECURITY_H @@ -109,6 +110,8 @@ typedef struct { #include "input.h" /* for DeviceIntPtr */ #include "property.h" /* for PropertyPtr */ +#include "pixmap.h" /* for DrawablePtr */ +#include "resource.h" /* for RESTYPE */ /* resource type to pass in LookupIDByType for authorizations */ extern RESTYPE SecurityAuthorizationResType; @@ -154,6 +157,12 @@ extern Bool SecurityCheckDeviceAccess(ClientPtr client, DeviceIntPtr dev, extern void SecurityAudit(char *format, ...); +#ifdef LBX +extern Bool SecuritySameLevel(ClientPtr client, XID authId); +#endif + +extern int XSecurityOptions(int argc, char **argv, int i); + /* Give this value or higher to the -audit option to get security messages */ #define SECURITY_AUDIT_LEVEL 4 @@ -24,11 +24,12 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ +/* $XFree86: xc/include/extensions/securstr.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */ #ifndef _SECURSTR_H #define _SECURSTR_H -#include "security.h" +#include <X11/extensions/security.h> #define SECURITY_EXTENSION_NAME "SECURITY" #define SECURITY_MAJOR_VERSION 1 @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -56,6 +57,9 @@ in this Software without prior written authorization from The Open Group. #define ShapeNumberEvents (ShapeNotify + 1) #ifndef _SHAPE_SERVER_ + +#include <X11/Xutil.h> + typedef struct { int type; /* of event */ unsigned long serial; /* # of last request processed by server */ @@ -1,3 +1,4 @@ +/* $XFree86: xc/include/extensions/shmstr.h,v 3.3 2001/12/14 19:53:29 dawes Exp $ */ /************************************************************ Copyright 1989, 1998 The Open Group @@ -45,9 +46,39 @@ in this Software without prior written authorization from The Open Group. #define SHM_MINOR_VERSION 1 #ifdef _XSHM_SERVER_ +#if NeedFunctionPrototypes +#define XSHM_PUT_IMAGE_ARGS \ + DrawablePtr /* dst */, \ + GCPtr /* pGC */, \ + int /* depth */, \ + unsigned int /* format */, \ + int /* w */, \ + int /* h */, \ + int /* sx */, \ + int /* sy */, \ + int /* sw */, \ + int /* sh */, \ + int /* dx */, \ + int /* dy */, \ + char * /* data */ +#else +#define XSHM_PUT_IMAGE_ARGS /* nothing */ +#endif + +#if NeedFunctionPrototypes +#define XSHM_CREATE_PIXMAP_ARGS \ + ScreenPtr /* pScreen */, \ + int /* width */, \ + int /* height */, \ + int /* depth */, \ + char * /* addr */ +#else +#define XSHM_CREATE_PIXMAP_ARGS /* nothing */ +#endif + typedef struct _ShmFuncs { - PixmapPtr (* CreatePixmap)(); - void (* PutImage)(); + PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS); + void (* PutImage)(XSHM_PUT_IMAGE_ARGS); } ShmFuncs, *ShmFuncsPtr; #endif @@ -48,10 +48,15 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ +/* $XFree86: xc/include/extensions/sync.h,v 1.4 2001/12/20 19:40:59 tsi Exp $ */ #ifndef _SYNC_H_ #define _SYNC_H_ +#include <X11/Xfuncproto.h> + +_XFUNCPROTOBEGIN + #define SYNC_NAME "SYNC" #define SYNC_MAJOR_VERSION 3 @@ -243,6 +248,8 @@ extern void XSyncMinValue( #endif ); +_XFUNCPROTOEND + /* The _XSync macros below are for library internal use only. They exist * so that if we have to make a fix, we can change it in this one place * and have both the macro and function variants inherit the fix. @@ -394,6 +401,8 @@ typedef struct { * Prototypes */ +_XFUNCPROTOBEGIN + extern Status XSyncQueryExtension( #if NeedFunctionPrototypes Display* /*dpy*/, @@ -519,4 +528,6 @@ extern Status XSyncGetPriority( #endif /* _SYNC_SERVER */ +_XFUNCPROTOEND + #endif /* _SYNC_H_ */ |