aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/include/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/include/extensions')
-rw-r--r--nx-X11/include/extensions/Imakefile42
-rw-r--r--nx-X11/include/extensions/MITMisc.h66
-rw-r--r--nx-X11/include/extensions/XEVI.h64
-rw-r--r--nx-X11/include/extensions/XEVIstr.h98
-rw-r--r--nx-X11/include/extensions/XLbx.h155
-rw-r--r--nx-X11/include/extensions/Xag.h114
-rw-r--r--nx-X11/include/extensions/Xagsrv.h76
-rw-r--r--nx-X11/include/extensions/Xagstr.h182
-rw-r--r--nx-X11/include/extensions/Xcup.h69
-rw-r--r--nx-X11/include/extensions/Xcupstr.h109
-rw-r--r--nx-X11/include/extensions/Xdbe.h136
-rw-r--r--nx-X11/include/extensions/Xevie.h78
-rw-r--r--nx-X11/include/extensions/Xeviestr.h165
-rw-r--r--nx-X11/include/extensions/Xinerama.h76
-rw-r--r--nx-X11/include/extensions/fontcache.h106
-rw-r--r--nx-X11/include/extensions/fontcacheP.h40
-rw-r--r--nx-X11/include/extensions/fontcachstr.h130
-rw-r--r--nx-X11/include/extensions/lbxbuf.h51
-rw-r--r--nx-X11/include/extensions/lbxbufstr.h45
-rw-r--r--nx-X11/include/extensions/lbxdeltastr.h105
-rw-r--r--nx-X11/include/extensions/lbximage.h151
-rw-r--r--nx-X11/include/extensions/lbxopts.h133
-rw-r--r--nx-X11/include/extensions/lbxstr.h931
-rw-r--r--nx-X11/include/extensions/lbxzlib.h64
-rw-r--r--nx-X11/include/extensions/mitmiscstr.h70
-rw-r--r--nx-X11/include/extensions/multibuf.h317
-rw-r--r--nx-X11/include/extensions/multibufst.h609
-rw-r--r--nx-X11/include/extensions/security.h4
-rw-r--r--nx-X11/include/extensions/xf86dga.h264
-rw-r--r--nx-X11/include/extensions/xf86dga1.h140
-rw-r--r--nx-X11/include/extensions/xf86dga1str.h194
-rw-r--r--nx-X11/include/extensions/xf86dgastr.h344
-rw-r--r--nx-X11/include/extensions/xf86misc.h172
-rw-r--r--nx-X11/include/extensions/xf86mscstr.h238
-rw-r--r--nx-X11/include/extensions/xf86vmode.h322
-rw-r--r--nx-X11/include/extensions/xf86vmstr.h562
-rw-r--r--nx-X11/include/extensions/xtrapbits.h83
-rw-r--r--nx-X11/include/extensions/xtrapddmi.h115
-rw-r--r--nx-X11/include/extensions/xtrapdi.h507
-rw-r--r--nx-X11/include/extensions/xtrapemacros.h387
-rw-r--r--nx-X11/include/extensions/xtraplib.h128
-rw-r--r--nx-X11/include/extensions/xtraplibp.h142
-rw-r--r--nx-X11/include/extensions/xtrapproto.h168
43 files changed, 2 insertions, 7950 deletions
diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile
index eb7763535..9f03df68c 100644
--- a/nx-X11/include/extensions/Imakefile
+++ b/nx-X11/include/extensions/Imakefile
@@ -12,29 +12,13 @@ NULL =
SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
#endif
-#if BuildXF86MiscExt
-XF86MISCHEADERS = xf86misc.h xf86mscstr.h
-#endif
#if BuildXF86BigfontExt
XF86BIGFONTHEADERS = xf86bigfont.h xf86bigfstr.h
#endif
-#if BuildXF86VidModeExt
-XF86VIDMODEHEADERS = xf86vmode.h xf86vmstr.h
-#endif
-#if BuildXF86DGA
-XF86DGAHEADERS = xf86dga.h xf86dgastr.h xf86dga1.h xf86dga1str.h
-#endif
-#if BuildXextLib
-LBXHEADERS = XLbx.h lbxbuf.h lbxbufstr.h lbxdeltastr.h lbximage.h lbxopts.h \
- lbxstr.h lbxzlib.h
-#endif
#if BuildXvExt
XVHEADERS = Xv.h Xvlib.h Xvproto.h
XVMCHEADERS = XvMC.h XvMClib.h XvMCproto.h vldXvMC.h
#endif
-#if BuildFontCache
-FONTCACHEHEADERS = fontcache.h fontcacheP.h fontcachstr.h
-#endif
#if BuildXinerama
XINERAMAHEADERS = panoramiXext.h panoramiXproto.h
#endif
@@ -53,58 +37,39 @@ COMPOSITEHEADERS = composite.h compositeproto.h
#if BuildDamage
DAMAGEHEADERS = damagewire.h damageproto.h
#endif
-#if BuildXTrap
-XTRAPHEADERS = xtrapbits.h xtrapddmi.h xtrapdi.h xtrapemacros.h xtraplib.h \
- xtraplibp.h xtrapproto.h
-#endif
#if BuildXResExt
XRESHEADERS = XResproto.h
#endif
-#if BuildXevie
-XEVIEHEADERS = Xevie.h Xeviestr.h
-#endif
EXTRAHEADERS = \
$(SCREENSAVERHEADERS) \
- $(XF86MISCHEADERS) \
- $(XF86BIGFONTHEADERS) \
- $(XF86VIDMODEHEADERS) \
- $(XF86DGAHEADERS) \
$(XINERAMAHEADERS) \
- $(LBXHEADERS) \
+ $(XF86BIGFONTHEADERS) \
$(XVHEADERS) \
$(XVMCHEADERS) \
- $(FONTCACHEHEADERS) \
$(RANDRHEADERS) \
$(RENDERHEADERS) \
$(XFIXESHEADERS) \
$(COMPOSITEHEADERS) \
$(DAMAGEHEADERS) \
- $(XEVIEHEADERS) \
- $(XTRAPHEADERS) \
$(XRESHEADERS) \
$(NULL)
HEADERS = Xext.h \
xcmiscstr.h \
- MITMisc.h mitmiscstr.h \
bigreqstr.h \
extutil.h \
XI.h XInput.h XIproto.h \
xtestconst.h xtestext1.h xteststr.h \
XKB.h XKBgeom.h XKBproto.h XKBstr.h XKBsrv.h \
- Xdbe.h Xdbeproto.h \
- Xag.h Xagstr.h Xagsrv.h \
+ Xdbeproto.h \
XShm.h shmstr.h \
$(EXTRAHEADERS) \
- multibuf.h multibufst.h \
record.h recordstr.h \
security.h securstr.h \
shape.h shapestr.h \
sync.h syncstr.h \
- Xcup.h Xcupstr.h \
dpms.h dpmsstr.h \
- XEVI.h XEVIstr.h \
$(NULL)
all::
@@ -120,9 +85,6 @@ InstallDriverSDKNonExecFile(XIproto.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xvproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
-InstallDriverSDKNonExecFile(xf86dga1str.h,$(DRIVERSDKINCLUDEDIR))
-InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
-InstallDriverSDKNonExecFile(xf86misc.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(renderproto.h,$(DRIVERSDKINCLUDEDIR))
InstallDriverSDKNonExecFile(Xv.h,$(DRIVERSDKINCLUDEDIR)/extensions)
InstallDriverSDKNonExecFile(XvMC.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/nx-X11/include/extensions/MITMisc.h b/nx-X11/include/extensions/MITMisc.h
deleted file mode 100644
index d66b8242d..000000000
--- a/nx-X11/include/extensions/MITMisc.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/************************************************************
-
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-
-********************************************************/
-
-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
-
-/* $Xorg: MITMisc.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-#ifndef _XMITMISC_H_
-#define _XMITMISC_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define X_MITSetBugMode 0
-#define X_MITGetBugMode 1
-
-#define MITMiscNumberEvents 0
-
-#define MITMiscNumberErrors 0
-
-#ifndef _MITMISC_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XMITMiscQueryExtension(
- Display* /* dpy */,
- int* /* event_basep */,
- int* /* error_basep */
-);
-
-Status XMITMiscSetBugMode(
- Display* /* dpy */,
- Bool /* onOff */
-);
-
-Bool XMITMiscGetBugMode(
- Display* /* dpy */
-);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/nx-X11/include/extensions/XEVI.h b/nx-X11/include/extensions/XEVI.h
deleted file mode 100644
index 30b2412d9..000000000
--- a/nx-X11/include/extensions/XEVI.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Xorg: XEVI.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/************************************************************
-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-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$ */
-
-#ifndef _XEVI_H_
-#define _XEVI_H_
-#include <nx-X11/Xfuncproto.h>
-#define X_EVIQueryVersion 0
-#define X_EVIGetVisualInfo 1
-#define XEVI_TRANSPARENCY_NONE 0
-#define XEVI_TRANSPARENCY_PIXEL 1
-#define XEVI_TRANSPARENCY_MASK 2
-#ifndef _XEVI_SERVER_
-typedef struct {
- VisualID core_visual_id;
- int screen;
- int level;
- unsigned int transparency_type;
- unsigned int transparency_value;
- unsigned int min_hw_colormaps;
- unsigned int max_hw_colormaps;
- unsigned int num_colormap_conflicts;
- VisualID* colormap_conflicts;
-} ExtendedVisualInfo;
-_XFUNCPROTOBEGIN
-Bool XeviQueryExtension(
- Display* /* dpy */
-);
-Status XeviQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-Status XeviGetVisualInfo(
- Display* /* dpy */,
- VisualID* /* visual_query */,
- int /* nVisual_query */,
- ExtendedVisualInfo** /* extendedVisualInfo_return */,
- int* /* nInfo_return */
-);
-_XFUNCPROTOEND
-#endif
-#endif
diff --git a/nx-X11/include/extensions/XEVIstr.h b/nx-X11/include/extensions/XEVIstr.h
deleted file mode 100644
index 4deb6c113..000000000
--- a/nx-X11/include/extensions/XEVIstr.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* $Xorg: XEVIstr.h,v 1.3 2000/08/18 04:05:44 coskrey Exp $ */
-/************************************************************
-Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
-Permission to use, copy, modify, and distribute this
-software and its documentation for any purpose and without
-fee is hereby granted, provided that the above copyright
-notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
-of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
-of this software for any purpose. It is provided "as is"
-without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-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$ */
-
-#ifndef _EVISTR_H_
-#define _EVISTR_H_
-
-#include <nx-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;
- INT8 level;
- CARD8 transparency_type;
- CARD8 pad0;
- CARD32 transparency_value B32;
- CARD8 min_hw_colormaps;
- CARD8 max_hw_colormaps;
- 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;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of EVI protocol */
- CARD16 minorVersion B16; /* minor version of EVI protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xEVIQueryVersionReply;
-#define sz_xEVIQueryVersionReply 32
-
-typedef struct _XEVIGetVisualInfoReq {
- CARD8 reqType; /* always XEVIReqCode */
- CARD8 xeviReqType; /* always X_EVIGetVisualInfo */
- CARD16 length B16;
- CARD32 n_visual B32;
-} xEVIGetVisualInfoReq;
-#define sz_xEVIGetVisualInfoReq 8
-
-typedef struct _XEVIGetVisualInfoReply {
- BYTE type; /* X_Reply */
- CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 n_info B32;
- CARD32 n_conflicts B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
-} xEVIGetVisualInfoReply;
-#define sz_xEVIGetVisualInfoReply 32
-
-#undef VisualID
-
-#endif /* _EVISTR_H_ */
diff --git a/nx-X11/include/extensions/XLbx.h b/nx-X11/include/extensions/XLbx.h
deleted file mode 100644
index 6cd867944..000000000
--- a/nx-X11/include/extensions/XLbx.h
+++ /dev/null
@@ -1,155 +0,0 @@
-/* $Xorg: XLbx.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1992 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of NCD. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. NCD. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, 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/XLbx.h,v 1.3 2002/10/16 01:59:55 dawes Exp $ */
-
-#ifndef _XLBX_H_
-#define _XLBX_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-/*
- * NOTE: any changes or additions to the opcodes needs to be reflected
- * in the lbxCacheable array in Xserver/lbx/lbxmain.c
- */
-
-#define X_LbxQueryVersion 0
-#define X_LbxStartProxy 1
-#define X_LbxStopProxy 2
-#define X_LbxSwitch 3
-#define X_LbxNewClient 4
-#define X_LbxCloseClient 5
-#define X_LbxModifySequence 6
-#define X_LbxAllowMotion 7
-#define X_LbxIncrementPixel 8
-#define X_LbxDelta 9
-#define X_LbxGetModifierMapping 10
-#define X_LbxInvalidateTag 12
-#define X_LbxPolyPoint 13
-#define X_LbxPolyLine 14
-#define X_LbxPolySegment 15
-#define X_LbxPolyRectangle 16
-#define X_LbxPolyArc 17
-#define X_LbxFillPoly 18
-#define X_LbxPolyFillRectangle 19
-#define X_LbxPolyFillArc 20
-#define X_LbxGetKeyboardMapping 21
-#define X_LbxQueryFont 22
-#define X_LbxChangeProperty 23
-#define X_LbxGetProperty 24
-#define X_LbxTagData 25
-
-#define X_LbxCopyArea 26
-#define X_LbxCopyPlane 27
-#define X_LbxPolyText8 28
-#define X_LbxPolyText16 29
-#define X_LbxImageText8 30
-#define X_LbxImageText16 31
-
-#define X_LbxQueryExtension 32
-#define X_LbxPutImage 33
-#define X_LbxGetImage 34
-
-#define X_LbxBeginLargeRequest 35
-#define X_LbxLargeRequestData 36
-#define X_LbxEndLargeRequest 37
-
-#define X_LbxInternAtoms 38
-#define X_LbxGetWinAttrAndGeom 39
-
-#define X_LbxGrabCmap 40
-#define X_LbxReleaseCmap 41
-#define X_LbxAllocColor 42
-
-#define X_LbxSync 43
-
-#define LbxNumberReqs 44
-
-
-#define LbxEvent 0
-#define LbxQuickMotionDeltaEvent 1
-#define LbxNumberEvents 2
-
-/* This is always the master client */
-#define LbxMasterClientIndex 0
-
-/* LbxEvent lbxType sub-fields */
-#define LbxSwitchEvent 0
-#define LbxCloseEvent 1
-#define LbxDeltaEvent 2
-#define LbxInvalidateTagEvent 3
-#define LbxSendTagDataEvent 4
-#define LbxListenToOne 5
-#define LbxListenToAll 6
-#define LbxMotionDeltaEvent 7
-#define LbxReleaseCmapEvent 8
-#define LbxFreeCellsEvent 9
-
-/*
- * Lbx image compression methods
- *
- * No compression is always assigned the value of 0.
- *
- * The rest of the compression method opcodes are assigned dynamically
- * at option negotiation time.
- */
-
-#define LbxImageCompressNone 0
-
-
-#define BadLbxClient 0
-#define LbxNumberErrors (BadLbxClient + 1)
-
-/* tagged data types */
-#define LbxTagTypeModmap 1
-#define LbxTagTypeKeymap 2
-#define LbxTagTypeProperty 3
-#define LbxTagTypeFont 4
-#define LbxTagTypeConnInfo 5
-
-#ifndef _XLBX_SERVER_
-
-#include <nx-X11/Xdefs.h>
-#include <nx-X11/Xlib.h>
-
-_XFUNCPROTOBEGIN
-
-Bool XLbxQueryExtension(
- Display* /* dpy */,
- int* /* requestp */,
- int* /* event_basep */,
- int* /* error_basep */
-);
-
-Bool XLbxQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-int XLbxGetEventBase(Display *dpy);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/nx-X11/include/extensions/Xag.h b/nx-X11/include/extensions/Xag.h
deleted file mode 100644
index 4c1193e3d..000000000
--- a/nx-X11/include/extensions/Xag.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
-/*
-Copyright 1996, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-*/
-/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _XAG_H_
-#define _XAG_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define X_XagQueryVersion 0
-#define X_XagCreate 1
-#define X_XagDestroy 2
-#define X_XagGetAttr 3
-#define X_XagQuery 4
-#define X_XagCreateAssoc 5
-#define X_XagDestroyAssoc 6
-
-#define XagBadAppGroup 0
-#define XagNumberErrors (XagBadAppGroup + 1)
-
-#define XagNsingleScreen 7
-#define XagNdefaultRoot 1
-#define XagNrootVisual 2
-#define XagNdefaultColormap 3
-#define XagNblackPixel 4
-#define XagNwhitePixel 5
-#define XagNappGroupLeader 6
-
-#ifndef _XAG_SERVER_
-
-#include <stdarg.h>
-
-_XFUNCPROTOBEGIN
-
-typedef XID XAppGroup;
-
-Bool XagQueryVersion(
- Display* /* dpy */,
- int* /* major_version */,
- int* /* minor_version */
-);
-
-Status XagCreateEmbeddedApplicationGroup(
- Display* /* dpy */,
- VisualID /* root_visual */,
- Colormap /* default_colormap */,
- unsigned long /* black_pixel */,
- unsigned long /* white_pixel */,
- XAppGroup* /* app_group_return */
-);
-
-Status XagCreateNonembeddedApplicationGroup(
- Display* /* dpy */,
- XAppGroup* /* app_group_return */
-);
-
-Status XagDestroyApplicationGroup(
- Display* /* dpy */,
- XAppGroup /* app_group */
-);
-
-Status XagGetApplicationGroupAttributes(
- Display* /* dpy */,
- XAppGroup /* app_group */,
- ...
-);
-
-Status XagQueryApplicationGroup(
- Display* /* dpy */,
- XID /* resource_base */,
- XAppGroup* /* app_group_ret */
-);
-
-Status XagCreateAssociation(
- Display* /* dpy */,
- Window* /* window_ret */,
- void* /* system_window */
-);
-
-Status XagDestroyAssociation(
- Display* /* dpy */,
- Window /* window */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XAG_SERVER_ */
-
-#endif /* _XAG_H_ */
-
diff --git a/nx-X11/include/extensions/Xagsrv.h b/nx-X11/include/extensions/Xagsrv.h
deleted file mode 100644
index daf1af04d..000000000
--- a/nx-X11/include/extensions/Xagsrv.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $XFree86: xc/include/extensions/Xagsrv.h,v 1.5 2003/07/16 01:38:24 dawes Exp $ */
-/*
-Copyright 1996, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-*/
-/* $Xorg: Xagsrv.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _XAGSRV_H_
-#define _XAGSRV_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-extern void XagConnectionInfo(
- ClientPtr /* client */,
- xConnSetupPrefix** /* conn_prefix */,
- char** /* conn_info */,
- int* /* num_screens */
-);
-
-extern VisualID XagRootVisual(
- ClientPtr /* client */
-);
-
-extern Colormap XagDefaultColormap(
- ClientPtr /* client */
-);
-
-extern ClientPtr XagLeader(
- ClientPtr /* client */
-);
-
-extern void XagCallClientStateChange(
- ClientPtr /* client */
-);
-
-extern Bool XagIsControlledRoot (
- ClientPtr /* client */,
- WindowPtr /* pParent */
-);
-
-extern XID XagId (
- ClientPtr /* client */
-);
-
-extern void XagGetDeltaInfo (
- ClientPtr /* client */,
- CARD32* /* buf */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XAGSRV_H_ */
-
diff --git a/nx-X11/include/extensions/Xagstr.h b/nx-X11/include/extensions/Xagstr.h
deleted file mode 100644
index 4f12027e0..000000000
--- a/nx-X11/include/extensions/Xagstr.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/* $XFree86: xc/include/extensions/Xagstr.h,v 1.4 2001/12/14 19:53:28 dawes Exp $ */
-/*
-Copyright 1996, 1998, 2001 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-*/
-/* $Xorg: Xagstr.h,v 1.6 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _XAGSTR_H_ /* { */
-#define _XAGSTR_H_
-
-#include <nx-X11/extensions/Xag.h>
-
-#define XAppGroup CARD32
-
-#define XAGNAME "XC-APPGROUP"
-
-#define XAG_MAJOR_VERSION 1 /* current version numbers */
-#define XAG_MINOR_VERSION 0
-
-#define XagWindowTypeX11 0
-#define XagWindowTypeMacintosh 1
-#define XagWindowTypeWin32 2
-#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.
-*/
-
-#define Colormap CARD32
-#define VisualID CARD32
-#define Window CARD32
-
-typedef struct _XagQueryVersion {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagQueryVersion */
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
-} xXagQueryVersionReq;
-#define sz_xXagQueryVersionReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXagQueryVersionReply;
-#define sz_xXagQueryVersionReply 32
-
-/* Set AppGroup Attributes masks */
-#define XagSingleScreenMask 1 << 0
-#define XagDefaultRootMask 1 << XagNdefaultRoot
-#define XagRootVisualMask 1 << XagNrootVisual
-#define XagDefaultColormapMask 1 << XagNdefaultColormap
-#define XagBlackPixelMask 1 << XagNblackPixel
-#define XagWhitePixelMask 1 << XagNwhitePixel
-#define XagAppGroupLeaderMask 1 << XagNappGroupLeader
-
-typedef struct _XagCreate {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagCreate */
- CARD16 length B16;
- XAppGroup app_group B32;
- CARD32 attrib_mask B32; /* LISTofVALUE follows */
-} xXagCreateReq;
-#define sz_xXagCreateReq 12
-
-typedef struct _XagDestroy {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagDestroy */
- CARD16 length B16;
- XAppGroup app_group B32;
-} xXagDestroyReq;
-#define sz_xXagDestroyReq 8
-
-typedef struct _XagGetAttr {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagGetAttr */
- CARD16 length B16;
- XAppGroup app_group B32;
-} xXagGetAttrReq;
-#define sz_xXagGetAttrReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- Window default_root B32;
- VisualID root_visual B32;
- Colormap default_colormap B32;
- CARD32 black_pixel B32;
- CARD32 white_pixel B32;
- BOOL single_screen;
- BOOL app_group_leader;
- CARD16 pad2 B16;
-} xXagGetAttrReply;
-#define sz_xXagGetAttrReply 32
-
-typedef struct _XagQuery {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagQuery */
- CARD16 length B16;
- CARD32 resource B32;
-} xXagQueryReq;
-#define sz_xXagQueryReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- XAppGroup app_group B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXagQueryReply;
-#define sz_xXagQueryReply 32
-
-typedef struct _XagCreateAssoc {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagCreateAssoc */
- CARD16 length B16;
- Window window B32;
- CARD16 window_type B16;
- CARD16 system_window_len B16; /* LISTofCARD8 follows */
-} xXagCreateAssocReq;
-#define sz_xXagCreateAssocReq 12
-
-typedef struct _XagDestroyAssoc {
- CARD8 reqType; /* always XagReqCode */
- CARD8 xagReqType; /* always X_XagDestroyAssoc */
- CARD16 length B16;
- Window window B32;
-} xXagDestroyAssocReq;
-#define sz_xXagDestroyAssocReq 8
-
-#undef XAppGroup
-/*
- * Cancel the previous redefinition of the basic types, thus restoring their
- * X.h definitions.
- */
-
-#undef Window
-#undef Colormap
-#undef VisualID
-
-#endif /* } _XAGSTR_H_ */
-
diff --git a/nx-X11/include/extensions/Xcup.h b/nx-X11/include/extensions/Xcup.h
deleted file mode 100644
index fb5fd0887..000000000
--- a/nx-X11/include/extensions/Xcup.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* $Xorg: Xcup.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-/*
-
-Copyright 1987, 1988, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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$ */
-
-#ifndef _XCUP_H_
-#define _XCUP_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define X_XcupQueryVersion 0
-#define X_XcupGetReservedColormapEntries 1
-#define X_XcupStoreColors 2
-
-#define XcupNumberErrors 0
-
-#ifndef _XCUP_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XcupQueryVersion(
- Display* /* dpy */,
- int* /* major_version */,
- int* /* minor_version */
-);
-
-Status XcupGetReservedColormapEntries(
- Display* /* dpy */,
- int /* screen */,
- XColor** /* colors_out */,
- int* /* ncolors */
-);
-
-Status XcupStoreColors(
- Display* /* dpy */,
- Colormap /* colormap */,
- XColor* /* colors */,
- int /* ncolors */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XCUP_SERVER_ */
-
-#endif /* _XCUP_H_ */
-
diff --git a/nx-X11/include/extensions/Xcupstr.h b/nx-X11/include/extensions/Xcupstr.h
deleted file mode 100644
index fa77b5aea..000000000
--- a/nx-X11/include/extensions/Xcupstr.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/* $Xorg: Xcupstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-/*
-
-Copyright 1987, 1988, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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/Xcupstr.h,v 3.5 2001/08/01 00:44:35 tsi Exp $ */
-
-#ifndef _XCUPSTR_H_ /* { */
-#define _XCUPSTR_H_
-
-#include <nx-X11/extensions/Xcup.h>
-
-#define XCUPNAME "TOG-CUP"
-
-#define XCUP_MAJOR_VERSION 1 /* current version numbers */
-#define XCUP_MINOR_VERSION 0
-
-typedef struct _XcupQueryVersion {
- CARD8 reqType; /* always XcupReqCode */
- CARD8 xcupReqType; /* always X_XcupQueryVersion */
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
-} xXcupQueryVersionReq;
-#define sz_xXcupQueryVersionReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXcupQueryVersionReply;
-#define sz_xXcupQueryVersionReply 32
-
-typedef struct _XcupGetReservedColormapEntries {
- CARD8 reqType; /* always XcupReqCode */
- CARD8 xcupReqType; /* always X_XcupGetReservedColormapEntries */
- CARD16 length B16;
- CARD32 screen B32;
-} xXcupGetReservedColormapEntriesReq;
-#define sz_xXcupGetReservedColormapEntriesReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXcupGetReservedColormapEntriesReply;
-#define sz_xXcupGetReservedColormapEntriesReply 32
-
-typedef struct _XcupStoreColors {
- CARD8 reqType; /* always XcupReqCode */
- CARD8 xcupReqType; /* always X_XcupStoreColors */
- CARD16 length B16;
- CARD32 cmap B32;
-} xXcupStoreColorsReq;
-#define sz_xXcupStoreColorsReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXcupStoreColorsReply;
-#define sz_xXcupStoreColorsReply 32
-
-#endif /* } _XCUPSTR_H_ */
-
diff --git a/nx-X11/include/extensions/Xdbe.h b/nx-X11/include/extensions/Xdbe.h
deleted file mode 100644
index bc43007c6..000000000
--- a/nx-X11/include/extensions/Xdbe.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/******************************************************************************
- *
- * Copyright (c) 1994, 1995 Hewlett-Packard Company
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL HEWLETT-PACKARD COMPANY BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the Hewlett-Packard
- * Company 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 Hewlett-Packard Company.
- *
- * 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
-
-
-/* INCLUDES */
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/extensions/Xdbeproto.h>
-
-
-/* DEFINES */
-
-/* Errors */
-#define XdbeBadBuffer 0
-
-
-/* TYPEDEFS */
-
-typedef Drawable XdbeBackBuffer;
-
-typedef unsigned char XdbeSwapAction;
-
-typedef struct
-{
- Window swap_window; /* window for which to swap buffers */
- XdbeSwapAction swap_action; /* swap action to use for swap_window */
-}
-XdbeSwapInfo;
-
-typedef struct
-{
- Window window; /* window that buffer belongs to */
-}
-XdbeBackBufferAttributes;
-
-typedef struct
-{
- int type;
- Display *display; /* display the event was read from */
- XdbeBackBuffer buffer; /* resource id */
- unsigned long serial; /* serial number of failed request */
- unsigned char error_code; /* error base + XdbeBadBuffer */
- unsigned char request_code; /* major opcode of failed request */
- unsigned char minor_code; /* minor opcode of failed request */
-}
-XdbeBufferError;
-
-/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops
- * (for non-C++ builds) in X11/Xfuncproto.h.
- */
-_XFUNCPROTOBEGIN
-
-extern Status XdbeQueryExtension(
- Display* /* dpy */,
- int* /* major_version_return */,
- int* /* minor_version_return */
-);
-
-extern XdbeBackBuffer XdbeAllocateBackBufferName(
- Display* /* dpy */,
- Window /* window */,
- XdbeSwapAction /* swap_action */
-);
-
-extern Status XdbeDeallocateBackBufferName(
- Display* /* dpy */,
- XdbeBackBuffer /* buffer */
-);
-
-extern Status XdbeSwapBuffers(
- Display* /* dpy */,
- XdbeSwapInfo* /* swap_info */,
- int /* num_windows */
-);
-
-extern Status XdbeBeginIdiom(
- Display* /* dpy */
-);
-
-extern Status XdbeEndIdiom(
- Display* /* dpy */
-);
-
-extern XdbeScreenVisualInfo *XdbeGetVisualInfo(
- Display* /* dpy */,
- Drawable* /* screen_specifiers */,
- int* /* num_screens */
-);
-
-extern void XdbeFreeVisualInfo(
- XdbeScreenVisualInfo* /* visual_info */
-);
-
-extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
- Display* /* dpy */,
- XdbeBackBuffer /* buffer */
-);
-
-_XFUNCPROTOEND
-
-#endif /* XDBE_H */
-
diff --git a/nx-X11/include/extensions/Xevie.h b/nx-X11/include/extensions/Xevie.h
deleted file mode 100644
index 5dc48bbfd..000000000
--- a/nx-X11/include/extensions/Xevie.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* $XdotOrg: xc/include/extensions/Xevie.h,v 1.3 2005/05/22 01:20:14 alanc Exp $ */
-/************************************************************
-
-Copyright 2003 Sun Microsystems, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-************************************************************/
-
-#ifndef _XEVIE_H_
-#define _XEVIE_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define XEVIE_UNMODIFIED 0
-#define XEVIE_MODIFIED 1
-
-#ifndef _XEVIE_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XevieQueryVersion(
- Display* /* dpy */,
- int* /* major_version */,
- int* /* minor_version */
-);
-
-extern Status XevieStart(
- Display* /* dpy */
-);
-
-Status XevieEnd(
- Display* /* dpy */
-);
-
-Status XevieSendEvent(
- Display* /* dpy */,
- XEvent* /* event */,
- int /* data type */
-);
-
-Status XevieSelectInput(
- Display* /* dpy */,
- long
-);
-
-
-_XFUNCPROTOEND
-
-#endif /* _XEVIE_SERVER_ */
-
-#endif /* _XEVIE_H_ */
-
diff --git a/nx-X11/include/extensions/Xeviestr.h b/nx-X11/include/extensions/Xeviestr.h
deleted file mode 100644
index 5f2c9b49f..000000000
--- a/nx-X11/include/extensions/Xeviestr.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* $XdotOrg: xc/include/extensions/Xeviestr.h,v 1.3 2005/05/22 01:20:14 alanc Exp $ */
-/************************************************************
-
-Copyright 2003 Sun Microsystems, Inc.
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, and/or sell copies of the Software, and to permit persons
-to whom the Software is furnished to do so, provided that the above
-copyright notice(s) and this permission notice appear in all copies of
-the Software and that both the above copyright notice(s) and this
-permission notice appear in supporting documentation.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, 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.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-of the copyright holder.
-
-************************************************************/
-
-#ifndef _XEVIESTR_H_
-#define _XEVIESTR_H_
-
-#define XEVIENAME "XEVIE"
-
-#define XEVIE_MAJOR_VERSION 1
-#define XEVIE_MINOR_VERSION 0
-
-#define X_XevieQueryVersion 0
-#define X_XevieStart 1
-#define X_XevieEnd 2
-#define X_XevieSend 3
-#define X_XevieSelectInput 4
-
-#define XevieNumberErrors 0
-
-typedef struct _XevieQueryVersion {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD16 client_major_version B16;
- CARD16 client_minor_version B16;
-} xXevieQueryVersionReq;
-#define sz_xXevieQueryVersionReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD16 server_major_version B16;
- CARD16 server_minor_version B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXevieQueryVersionReply;
-#define sz_xXevieQueryVersionReply 32
-
-typedef struct _XevieStart {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXevieStartReq;
-#define sz_xXevieStartReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieStartReply;
-#define sz_xXevieStartReply 32
-
-typedef struct _XevieEnd {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 cmap B32;
-} xXevieEndReq;
-#define sz_xXevieEndReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieEndReply;
-#define sz_xXevieEndReply 32
-
-typedef struct _XevieSend {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- xEvent event;
- CARD32 dataType B32;
-} xXevieSendReq;
-#define sz_xXevieSendReq 104
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieSendReply;
-#define sz_xXevieSendReply 32
-
-typedef struct _XevieSelectInput {
- CARD8 reqType;
- CARD8 xevieReqType;
- CARD16 length B16;
- CARD32 event_mask B32;
-} xXevieSelectInputReq;
-#define sz_xXevieSelectInputReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequence_number B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXevieSelectInputReply;
-#define sz_xXevieSelectInputReply 32
-
-#endif /* } _XEVIESTR_H_ */
-
diff --git a/nx-X11/include/extensions/Xinerama.h b/nx-X11/include/extensions/Xinerama.h
deleted file mode 100644
index 77e7e7444..000000000
--- a/nx-X11/include/extensions/Xinerama.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.3 2004/12/01 19:03:46 daniels Exp $ */
-/*
-
-Copyright 2003 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
-
-#ifndef _Xinerama_h
-#define _Xinerama_h
-
-#include <nx-X11/Xlib.h>
-
-typedef struct {
- int screen_number;
- short x_org;
- short y_org;
- short width;
- short height;
-} XineramaScreenInfo;
-
-_XFUNCPROTOBEGIN
-
-Bool XineramaQueryExtension (
- Display *dpy,
- int *event_base,
- int *error_base
-);
-
-Status XineramaQueryVersion(
- Display *dpy,
- int *major_versionp,
- int *minor_versionp
-);
-
-Bool XineramaIsActive(Display *dpy);
-
-
-/*
- Returns the number of heads and a pointer to an array of
- structures describing the position and size of the individual
- heads. Returns NULL and number = 0 if Xinerama is not active.
-
- Returned array should be freed with XFree().
-*/
-
-XineramaScreenInfo *
-XineramaQueryScreens(
- Display *dpy,
- int *number
-);
-
-_XFUNCPROTOEND
-
-#endif /* _Xinerama_h */
-
diff --git a/nx-X11/include/extensions/fontcache.h b/nx-X11/include/extensions/fontcache.h
deleted file mode 100644
index 2a3cf619b..000000000
--- a/nx-X11/include/extensions/fontcache.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcache.h,v 1.6 1999/01/31 12:41:32 akiyama Exp $
- */
-/* $XFree86: xc/include/extensions/fontcache.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _EXT_FONTCACHE_H_
-#define _EXT_FONTCACHE_H_
-
-#define X_FontCacheQueryVersion 0
-#define X_FontCacheGetCacheSettings 1
-#define X_FontCacheChangeCacheSettings 2
-#define X_FontCacheGetCacheStatistics 3
-
-#define FontCacheNumberEvents 0
-
-#define FontCacheBadProtocol 0
-#define FontCacheCannotAllocMemory 1
-#define FontCacheNumberErrors (FontCacheCannotAllocMemory + 1)
-
-typedef struct {
- long himark;
- long lowmark;
- long balance;
-} FontCacheSettings, *FontCacheSettingsPtr;
-
-struct cacheinfo {
- long hits;
- long misshits;
- long purged;
- long usage;
-};
-
-typedef struct {
- long purge_runs;
- long purge_stat;
- long balance;
- struct cacheinfo f;
- struct cacheinfo v;
-} FontCacheStatistics, *FontCacheStatisticsPtr;
-
-#ifndef _FONTCACHE_SERVER_
-
-#include <nx-X11/Xlib.h>
-
-_XFUNCPROTOBEGIN
-
-Bool FontCacheQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool FontCacheQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Status FontCacheGetCacheSettings(
- Display* /* dpy */,
- FontCacheSettings* /* cache info */
-);
-
-Status FontCacheChangeCacheSettings(
- Display* /* dpy */,
- FontCacheSettings* /* cache info */
-);
-
-Status FontCacheGetCacheStatistics(
- Display* /* dpy */,
- FontCacheStatistics* /* cache statistics info */
-);
-
-_XFUNCPROTOEND
-
-#endif /* !_FONTCACHE_SERVER_ */
-
-#endif /* _EXT_FONTCACHE_H_ */
diff --git a/nx-X11/include/extensions/fontcacheP.h b/nx-X11/include/extensions/fontcacheP.h
deleted file mode 100644
index 5363ef149..000000000
--- a/nx-X11/include/extensions/fontcacheP.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $
- */
-/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.4 2000/03/01 01:04:21 dawes Exp $ */
-
-#ifndef _FONTCACHEP_H_
-#define _FONTCACHEP_H_
-
-#include <nx-X11/extensions/fontcache.h>
-
-int FontCacheChangeSettings(FontCacheSettingsPtr /* cinfo */);
-void FontCacheGetSettings(FontCacheSettingsPtr /* cinfo */);
-void FontCacheGetStatistics(FontCacheStatisticsPtr /* cstats */);
-
-#endif /* _FONTCACHEP_H_ */
diff --git a/nx-X11/include/extensions/fontcachstr.h b/nx-X11/include/extensions/fontcachstr.h
deleted file mode 100644
index abead0f2b..000000000
--- a/nx-X11/include/extensions/fontcachstr.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (c) 1998-1999 Shunsuke Akiyama <akiyama@jp.FreeBSD.org>.
- * All rights reserved.
- * Copyright (c) 1998-1999 X-TrueType Server Project, All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $
- */
-/* $XFree86$ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _FONTCACHESTR_H_
-#define _FONTCACHESTR_H_
-
-#include <nx-X11/extensions/fontcache.h>
-
-#define FONTCACHENAME "FontCache"
-
-#define FONTCACHE_MAJOR_VERSION 0 /* current version numbers */
-#define FONTCACHE_MINOR_VERSION 1
-
-typedef struct _FontCacheQueryVersion {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheQueryVersion */
- CARD16 length B16;
-} xFontCacheQueryVersionReq;
-#define sz_xFontCacheQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of Font-Cache */
- CARD16 minorVersion B16; /* minor version of Font-Cache */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xFontCacheQueryVersionReply;
-#define sz_xFontCacheQueryVersionReply 32
-
-typedef struct _FontCacheGetCacheSettings {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheGetCacheSettings */
- CARD16 length B16;
-} xFontCacheGetCacheSettingsReq;
-#define sz_xFontCacheGetCacheSettingsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
-} xFontCacheGetCacheSettingsReply;
-#define sz_xFontCacheGetCacheSettingsReply 32
-
-typedef struct _FontCacheChangeCacheSettings {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheChangeCacheSettings */
- CARD16 length B16;
- CARD32 himark B32;
- CARD32 lowmark B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 reserve1 B32;
- CARD32 reserve2 B32;
- CARD32 reserve3 B32;
-} xFontCacheChangeCacheSettingsReq;
-#define sz_xFontCacheChangeCacheSettingsReq 32
-
-typedef struct _FontCacheGetCacheStatistics {
- CARD8 reqType; /* always FontCacheReqCode */
- CARD8 fontcacheReqType; /* always X_FontCacheGetCacheStatistics */
- CARD16 length B16;
-} xFontCacheGetCacheStatisticsReq;
-#define sz_xFontCacheGetCacheStatisticsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 purge_runs B32;
- CARD32 purge_stat B32;
- CARD32 balance B32;
- CARD32 reserve0 B32;
- CARD32 f_hits B32;
- CARD32 f_misshits B32;
- CARD32 f_purged B32;
- CARD32 f_usage B32;
- CARD32 f_reserve0 B32;
- CARD32 v_hits B32;
- CARD32 v_misshits B32;
- CARD32 v_purged B32;
- CARD32 v_usage B32;
- CARD32 v_reserve0 B32;
-} xFontCacheGetCacheStatisticsReply;
-#define sz_xFontCacheGetCacheStatisticsReply 64
-
-#endif /* _FONTCACHESTR_H_ */
diff --git a/nx-X11/include/extensions/lbxbuf.h b/nx-X11/include/extensions/lbxbuf.h
deleted file mode 100644
index 1a5a7475a..000000000
--- a/nx-X11/include/extensions/lbxbuf.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Xorg: lbxbuf.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Network Computing Devices, Inc. not be
- * used in advertising or publicity pertaining to distribution of this
- * software without specific, written prior permission.
- *
- * THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC.,
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK
- * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE,
- * DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND
- * REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- */
-
-#ifndef _BUFFER_H_
-#define _BUFFER_H_
-
-#define INBUFFER_SIZE (1 << 13) /* 8K */
-#define OUTBUFFER_SIZE (1 << 12) /* 4K */
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-typedef struct _zlibbuffer *ZlibBufferPtr;
-
-#include <nx-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/nx-X11/include/extensions/lbxbufstr.h b/nx-X11/include/extensions/lbxbufstr.h
deleted file mode 100644
index d99730e7e..000000000
--- a/nx-X11/include/extensions/lbxbufstr.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Xorg: lbxbufstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Network Computing Devices, Inc. not be
- * used in advertising or publicity pertaining to distribution of this
- * software without specific, written prior permission.
- *
- * THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC.,
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK
- * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE,
- * DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND
- * REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- *
- */
-/* $XFree86$ */
-
-#ifndef _BUFFERSTR_H_
-#define _BUFFERSTR_H_
-
-#include <nx-X11/extensions/lbxbuf.h>
-
-/*
- * ZLIB Input/Output buffer
- */
-typedef struct _zlibbuffer {
- char *bufbase;
- char *bufend;
- char *bufptr;
- int bufcnt;
-} ZlibBuffer;
-
-#define BYTES_AVAIL(inbuf, len) \
- (((inbuf)->bufcnt >= (len)) ? (inbuf)->bufptr : NULL)
-
-#endif /* _BUFFERSTR_H_ */
diff --git a/nx-X11/include/extensions/lbxdeltastr.h b/nx-X11/include/extensions/lbxdeltastr.h
deleted file mode 100644
index a8e4cb3b0..000000000
--- a/nx-X11/include/extensions/lbxdeltastr.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* $Xorg: lbxdeltastr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1993 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of NCD. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. NCD. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, 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.
- *
- */
-
-#ifndef LBX_DELTA_STRUCT_H
-#define LBX_DELTA_STRUCT_H
-
-#define MIN_CACHEABLE_LEN 8
-
-#define DELTA_CACHEABLE(pcache, len) \
- ((len) > MIN_CACHEABLE_LEN && (len) <= (pcache)->maxDeltasize)
-
-/*
- * An entry in the delta compactor cache
- */
-typedef struct _LBXDeltaElem {
- int length;
- unsigned char *buf;
-} LBXDeltaElemRec, *LBXDeltaElemPtr;
-
-
-/*
- * Delta compactor cache
- */
-typedef struct _LBXDeltas {
- unsigned short nDeltas;
- unsigned short maxDeltasize;
- LBXDeltaElemPtr deltas;
- unsigned short nextDelta;
- unsigned short activeDeltas; /* only needed for outgoing */
-} LBXDeltasRec, *LBXDeltasPtr;
-
-
-/*
- * Motion delta cache
- */
-
-typedef struct {
- BYTE swapped;
- BYTE detail;
- CARD16 sequenceNumber B16;
- Time time B32;
- Window root B32, event B32, child B32;
- INT16 rootX B16, rootY B16, eventX B16, eventY B16;
- KeyButMask state B16;
- BOOL sameScreen;
-} lbxMotionCache;
-
-
-/*
- * Motion delta events
- */
-
-typedef struct {
- BYTE type; /* always eventBase + LbxQuickMotionDeltaEvent */
- CARD8 deltaTime;
- INT8 deltaX;
- INT8 deltaY;
-} lbxQuickMotionDeltaEvent;
-#define sz_lbxQuickMotionDeltaEvent 4
-
-typedef struct {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxMotionDeltaEvent */
- INT8 deltaX;
- INT8 deltaY;
- CARD16 deltaTime B16;
- CARD16 deltaSequence B16;
-} 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 */
diff --git a/nx-X11/include/extensions/lbximage.h b/nx-X11/include/extensions/lbximage.h
deleted file mode 100644
index fff181a69..000000000
--- a/nx-X11/include/extensions/lbximage.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* $Xorg: lbximage.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-/******************************************************************************
-
-Copyright 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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/lbximage.h,v 1.4 2001/12/20 19:28:54 tsi Exp $ */
-
-#ifndef _LBX_IMAGE_H_
-#define _LBX_IMAGE_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _LbxBitmapCompMethod {
-
- char *methodName;
- int inited;
- int methodOpCode; /* to be filled on reply from server */
-
- int (*compInit)(
- void
- );
-
- int (*compFunc)(
- unsigned char * /* inbuf */,
- unsigned char * /* outbuf */,
- int /* outbufSize */,
- int /* image_bytes */,
- int /* pixels_per_line */,
- int /* padded_bytes_per_scanline */,
- int /* reverse_bits */,
- int * /* bytesCompressed */
- );
-
- int (*decompFunc)(
- unsigned char * /* inbuf */,
- unsigned char * /* outbuf */,
- int /* image_bytes */,
- int /* pixels_per_line */,
- int /* padded_bytes_per_scanline */,
- int /* reverse_bits */
- );
-
-} LbxBitmapCompMethod;
-
-
-#define LBX_MAX_DEPTHS 5
-
-typedef struct _LbxPixmapCompMethod {
-
- char *methodName;
- unsigned formatMask;
- int depthCount;
- int depths[LBX_MAX_DEPTHS];
- int inited;
- int methodOpCode; /* to be filled on reply from server */
-
- int (*compInit)(
- void
- );
-
- int (*compFunc)(
- char * /* inbuf */,
- char * /* outbuf */,
- int /* outbufSize */,
- int /* format */,
- int /* depth */,
- int /* num_scan_lines */,
- int /* scan_line_size */,
- int * /* bytesCompressed */
- );
-
- int (*decompFunc)(
- char * /* inbuf */,
- char * /* outbuf */,
- int /* num_scan_lines */,
- int /* scan_line_size */
- );
-
-} LbxPixmapCompMethod;
-
-
-extern int LbxImageEncodePackBits (
-char * /* inbuf */,
-char * /* outbuf */,
-int /* outbufSize */,
-int /* format */,
-int /* depth */,
-int /* num_scan_lines */,
-int /* scan_line_size */,
-int * /* bytesCompressed */
-);
-
-extern int LbxImageEncodeFaxG42D (
-unsigned char * /* inbuf */,
-unsigned char * /* outbuf */,
-int /* outbufSize */,
-int /* image_bytes */,
-int /* pixels_per_line */,
-int /* padded_bytes_per_scanline */,
-int /* reverse_bits */,
-int * /* bytesCompressed */
-);
-
-extern int LbxImageDecodePackBits (
-char * /* inbuf */,
-char * /* outbuf */,
-int /* num_scan_lines */,
-int /* scan_line_size */
-);
-
-extern int LbxImageDecodeFaxG42D (
-unsigned char * /* inbuf */,
-unsigned char * /* outbuf */,
-int /* image_bytes */,
-int /* pixels_per_line */,
-int /* padded_bytes_per_scanline */,
-int /* reverse_bits */
-);
-
-_XFUNCPROTOEND
-
-#define LBX_IMAGE_COMPRESS_SUCCESS 0
-#define LBX_IMAGE_COMPRESS_NO_SUPPORT 1
-#define LBX_IMAGE_COMPRESS_BAD_MALLOC 2
-#define LBX_IMAGE_COMPRESS_NOT_WORTH_IT 3
-
-#endif /* _LBX_IMAGE_H_ */
diff --git a/nx-X11/include/extensions/lbxopts.h b/nx-X11/include/extensions/lbxopts.h
deleted file mode 100644
index 3ec81fcb2..000000000
--- a/nx-X11/include/extensions/lbxopts.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* $Xorg: lbxopts.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1994 Network Computing Devices, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Network Computing Devices, Inc. not be
- * used in advertising or publicity pertaining to distribution of this
- * software without specific, written prior permission.
- *
- * THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC.,
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK
- * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA,
- * OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF
- * WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-/* $XFree86: xc/include/extensions/lbxopts.h,v 1.5 2001/01/17 17:53:21 dawes Exp $ */
-
-#ifndef _LBX_OPTS_H_
-#define _LBX_OPTS_H_
-
-/*
- * Negotiable configuration options
- */
-#define LBX_OPT_DELTA_PROXY 0
-#define LBX_OPT_DELTA_SERVER 1
-#define LBX_OPT_STREAM_COMP 2
-#define LBX_OPT_BITMAP_COMP 3
-#define LBX_OPT_PIXMAP_COMP 4
-#define LBX_OPT_MSG_COMP 5 /* aka "squishing" */
-#define LBX_OPT_USE_TAGS 6
-#define LBX_OPT_CMAP_ALL 7
-#define LBX_OPT_EXTENSION 255
-
-/*
- * Length fields are encoded in 1 or 3 bytes
- */
-#define LBX_OPT_SMALLLEN_SIZE 1
-#define LBX_OPT_BIGLEN_SIZE 3
-#define LBX_OPT_BIGLEN_MIN 256
-
-#define LBX_OPT_DECODE_LEN(p, len, size) \
- if ((p)[0]) { \
- (len) = (p)[0]; \
- (size) = LBX_OPT_SMALLLEN_SIZE; \
- } \
- else { \
- (len) = ((LBX_OPT_BIGLEN_MIN + (p)[1]) << 8) | (p)[2]; \
- (size) = LBX_OPT_BIGLEN_SIZE; \
- }
-
-/*
- * Option header lengths
- */
-#define LBX_OPT_SMALLHDR_LEN (1 + LBX_OPT_SMALLLEN_SIZE)
-#define LBX_OPT_BIGHDR_LEN (1 + LBX_OPT_BIGLEN_SIZE)
-
-/*
- * Delta compression parameters
- */
-#define LBX_OPT_DELTA_REQLEN 6
-#define LBX_OPT_DELTA_REPLYLEN 2
-#define LBX_OPT_DELTA_NCACHE_DFLT 16
-#define LBX_OPT_DELTA_MSGLEN_MIN 32
-#define LBX_OPT_DELTA_MSGLEN_DFLT 64
-
-
-/*
- * Stream compression opts
- */
-
-#include <sys/types.h>
-
-#if defined(WIN32) || (defined(USG) && !defined(umips) && !defined(MOTOROLA) && !defined(uniosu) && !defined(__sxg__))
-
-struct iovec {
- caddr_t iov_base;
- int iov_len;
-};
-
-#else
-#ifndef Lynx
-#include <sys/uio.h>
-#else
-#include <uio.h>
-#endif
-#endif
-
-typedef void *LbxStreamCompHandle;
-
-typedef struct _LbxStreamOpts {
- LbxStreamCompHandle (*streamCompInit)(int fd, void * arg);
- void * streamCompArg;
- int (*streamCompStuffInput)(
- int fd,
- unsigned char *buf,
- int buflen
- );
- int (*streamCompInputAvail)(
- int fd
- );
- int (*streamCompFlush)(
- int fd
- );
- int (*streamCompRead)(
- int fd,
- unsigned char *buf,
- int buflen
- );
- int (*streamCompWriteV)(
- int fd,
- struct iovec *iov,
- int iovcnt
- );
- void (*streamCompOn)(
- int fd
- );
- void (*streamCompOff)(
- int fd
- );
- void (*streamCompFreeHandle)(
- LbxStreamCompHandle handle
- );
-} LbxStreamOpts;
-
-#endif /* _LBX_OPTS_H_ */
diff --git a/nx-X11/include/extensions/lbxstr.h b/nx-X11/include/extensions/lbxstr.h
deleted file mode 100644
index 7bde5a766..000000000
--- a/nx-X11/include/extensions/lbxstr.h
+++ /dev/null
@@ -1,931 +0,0 @@
-/* $Xorg: lbxstr.h,v 1.4 2001/02/13 20:14:04 pookie Exp $ */
-/*
- * Copyright 1992 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of NCD. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. NCD. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, 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/lbxstr.h,v 1.2 2001/08/01 00:44:35 tsi Exp $ */
-
-#ifndef _LBXSTR_H_
-#define _LBXSTR_H_
-
-#include <nx-X11/extensions/XLbx.h>
-
-#define LBXNAME "LBX"
-
-#define LBX_MAJOR_VERSION 1
-#define LBX_MINOR_VERSION 0
-
-/*
- * Redefine some basic types used by structures defined herein. This removes
- * any possibility on 64-bit architectures of one entity viewing communicated
- * 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
-#define Drawable CARD32
-#define VisualID CARD32
-#define Window CARD32
-
-typedef struct {
- BOOL success; /* TRUE */
- BOOL changeType;
- CARD16 majorVersion B16,
- minorVersion B16;
- CARD16 length B16; /* 1/4 additional bytes in setup info */
- CARD32 tag B32;
-} xLbxConnSetupPrefix;
-
-typedef struct _LbxQueryVersion {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxQueryVersion */
- CARD16 length B16;
-} xLbxQueryVersionReq;
-#define sz_xLbxQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of LBX protocol */
- CARD16 minorVersion B16; /* minor version of LBX protocol */
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxQueryVersionReply;
-#define sz_xLbxQueryVersionReply 32
-
-typedef struct _LbxStartProxy {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxStartProxy */
- CARD16 length B16;
-} xLbxStartProxyReq;
-#define sz_xLbxStartProxyReq 4
-
-typedef struct _LbxStopProxy {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxStopProxy */
- CARD16 length B16;
-} xLbxStopProxyReq;
-#define sz_xLbxStopProxyReq 4
-
-typedef struct _LbxSwitch {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxSwitch */
- CARD16 length B16;
- CARD32 client B32; /* new client */
-} xLbxSwitchReq;
-#define sz_xLbxSwitchReq 8
-
-typedef struct _LbxNewClient {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxNewClient */
- CARD16 length B16;
- CARD32 client B32; /* new client */
-} xLbxNewClientReq;
-#define sz_xLbxNewClientReq 8
-
-typedef struct _LbxCloseClient {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxCloseClient */
- CARD16 length B16;
- CARD32 client B32; /* new client */
-} xLbxCloseClientReq;
-#define sz_xLbxCloseClientReq 8
-
-typedef struct _LbxModifySequence {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxModifySequence */
- CARD16 length B16;
- CARD32 adjust B32;
-} xLbxModifySequenceReq;
-#define sz_xLbxModifySequenceReq 8
-
-typedef struct _LbxAllowMotion {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxAllowMotion */
- CARD16 length B16;
- CARD32 num B32;
-} xLbxAllowMotionReq;
-#define sz_xLbxAllowMotionReq 8
-
-typedef struct {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGrabCmap */
- CARD16 length B16;
- Colormap cmap B32;
-} xLbxGrabCmapReq;
-#define sz_xLbxGrabCmapReq 8
-
-#define LBX_SMART_GRAB 0x80
-#define LBX_AUTO_RELEASE 0x40
-#define LBX_3CHANNELS 0x20
-#define LBX_2BYTE_PIXELS 0x10
-#define LBX_RGB_BITS_MASK 0x0f
-
-#define LBX_LIST_END 0
-#define LBX_PIXEL_PRIVATE 1
-#define LBX_PIXEL_SHARED 2
-#define LBX_PIXEL_RANGE_PRIVATE 3
-#define LBX_PIXEL_RANGE_SHARED 4
-#define LBX_NEXT_CHANNEL 5
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 flags;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B16;
-} xLbxGrabCmapReply;
-#define sz_xLbxGrabCmapReply 32
-#define sz_xLbxGrabCmapReplyHdr 8
-
-
-typedef struct {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxReleaseCmap */
- CARD16 length B16;
- Colormap cmap B32;
-} xLbxReleaseCmapReq;
-#define sz_xLbxReleaseCmapReq 8
-
-typedef struct {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxAllocColor */
- CARD16 length B16;
- Colormap cmap B32;
- CARD32 pixel B32;
- CARD16 red B16, green B16, blue B16;
- CARD16 pad B16;
-} xLbxAllocColorReq;
-#define sz_xLbxAllocColorReq 20
-
-typedef struct _LbxIncrementPixel {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxIncrementPixel */
- CARD16 length B16;
- CARD32 cmap B32;
- CARD32 pixel B32;
-} xLbxIncrementPixelReq;
-#define sz_xLbxIncrementPixelReq 12
-
-typedef struct _LbxDelta {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxDelta */
- CARD16 length B16;
- CARD8 diffs; /* number of diffs */
- CARD8 cindex; /* cache index */
- /* list of diffs follows */
-} xLbxDeltaReq;
-#define sz_xLbxDeltaReq 6
-
-typedef struct _LbxGetModifierMapping {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGetModifierMapping */
- CARD16 length B16;
-} xLbxGetModifierMappingReq;
-#define sz_xLbxGetModifierMappingReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 keyspermod;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxGetModifierMappingReply;
-#define sz_xLbxGetModifierMappingReply 32
-
-typedef struct _LbxGetKeyboardMapping {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGetKeyboardMapping */
- CARD16 length B16;
- KeyCode firstKeyCode;
- CARD8 count;
- CARD16 pad1 B16;
-} xLbxGetKeyboardMappingReq;
-#define sz_xLbxGetKeyboardMappingReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 keysperkeycode;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxGetKeyboardMappingReply;
-#define sz_xLbxGetKeyboardMappingReply 32
-
-typedef struct _LbxQueryFont {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxQueryFont */
- CARD16 length B16;
- CARD32 fid B32;
-} xLbxQueryFontReq;
-#define sz_xLbxQueryFontReq 8
-
-typedef struct _LbxInternAtoms {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxInternAtoms */
- CARD16 length B16;
- CARD16 num B16;
-} xLbxInternAtomsReq;
-#define sz_xLbxInternAtomsReq 6
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 atomsStart B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxInternAtomsReply;
-#define sz_xLbxInternAtomsReply 32
-#define sz_xLbxInternAtomsReplyHdr 8
-
-
-typedef struct _LbxGetWinAttrAndGeom {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGetWinAttrAndGeom */
- CARD16 length B16;
- CARD32 id B32; /* window id */
-} xLbxGetWinAttrAndGeomReq;
-#define sz_xLbxGetWinAttrAndGeomReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 backingStore;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* NOT 0; this is an extra-large reply */
- VisualID visualID B32;
-#if defined(__cplusplus) || defined(c_plusplus)
- CARD16 c_class B16;
-#else
- CARD16 class B16;
-#endif
- CARD8 bitGravity;
- CARD8 winGravity;
- CARD32 backingBitPlanes B32;
- CARD32 backingPixel B32;
- BOOL saveUnder;
- BOOL mapInstalled;
- CARD8 mapState;
- BOOL override;
- Colormap colormap B32;
- CARD32 allEventMasks B32;
- CARD32 yourEventMask B32;
- CARD16 doNotPropagateMask B16;
- CARD16 pad1 B16;
- Window root B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD16 borderWidth B16;
- CARD8 depth;
- CARD8 pad2;
-} xLbxGetWinAttrAndGeomReply;
-#define sz_xLbxGetWinAttrAndGeomReply 60
-
-
-typedef struct {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxSync */
- CARD16 length B16;
-} xLbxSyncReq;
-#define sz_xLbxSyncReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 pad0;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xLbxSyncReply;
-#define sz_xLbxSyncReply 32
-
-
-/* an LBX squished charinfo packs the data in a CARD32 as follows */
-#define LBX_WIDTH_SHIFT 26
-#define LBX_LEFT_SHIFT 20
-#define LBX_RIGHT_SHIFT 13
-#define LBX_ASCENT_SHIFT 7
-#define LBX_DESCENT_SHIFT 0
-
-#define LBX_WIDTH_BITS 6
-#define LBX_LEFT_BITS 6
-#define LBX_RIGHT_BITS 7
-#define LBX_ASCENT_BITS 6
-#define LBX_DESCENT_BITS 7
-
-#define LBX_WIDTH_MASK 0xfc000000
-#define LBX_LEFT_MASK 0x03f00000
-#define LBX_RIGHT_MASK 0x000fe000
-#define LBX_ASCENT_MASK 0x00001f80
-#define LBX_DESCENT_MASK 0x0000007f
-
-#define LBX_MASK_BITS(val, n) ((unsigned int) ((val) & ((1 << (n)) - 1)))
-
-typedef struct {
- CARD32 metrics B32;
-} xLbxCharInfo;
-
-/* note that this is identical to xQueryFontReply except for missing
- * first 2 words
- */
-typedef struct {
- xCharInfo minBounds;
-/* XXX do we need to leave this gunk? */
- CARD32 walign1 B32;
- xCharInfo maxBounds;
- CARD32 walign2 B32;
- CARD16 minCharOrByte2 B16, maxCharOrByte2 B16;
- CARD16 defaultChar B16;
- CARD16 nFontProps B16; /* followed by this many xFontProp structures */
- CARD8 drawDirection;
- CARD8 minByte1, maxByte1;
- BOOL allCharsExist;
- INT16 fontAscent B16, fontDescent B16;
- CARD32 nCharInfos B32; /* followed by this many xLbxCharInfo structures */
-} xLbxFontInfo;
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 compression;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- /* X_QueryFont sticks much of the data in the base reply packet,
- * but we hope that it won't be needed, (and it won't fit in 32 bytes
- * with the tag anyways)
- *
- * if any additional data is needed, its sent in a xLbxFontInfo
- */
-} xLbxQueryFontReply;
-#define sz_xLbxQueryFontReply 32
-
-typedef struct _LbxChangeProperty {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxChangeProperty */
- CARD16 length B16;
- Window window B32;
- Atom property B32;
- Atom type B32;
- CARD8 format;
- CARD8 mode;
- BYTE pad[2];
- CARD32 nUnits B32;
-} xLbxChangePropertyReq;
-#define sz_xLbxChangePropertyReq 24
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 tag B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxChangePropertyReply;
-#define sz_xLbxChangePropertyReply 32
-
-typedef struct _LbxGetProperty {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGetProperty */
- CARD16 length B16;
- Window window B32;
- Atom property B32;
- Atom type B32;
- CARD8 delete;
- BYTE pad[3];
- CARD32 longOffset B32;
- CARD32 longLength B32;
-} xLbxGetPropertyReq;
-#define sz_xLbxGetPropertyReq 28
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 format;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Atom propertyType B32;
- CARD32 bytesAfter B32;
- CARD32 nItems B32;
- CARD32 tag B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
-} xLbxGetPropertyReply;
-#define sz_xLbxGetPropertyReply 32
-
-typedef struct _LbxTagData {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxTagData */
- CARD16 length B16;
- XID tag B32;
- CARD32 real_length B32;
- /* data */
-} xLbxTagDataReq;
-#define sz_xLbxTagDataReq 12
-
-typedef struct _LbxInvalidateTag {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxInvalidateTag */
- CARD16 length B16;
- CARD32 tag B32;
-} xLbxInvalidateTagReq;
-#define sz_xLbxInvalidateTagReq 8
-
-typedef struct _LbxPutImage {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxPutImage */
- CARD16 length B16;
- CARD8 compressionMethod;
- CARD8 cacheEnts;
- CARD8 bitPacked;
- /* rest is variable */
-} xLbxPutImageReq;
-#define sz_xLbxPutImageReq 7
-
-typedef struct {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxGetImage */
- CARD16 length B16;
- Drawable drawable B32;
- INT16 x B16, y B16;
- CARD16 width B16, height B16;
- CARD32 planeMask B32;
- CARD8 format;
- CARD8 pad1;
- CARD16 pad2 B16;
-} xLbxGetImageReq;
-
-#define sz_xLbxGetImageReq 24
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 depth;
- CARD16 sequenceNumber B16;
- CARD32 lbxLength B32;
- CARD32 xLength B32;
- VisualID visual B32;
- CARD8 compressionMethod;
- CARD8 pad1;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xLbxGetImageReply;
-
-#define sz_xLbxGetImageReply 32
-
-/* Following used for LbxPolyPoint, LbxPolyLine, LbxPolySegment,
- LbxPolyRectangle, LbxPolyArc, LbxPolyFillRectangle and LbxPolyFillArc */
-
-#define GFX_CACHE_SIZE 15
-
-#define GFXdCacheEnt(e) ((e) & 0xf)
-#define GFXgCacheEnt(e) (((e) >> 4) & 0xf)
-#define GFXCacheEnts(d,g) (((d) & 0xf) | (((g) & 0xf) << 4))
-
-#define GFXCacheNone 0xf
-
-typedef struct _LbxPolyPoint {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD8 cacheEnts;
- CARD8 padBytes;
-} xLbxPolyPointReq;
-
-#define sz_xLbxPolyPointReq 6
-
-typedef xLbxPolyPointReq xLbxPolyLineReq;
-typedef xLbxPolyPointReq xLbxPolySegmentReq;
-typedef xLbxPolyPointReq xLbxPolyRectangleReq;
-typedef xLbxPolyPointReq xLbxPolyArcReq;
-typedef xLbxPolyPointReq xLbxPolyFillRectangleReq;
-typedef xLbxPolyPointReq xLbxPolyFillArcReq;
-
-#define sz_xLbxPolyLineReq sz_xLbxPolyPointReq
-#define sz_xLbxPolySegmentReq sz_xLbxPolyPointReq
-#define sz_xLbxPolyRectangleReq sz_xLbxPolyPointReq
-#define sz_xLbxPolyArcReq sz_xLbxPolyPointReq
-#define sz_xLbxPolyFillRectangleReq sz_xLbxPolyPointReq
-#define sz_xLbxPolyFillArc sz_xLbxPolyPointReq
-
-typedef struct _LbxFillPoly {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD8 cacheEnts;
- BYTE shape;
- CARD8 padBytes;
-} xLbxFillPolyReq;
-#define sz_xLbxFillPolyReq 7
-
-typedef struct _LbxCopyArea {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD8 srcCache; /* source drawable */
- CARD8 cacheEnts; /* dest drawable and gc */
- /* followed by encoded src x, src y, dst x, dst y, width, height */
-} xLbxCopyAreaReq;
-
-#define sz_xLbxCopyAreaReq 6
-
-typedef struct _LbxCopyPlane {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD32 bitPlane B32;
- CARD8 srcCache; /* source drawable */
- CARD8 cacheEnts; /* dest drawable and gc */
- /* followed by encoded src x, src y, dst x, dst y, width, height */
-} xLbxCopyPlaneReq;
-
-#define sz_xLbxCopyPlaneReq 10
-
-typedef struct _LbxPolyText {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD8 cacheEnts;
- /* followed by encoded src x, src y coordinates and text elts */
-} xLbxPolyTextReq;
-
-#define sz_xLbxPolyTextReq 5
-
-typedef xLbxPolyTextReq xLbxPolyText8Req;
-typedef xLbxPolyTextReq xLbxPolyText16Req;
-
-#define sz_xLbxPolyTextReq 5
-#define sz_xLbxPolyText8Req 5
-#define sz_xLbxPolyText16Req 5
-
-typedef struct _LbxImageText {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType;
- CARD16 length B16;
- CARD8 cacheEnts;
- CARD8 nChars;
- /* followed by encoded src x, src y coordinates and string */
-} xLbxImageTextReq;
-
-typedef xLbxImageTextReq xLbxImageText8Req;
-typedef xLbxImageTextReq xLbxImageText16Req;
-
-#define sz_xLbxImageTextReq 6
-#define sz_xLbxImageText8Req 6
-#define sz_xLbxImageText16Req 6
-
-typedef struct {
- CARD8 offset;
- CARD8 diff;
-} xLbxDiffItem;
-#define sz_xLbxDiffItem 2
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 nOpts;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 optDataStart B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxStartReply;
-#define sz_xLbxStartReply 32
-#define sz_xLbxStartReplyHdr 8
-
-typedef struct _LbxQueryExtension {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxQueryExtension */
- CARD16 length B16;
- CARD32 nbytes B32;
-} xLbxQueryExtensionReq;
-#define sz_xLbxQueryExtensionReq 8
-
-typedef struct _LbxQueryExtensionReply {
- BYTE type; /* X_Reply */
- CARD8 numReqs;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- BOOL present;
- CARD8 major_opcode;
- CARD8 first_event;
- CARD8 first_error;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-
- /* reply & event generating requests */
-} xLbxQueryExtensionReply;
-#define sz_xLbxQueryExtensionReply 32
-
-
-typedef struct _LbxBeginLargeRequest {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxBeginLargeRequest */
- CARD16 length B16;
- CARD32 largeReqLength B32;
-} xLbxBeginLargeRequestReq;
-#define sz_BeginLargeRequestReq 8
-
-typedef struct _LbxLargeRequestData {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxLargeRequestData */
- CARD16 length B16;
- /* followed by LISTofCARD8 data */
-} xLbxLargeRequestDataReq;
-#define sz_LargeRequestDataReq 4
-
-typedef struct _LbxEndLargeRequest {
- CARD8 reqType; /* always LbxReqCode */
- CARD8 lbxReqType; /* always X_LbxEndLargeRequest */
- CARD16 length B16;
-} xLbxEndLargeRequestReq;
-#define sz_EndLargeRequestReq 4
-
-
-
-typedef struct _LbxSwitchEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxSwitchEvent */
- CARD16 pad B16;
- CARD32 client B32;
-} xLbxSwitchEvent;
-#define sz_xLbxSwitchEvent 8
-
-typedef struct _LbxCloseEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxCloseEvent */
- CARD16 sequenceNumber B16;
- CARD32 client B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xLbxCloseEvent;
-#define sz_xLbxCloseEvent 32
-
-typedef struct _LbxInvalidateTagEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxInvalidateTagEvent */
- CARD16 sequenceNumber B16;
- CARD32 tag B32;
- CARD32 tagType B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xLbxInvalidateTagEvent;
-#define sz_xLbxInvalidateTagEvent 32
-
-typedef struct _LbxSendTagDataEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxSendTagDataEvent */
- CARD16 sequenceNumber B16;
- CARD32 tag B32;
- CARD32 tagType B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xLbxSendTagDataEvent;
-#define sz_xLbxSendTagDataEvent 32
-
-typedef struct _LbxListenToOneEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxListenToOneEvent */
- CARD16 sequenceNumber B16;
- CARD32 client B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xLbxListenToOneEvent;
-#define sz_xLbxListenToOneEvent 32
-
-typedef struct _LbxListenToAllEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxListenToAllEvent */
- CARD16 sequenceNumber B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xLbxListenToAllEvent;
-#define sz_xLbxListenToOneEvent 32
-
-typedef struct _LbxReleaseCmapEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxReleaseCmapEvent */
- CARD16 sequenceNumber B16;
- Colormap colormap B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xLbxReleaseCmapEvent;
-#define sz_xLbxReleaseCmapEvent 32
-
-
-typedef struct _LbxFreeCellsEvent {
- BYTE type; /* always eventBase + LbxEvent */
- BYTE lbxType; /* LbxFreeCellsEvent */
- CARD16 sequenceNumber B16;
- Colormap colormap B32;
- CARD32 pixelStart B32;
- CARD32 pixelEnd B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xLbxFreeCellsEvent;
-#define sz_xLbxFreeCellsEvent 32
-
-
-/*
- * squished X event sizes. If these change, be sure to update lbxquish.c
- * and unsquish.c appropriately
- *
- * lbxsz_* is the padded squished length
- * lbxupsz_* is the unpadded squished length
- */
-
-#define lbxsz_KeyButtonEvent 32
-#define lbxupsz_KeyButtonEvent 31
-
-#define lbxsz_EnterLeaveEvent 32
-#define lbxupsz_EnterLeaveEvent 32
-
-#define lbxsz_FocusEvent 12
-#define lbxupsz_FocusEvent 9
-
-#define lbxsz_KeymapEvent 32
-#define lbxupsz_KeymapEvent 32
-
-#define lbxsz_ExposeEvent 20
-#define lbxupsz_ExposeEvent 18
-
-#define lbxsz_GfxExposeEvent 24
-#define lbxupsz_GfxExposeEvent 21
-
-#define lbxsz_NoExposeEvent 12
-#define lbxupsz_NoExposeEvent 11
-
-#define lbxsz_VisibilityEvent 12
-#define lbxupsz_VisibilityEvent 9
-
-#define lbxsz_CreateNotifyEvent 24
-#define lbxupsz_CreateNotifyEvent 23
-
-#define lbxsz_DestroyNotifyEvent 12
-#define lbxupsz_DestroyNotifyEvent 12
-
-#define lbxsz_UnmapNotifyEvent 16
-#define lbxupsz_UnmapNotifyEvent 13
-
-#define lbxsz_MapNotifyEvent 16
-#define lbxupsz_MapNotifyEvent 13
-
-#define lbxsz_MapRequestEvent 12
-#define lbxupsz_MapRequestEvent 12
-
-#define lbxsz_ReparentEvent 24
-#define lbxupsz_ReparentEvent 21
-
-#define lbxsz_ConfigureNotifyEvent 28
-#define lbxupsz_ConfigureNotifyEvent 27
-
-#define lbxsz_ConfigureRequestEvent 28
-#define lbxupsz_ConfigureRequestEvent 28
-
-#define lbxsz_GravityEvent 16
-#define lbxupsz_GravityEvent 16
-
-#define lbxsz_ResizeRequestEvent 12
-#define lbxupsz_ResizeRequestEvent 12
-
-#define lbxsz_CirculateEvent 20
-#define lbxupsz_CirculateEvent 17
-
-#define lbxsz_PropertyEvent 20
-#define lbxupsz_PropertyEvent 17
-
-#define lbxsz_SelectionClearEvent 16
-#define lbxupsz_SelectionClearEvent 16
-
-#define lbxsz_SelectionRequestEvent 28
-#define lbxupsz_SelectionRequestEvent 28
-
-#define lbxsz_SelectionNotifyEvent 24
-#define lbxupsz_SelectionNotifyEvent 24
-
-#define lbxsz_ColormapEvent 16
-#define lbxupsz_ColormapEvent 14
-
-#define lbxsz_MappingNotifyEvent 8
-#define lbxupsz_MappingNotifyEvent 7
-
-#define lbxsz_ClientMessageEvent 32
-#define lbxupsz_ClientMessageEvent 32
-
-#define lbxsz_UnknownEvent 32
-
-#ifdef DEBUG
-
-#define DBG_SWITCH 0x00000001
-#define DBG_CLOSE 0x00000002
-#define DBG_IO 0x00000004
-#define DBG_READ_REQ 0x00000008
-#define DBG_LEN 0x00000010
-#define DBG_BLOCK 0x00000020
-#define DBG_CLIENT 0x00000040
-#define DBG_DELTA 0x00000080
-
-extern int lbxDebug;
-
-#define DBG(n,m) if (lbxDebug & (n)) { fprintf m; } else
-#else
-#define DBG(n,m)
-#endif
-
-/*
- * Cancel the previous redefinition of the basic types, thus restoring their
- * X.h definitions.
- */
-
-#undef XID
-#undef Atom
-#undef Colormap
-#undef Drawable
-#undef VisualID
-#undef Window
-
-#endif /* _LBXSTR_H_ */
diff --git a/nx-X11/include/extensions/lbxzlib.h b/nx-X11/include/extensions/lbxzlib.h
deleted file mode 100644
index dc21837a1..000000000
--- a/nx-X11/include/extensions/lbxzlib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* $Xorg: lbxzlib.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1993 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of NCD. not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. NCD. makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, 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.
- *
- * Author: Dale Tonogai, Network Computing Devices
- */
-
-#ifndef _ZLIB_H_
-#define _ZLIB_H_
-
-#define ZLIB_STRCOMP_OPT "XC-ZLIB"
-#define ZLIB_STRCOMP_OPT_LEN 7
-
-#define ZLIB_PACKET_HDRLEN 2
-#define ZLIB_MAX_DATALEN 0xfff
-#define ZLIB_MAX_PLAIN 270
-#define ZLIB_MAX_OUTLEN (ZLIB_MAX_PLAIN << 1)
-
-#define ZLIB_COMPRESS_FLAG 0x80
-#define ZLIB_DATALEN_MASK 0x0f
-
-#define ZLIB_PUT_PKTHDR(p, len, compflag) \
- { \
- (p)[0] = ((unsigned)(len)) >> 8 | ((compflag) ? ZLIB_COMPRESS_FLAG : 0);\
- (p)[1] = (len) & 0xff; \
- }
-
-#define ZLIB_GET_DATALEN(p) \
- ((((unsigned)((p)[0] & ZLIB_DATALEN_MASK)) << 8) | (unsigned)(p)[1])
-
-#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_ */
diff --git a/nx-X11/include/extensions/mitmiscstr.h b/nx-X11/include/extensions/mitmiscstr.h
deleted file mode 100644
index 32cae2635..000000000
--- a/nx-X11/include/extensions/mitmiscstr.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $XFree86$ */
-/************************************************************
-
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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.
-
-********************************************************/
-
-/* RANDOM CRUFT! THIS HAS NO OFFICIAL X CONSORTIUM OR X PROJECT TEAM BLESSING */
-
-/* $Xorg: mitmiscstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _MITMISCSTR_H_
-#define _MITMISCSTR_H_
-
-#include "MITMisc.h"
-
-#define MITMISCNAME "MIT-SUNDRY-NONSTANDARD"
-
-typedef struct _SetBugMode {
- CARD8 reqType; /* always MITReqCode */
- CARD8 mitReqType; /* always X_MITSetBugMode */
- CARD16 length B16;
- BOOL onOff;
- BYTE pad0;
- CARD16 pad1;
-} xMITSetBugModeReq;
-#define sz_xMITSetBugModeReq 8
-
-typedef struct _GetBugMode {
- CARD8 reqType; /* always MITReqCode */
- CARD8 mitReqType; /* always X_MITGetBugMode */
- CARD16 length B16;
-} xMITGetBugModeReq;
-#define sz_xMITGetBugModeReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL onOff;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xMITGetBugModeReply;
-#define sz_xMITGetBugModeReply 32
-
-#endif /* _MITMISCSTR_H_ */
diff --git a/nx-X11/include/extensions/multibuf.h b/nx-X11/include/extensions/multibuf.h
deleted file mode 100644
index c35399b01..000000000
--- a/nx-X11/include/extensions/multibuf.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * $Xorg: multibuf.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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/multibuf.h,v 3.4 2001/12/14 19:53:28 dawes Exp $ */
-
-#ifndef _MULTIBUF_H_
-#define _MULTIBUF_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define MULTIBUFFER_PROTOCOL_NAME "Multi-Buffering"
-
-#define MULTIBUFFER_MAJOR_VERSION 1 /* current version numbers */
-#define MULTIBUFFER_MINOR_VERSION 1 /* has ClearImageBufferArea */
-
-#define X_MbufGetBufferVersion 0
-#define X_MbufCreateImageBuffers 1
-#define X_MbufDestroyImageBuffers 2
-#define X_MbufDisplayImageBuffers 3
-#define X_MbufSetMBufferAttributes 4
-#define X_MbufGetMBufferAttributes 5
-#define X_MbufSetBufferAttributes 6
-#define X_MbufGetBufferAttributes 7
-#define X_MbufGetBufferInfo 8
-#define X_MbufCreateStereoWindow 9
-#define X_MbufClearImageBufferArea 10
-
-/*
- * update_action field
- */
-#define MultibufferUpdateActionUndefined 0
-#define MultibufferUpdateActionBackground 1
-#define MultibufferUpdateActionUntouched 2
-#define MultibufferUpdateActionCopied 3
-
-/*
- * update_hint field
- */
-#define MultibufferUpdateHintFrequent 0
-#define MultibufferUpdateHintIntermittent 1
-#define MultibufferUpdateHintStatic 2
-
-/*
- * valuemask fields
- */
-#define MultibufferWindowUpdateHint (1L << 0)
-#define MultibufferBufferEventMask (1L << 0)
-
-/*
- * mono vs. stereo and left vs. right
- */
-#define MultibufferModeMono 0
-#define MultibufferModeStereo 1
-#define MultibufferSideMono 0
-#define MultibufferSideLeft 1
-#define MultibufferSideRight 2
-
-/*
- * clobber state
- */
-#define MultibufferUnclobbered 0
-#define MultibufferPartiallyClobbered 1
-#define MultibufferFullyClobbered 2
-
-/*
- * event stuff
- */
-#define MultibufferClobberNotifyMask 0x02000000
-#define MultibufferUpdateNotifyMask 0x04000000
-
-#define MultibufferClobberNotify 0
-#define MultibufferUpdateNotify 1
-#define MultibufferNumberEvents (MultibufferUpdateNotify + 1)
-
-#define MultibufferBadBuffer 0
-#define MultibufferNumberErrors (MultibufferBadBuffer + 1)
-
-
-#ifndef _MULTIBUF_SERVER_
-/*
- * Extra definitions that will only be needed in the client
- */
-typedef XID Multibuffer;
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- int send_event; /* true if this came frome a SendEvent request */
- Display *display; /* Display the event was read from */
- Multibuffer buffer; /* buffer of event */
- int state; /* see Clobbered constants above */
-} XmbufClobberNotifyEvent;
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- int send_event; /* true if this came frome a SendEvent request */
- Display *display; /* Display the event was read from */
- Multibuffer buffer; /* buffer of event */
-} XmbufUpdateNotifyEvent;
-
-
-/*
- * per-window attributes that can be got
- */
-typedef struct {
- int displayed_index; /* which buffer is being displayed */
- int update_action; /* Undefined, Background, Untouched, Copied */
- int update_hint; /* Frequent, Intermittent, Static */
- int window_mode; /* Mono, Stereo */
- int nbuffers; /* Number of buffers */
- Multibuffer *buffers; /* Buffers */
-} XmbufWindowAttributes;
-
-/*
- * per-window attributes that can be set
- */
-typedef struct {
- int update_hint; /* Frequent, Intermittent, Static */
-} XmbufSetWindowAttributes;
-
-
-/*
- * per-buffer attributes that can be got
- */
-typedef struct {
- Window window; /* which window this belongs to */
- unsigned long event_mask; /* events that have been selected */
- int buffer_index; /* which buffer is this */
- int side; /* Mono, Left, Right */
-} XmbufBufferAttributes;
-
-/*
- * per-buffer attributes that can be set
- */
-typedef struct {
- unsigned long event_mask; /* events that have been selected */
-} XmbufSetBufferAttributes;
-
-
-/*
- * per-screen buffer info (there will be lists of them)
- */
-typedef struct {
- VisualID visualid; /* visual usuable at this depth */
- int max_buffers; /* most buffers for this visual */
- int depth; /* depth of buffers to be created */
-} XmbufBufferInfo;
-
-_XFUNCPROTOBEGIN
-
-extern Bool XmbufQueryExtension(
- Display* /* dpy */,
- int* /* event_base_return */,
- int* /* error_base_return */
-);
-
-extern Status XmbufGetVersion(
- Display* /* dpy */,
- int* /* major_version_return */,
- int* /* minor_version_return */
-);
-
-extern int XmbufCreateBuffers(
- Display* /* dpy */,
- Window /* w */,
- int /* count */,
- int /* update_action */,
- int /* update_hint */,
- Multibuffer* /* buffers */
-);
-
-extern void XmbufDestroyBuffers(
- Display* /* dpy */,
- Window /* window */
-);
-
-extern void XmbufDisplayBuffers(
- Display* /* dpy */,
- int /* count */,
- Multibuffer* /* buffers */,
- int /* min_delay */,
- int /* max_delay */
-);
-
-extern Status XmbufGetWindowAttributes(
- Display* /* dpy */,
- Window /* w */,
- XmbufWindowAttributes* /* attr */
-);
-
-extern void XmbufChangeWindowAttributes(
- Display* /* dpy */,
- Window /* w */,
- unsigned long /* valuemask */,
- XmbufSetWindowAttributes* /* attr */
-);
-
-extern Status XmbufGetBufferAttributes(
- Display* /* dpy */,
- Multibuffer /* b */,
- XmbufBufferAttributes* /* attr */
-);
-
-extern void XmbufChangeBufferAttributes(
- Display* /* dpy */,
- Multibuffer /* b */,
- unsigned long /* valuemask */,
- XmbufSetBufferAttributes* /* attr */
-);
-
-extern Status XmbufGetScreenInfo(
- Display* /* dpy */,
- Drawable /* d */,
- int* /* nmono_return */,
- XmbufBufferInfo** /* mono_info_return */,
- int* /* nstereo_return */,
- XmbufBufferInfo** /* stereo_info_return */
-);
-
-extern Window XmbufCreateStereoWindow(
- Display* /* dpy */,
- Window /* parent */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* border_width */,
- int /* depth */,
- unsigned int /* class */,
- Visual* /* visual */,
- unsigned long /* valuemask */,
- XSetWindowAttributes* /* attr */,
- Multibuffer* /* leftp */,
- Multibuffer* /* rightp */
-);
-
-extern void XmbufClearBufferArea(
- Display* /* dpy */,
- Multibuffer /* buffer */,
- int /* x */,
- int /* y */,
- unsigned int /* width */,
- unsigned int /* height */,
- Bool /* exposures */
-);
-
-_XFUNCPROTOEND
-
-#else
-
-#include "scrnintstr.h"
-
-typedef Bool (* mbInitFunc)();
-
-struct _mbufScreen; /* declared in multibufst.h */
-
-extern void RegisterMultibufferInit(
- ScreenPtr /* pScreen */,
- Bool (* /* bufMultibufferInit */)(
- ScreenPtr /* pScreen */,
- struct _mbufScreen * /* pMBScreen */
- )
-);
-
-struct xMbufBufferInfo; /* declared in multibufst.h */
-
-extern void RegisterDoubleBufferHardware(
- ScreenPtr /* pScreen */,
- int /* nInfo */,
- struct xMbufBufferInfo * /* pInfo */,
- DevUnion * /* frameBuffer */,
- DevUnion /* selectPlane */,
- void (* /* CopyBufferBitsFunc */ )(),
- void (* /* DrawSelectPlaneFunc */ )()
-);
-
-extern int CreateImageBuffers (
- WindowPtr /* pWin */,
- int /* nbuf */,
- XID * /* ids */,
- int /* action */,
- int /* hint */
-);
-extern void DestroyImageBuffers (
- WindowPtr /* pWin */
-);
-extern int DisplayImageBuffers (
- XID * /* ids */,
- int /* nbuf */
-);
-
-#endif /* _MULTIBUF_SERVER_ */
-#endif /* _MULTIBUF_H_ */
diff --git a/nx-X11/include/extensions/multibufst.h b/nx-X11/include/extensions/multibufst.h
deleted file mode 100644
index 8469a16db..000000000
--- a/nx-X11/include/extensions/multibufst.h
+++ /dev/null
@@ -1,609 +0,0 @@
-/*
- * $Xorg: multibufst.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $
- *
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-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/multibufst.h,v 3.8 2001/12/19 21:37:29 dawes Exp $ */
-
-#ifndef _MULTIBUFST_H_
-#define _MULTIBUFST_H_
-
-/*
- * Protocol requests constants and alignment values
- */
-
-#include "multibuf.h"
-#ifdef _MULTIBUF_SERVER_
-#include "inputstr.h"
-#endif
-
-#if !defined(UNIXCPP) || defined(ANSICPP)
-#define MbufGetReq(name,req,info) GetReq (name, req); \
- req->reqType = info->codes->major_opcode; \
- req->mbufReqType = X_##name;
-#else
-#define MbufGetReq(name,req,info) GetReq (name, req); \
- req->reqType = info->codes->major_opcode; \
- req->mbufReqType = X_/**/name;
-#endif
-
-#define Window CARD32
-#define Drawable CARD32
-#define VisualID CARD32
-#define Multibuffer CARD32
-
-typedef struct xMbufBufferInfo {
- CARD32 visualID B32; /* associated visual */
- CARD16 maxBuffers B16; /* maximum supported buffers */
- CARD8 depth; /* depth of visual (redundant) */
- CARD8 unused;
-} xMbufBufferInfo;
-#define sz_xMbufBufferInfo 8
-
-typedef struct {
- BYTE type;
- BYTE unused;
- CARD16 sequenceNumber B16;
- CARD32 buffer B32; /* affected buffer */
- BYTE state; /* current status */
- CARD8 unused1;
- CARD16 unused2 B16;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
- CARD32 unused7 B32;
-} xMbufClobberNotifyEvent;
-
-typedef struct {
- BYTE type;
- BYTE unused;
- CARD16 sequenceNumber B16;
- CARD32 buffer B32; /* affected buffer */
- CARD32 timeStamp B32; /* update time */
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
-} xMbufUpdateNotifyEvent;
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufGetBufferVersion */
- CARD16 length B16;
-} xMbufGetBufferVersionReq;
-#define sz_xMbufGetBufferVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD8 majorVersion; /* major version of Multi-Buffering protocol */
- CARD8 minorVersion; /* minor version of Multi-Buffering protocol */
- CARD16 pad1 B16;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xMbufGetBufferVersionReply;
-#define sz_xMbufGetBufferVersionReply 32
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufCreateImageBuffers */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
- CARD8 updateAction; /* action at update */
- CARD8 updateHint; /* hint as to frequency of updates */
- CARD16 unused;
-} xMbufCreateImageBuffersReq; /* followed by buffer ids */
-#define sz_xMbufCreateImageBuffersReq 12
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 numberBuffer B16; /* number successfully allocated */
- CARD16 unused1 B16;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
- CARD32 unused6 B32;
-} xMbufCreateImageBuffersReply;
-#define sz_xMbufCreateImageBuffersReply 32
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufDestroyImageBuffers */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
-} xMbufDestroyImageBuffersReq;
-#define sz_xMbufDestroyImageBuffersReq 8
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufDisplayImageBuffers */
- CARD16 length B16;
- CARD16 minDelay B16; /* minimum time between last update and now */
- CARD16 maxDelay B16; /* maximum time between last update and now */
-} xMbufDisplayImageBuffersReq; /* followed by list of buffers */
-#define sz_xMbufDisplayImageBuffersReq 8
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufSetMBufferAttributes */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
- CARD32 valueMask B32; /* modified entries */
-} xMbufSetMBufferAttributesReq; /* followed by values */
-#define sz_xMbufSetMBufferAttributesReq 12
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufGetMBufferAttributes */
- CARD16 length B16;
- CARD32 window B32; /* associated window */
-} xMbufGetMBufferAttributesReq;
-#define sz_xMbufGetMBufferAttributesReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 displayedBuffer B16; /* currently visible buffer */
- CARD8 updateAction;
- CARD8 updateHint;
- CARD8 windowMode;
- CARD8 unused0;
- CARD16 unused1 B16;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
-} xMbufGetMBufferAttributesReply;
-#define sz_xMbufGetMBufferAttributesReply 32
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufSetBufferAttributes */
- CARD16 length B16;
- CARD32 buffer B32;
- CARD32 valueMask B32;
-} xMbufSetBufferAttributesReq; /* followed by values */
-#define sz_xMbufSetBufferAttributesReq 12
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufGetBufferAttributes */
- CARD16 length B16;
- CARD32 buffer B32;
-} xMbufGetBufferAttributesReq;
-#define sz_xMbufGetBufferAttributesReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 window B32;
- CARD32 eventMask B32;
- CARD16 bufferIndex B16;
- CARD8 side;
- CARD8 unused0;
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
-} xMbufGetBufferAttributesReply;
-#define sz_xMbufGetBufferAttributesReply 32
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufGetBufferInfo */
- CARD16 length B16;
- Drawable drawable B32;
-} xMbufGetBufferInfoReq;
-#define sz_xMbufGetBufferInfoReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- CARD8 unused; /* not used */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 normalInfo B16;
- CARD16 stereoInfo B16;
- CARD32 unused1 B32;
- CARD32 unused2 B32;
- CARD32 unused3 B32;
- CARD32 unused4 B32;
- CARD32 unused5 B32;
-} xMbufGetBufferInfoReply; /* followed by buffer infos */
-#define sz_xMbufGetBufferInfoReply 32
-
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufCreateStereoWindow */
- CARD16 length B16;
- CARD8 unused0;
- CARD8 unused1;
- CARD8 unused2;
- CARD8 depth;
- Window wid B32;
- Window parent B32;
- Multibuffer left B32; /* associated buffers */
- Multibuffer right B32;
- INT16 x B16;
- INT16 y B16;
- 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 */
-#define sz_xMbufCreateStereoWindowReq 44
-
-typedef struct {
- CARD8 reqType; /* always codes->major_opcode */
- CARD8 mbufReqType; /* always X_MbufClearImageBufferArea */
- CARD16 length B16;
- Multibuffer buffer B32;
- INT16 x B16;
- INT16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD8 unused0;
- CARD8 unused1;
- CARD8 unused2;
- BOOL exposures;
-} xMbufClearImageBufferAreaReq;
-#define sz_xMbufClearImageBufferAreaReq 20
-
-#undef Window
-#undef Drawable
-#undef VisualID
-#undef Multibuffer
-
-
-#ifdef _MULTIBUF_SERVER_
-/* Macros for wrapping and unwrapping functions */
-
-#define SWAP_FUNC_VECTOR(pSTRUCT1,pSTRUCT2,DATA_TYPE,FUNC_NAME) \
-{ \
- DATA_TYPE (* tmpFn)(); \
- \
- tmpFn = pSTRUCT1->FUNC_NAME; \
- pSTRUCT1->FUNC_NAME = pSTRUCT2->FUNC_NAME; \
- pSTRUCT2->FUNC_NAME = tmpFn; \
-}
-
-#if !defined(UNIXCPP) || defined(ANSICPP)
-#define WRAP_SCREEN_FUNC(pSCREEN,pPRIV,FUNC_NAME, PRIV_FUNC_NAME) \
-{ \
- if ((pPRIV->funcsWrapped & FUNC_NAME##Mask) == 0) \
- { \
- pPRIV->FUNC_NAME = pSCREEN->FUNC_NAME; \
- pSCREEN->FUNC_NAME = PRIV_FUNC_NAME; \
- pPRIV->funcsWrapped |= FUNC_NAME##Mask; \
- } \
-}
-
-#define UNWRAP_SCREEN_FUNC(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME) \
-{ \
- SWAP_FUNC_VECTOR(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME); \
- pPRIV->funcsWrapped &= ~(FUNC_NAME##Mask); \
-}
-
-#define REWRAP_SCREEN_FUNC(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME) \
-{ \
- if (MB_SCREEN_PRIV(pSCREEN)->mbufWindowCount) \
- { \
- SWAP_FUNC_VECTOR(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME); \
- pPRIV->funcsWrapped |= FUNC_NAME##Mask; \
- } \
-}
-#else
-#define WRAP_SCREEN_FUNC(pSCREEN,pPRIV,FUNC_NAME, PRIV_FUNC_NAME) \
-{ \
- if ((pPRIV->funcsWrapped & FUNC_NAME/**/Mask) == 0) \
- { \
- pPRIV->FUNC_NAME = pSCREEN->FUNC_NAME; \
- pSCREEN->FUNC_NAME = PRIV_FUNC_NAME; \
- pPRIV->funcsWrapped |= FUNC_NAME/**/Mask; \
- } \
-}
-
-#define UNWRAP_SCREEN_FUNC(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME) \
-{ \
- SWAP_FUNC_VECTOR(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME); \
- pPRIV->funcsWrapped &= ~(FUNC_NAME/**/Mask); \
-}
-
-#define REWRAP_SCREEN_FUNC(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME) \
-{ \
- if (MB_SCREEN_PRIV(pSCREEN)->mbufWindowCount) \
- { \
- SWAP_FUNC_VECTOR(pSCREEN,pPRIV,DATA_TYPE,FUNC_NAME); \
- pPRIV->funcsWrapped |= FUNC_NAME/**/Mask; \
- } \
-}
-#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)
-#define PostValidateTreeMask (1L<<2)
-#define ClipNotifyMask (1L<<3)
-#define WindowExposuresMask (1L<<4)
-#define CopyWindowMask (1L<<5)
-#define ClearToBackgroundMask (1L<<6)
-#define ChangeWindowAttributesMask (1L<<7)
-
-extern int MultibufferScreenIndex;
-extern int MultibufferWindowIndex;
-
-extern RESTYPE MultibufferDrawableResType;
-
-extern void MultibufferUpdate( /* pMbuffer, time */
- MultibufferPtr /* pMultibuffer */,
- CARD32 /* time */
- );
-extern void MultibufferExpose( /* pMbuffer, pRegion */
- MultibufferPtr /* pMultibuffer */,
- RegionPtr /* pRegion */
- );
-extern void MultibufferClobber( /* pMbuffer */
- MultibufferPtr /* pMultibuffer */
- );
-
-typedef struct _mbufWindow *mbufWindowPtr;
-
-/*
- * per-buffer data
- */
-
-#define MB_DISPLAYED_BUFFER(pMBWindow) \
- ((pMBWindow)->buffers + (pMBWindow)->displayedMultibuffer)
-
-typedef struct _mbufBuffer {
- mbufWindowPtr pMBWindow; /* associated window data */
- Mask eventMask; /* client event mask */
- Mask otherEventMask; /* union of other clients' event masks */
- OtherClientsPtr otherClients; /* other clients that want events */
- int number; /* index of this buffer into array */
- int side; /* stero side: always Mono */
- int clobber; /* clober state */
- DrawablePtr pDrawable; /* associated drawable */
-} mbufBufferRec, *mbufBufferPtr;
-
-
-/*
- * per-window data
- */
-
-#define MB_WINDOW_PRIV(pWin) \
- ((mbufWindowPtr)((pWin)->devPrivates[MultibufferWindowIndex].ptr))
-
-typedef struct _mbufWindow {
- WindowPtr pWindow; /* associated window */
- int numMultibuffer; /* count of buffers */
- mbufBufferPtr buffers; /* array of (numMultibuffer) buffers */
- 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 */
- short x, y; /* for static gravity */
- unsigned short width, height; /* last known window size */
- DevUnion devPrivate;
-} mbufWindowRec;
-
-
-/*
- * per-screen data
- */
-
-#define MB_SCREEN_PRIV(pScreen) \
- ((mbufScreenPtr)((pScreen)->devPrivates[MultibufferScreenIndex].ptr))
-
-typedef struct _mbufScreen {
- long mbufWindowCount; /* count of multibuffered windows */
-
- /* Wrap pScreen->DestroyWindow */
- 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)(
- WindowPtr /* pWin */,
- int /* nbuf */,
- XID * /* ids */,
- int /* action */,
- int /* hint */
- );
- void (* DestroyImageBuffers)(
- WindowPtr /* pWin */
- );
- void (* DisplayImageBuffers)(
- ScreenPtr /* pScreen */,
- mbufBufferPtr * /* ppMBBuffer */,
- mbufWindowPtr * /* ppMBWindow */,
- int /* nbuf */
- );
- void (* ClearImageBufferArea)(
- mbufBufferPtr /* pMBBuffer */,
- short /* x */,
- short /* y */,
- unsigned short /* width */,
- unsigned short /* height */,
- Bool /* exposures */
- );
- Bool (* ChangeMBufferAttributes)( /* pMBWindow, vmask */
- /* FIXME */
- );
- Bool (* ChangeBufferAttributes)( /* pMBBuffer, vmask */
- /* FIXME */
- );
- void (* DeleteBufferDrawable)(
- DrawablePtr /* pDrawable */
- );
- void (* WrapScreenFuncs)(
- ScreenPtr /* pScreen */
- );
- void (* ResetProc)(
- ScreenPtr /* pScreen */
- );
- DevUnion devPrivate;
-} mbufScreenRec, *mbufScreenPtr;
-
-
-/* Privates to mbufScreenRec */
-
-#ifdef _MULTIBUF_PIXMAP_
-#define MB_SCREEN_PRIV_PIXMAP(pScreen) \
- ((mbufPixmapPrivPtr) MB_SCREEN_PRIV((pScreen))->devPrivate.ptr)
-
-typedef struct _mbufPixmapPriv
-{
- /* Pointers to wrapped functions */
- PositionWindowProcPtr PositionWindow; /* pWin, x,y */
- long funcsWrapped; /* flags which functions are wrapped */
-} mbufPixmapPrivRec, *mbufPixmapPrivPtr;
-#endif /* _MULTIBUF_PIXMAP_ */
-
-
-#ifdef _MULTIBUF_BUFFER_
-
-extern int frameWindowPrivateIndex;
-
-#define MB_SCREEN_PRIV_BUFFER(pScreen) \
- ((mbufBufferPrivPtr) MB_SCREEN_PRIV((pScreen))->devPrivate.ptr)
-
-typedef struct _mbufBufferPriv
-{
- DevUnion *frameBuffer; /* Array of screen framebuffers */
- DevUnion selectPlane; /* Plane(s) that select displayed buffer */
-
- /*
- * Note: subtractRgn and unionRgn may overlap. subtractRgn is a union
- * of all the old clipLists of the windows that are displaying
- * the backbuffer. unionRgn is the union of all the new clipLists
- * of the same windows.
- */
-
- RegionRec backBuffer; /* Area of screen displaying back buffer */
- RegionRec subtractRgn; /* Regions lost to backBuffer */
- RegionRec unionRgn; /* Regions gained by backBuffer */
- Bool rgnChanged; /* TRUE if "backBuffer" needs to be updated */
-
- void (* CopyBufferBits)(); /* pMBWindow, srcBufferNum, dstBufferNum */
- void (* DrawSelectPlane)(); /* pScreen, selectPlane, pRegion, bufferNum */
-
- /* Pointers to wrapped functions */
- PostValidateTreeProcPtr PostValidateTree; /* pParent, pChild, kind */
- ClipNotifyProcPtr ClipNotify; /* pWin, dx, dy */
- WindowExposuresProcPtr WindowExposures; /* pWin, pRegion */
- CopyWindowProcPtr CopyWindow; /* pWin, oldPt, pOldRegion */
- ClearToBackgroundProcPtr ClearToBackground; /* pWin, x,y,w,h, sendExpose */
- ChangeWindowAttributesProcPtr ChangeWindowAttributes; /* pWin, vmask */
- long funcsWrapped; /* flags which functions are wrapped */
- unsigned inClearToBackground:1; /* used by WindowExposure */
-} mbufBufferPrivRec, *mbufBufferPrivPtr;
-#endif /* _MULTIBUF_BUFFER_ */
-
-#endif /* _MULTIBUF_SERVER_ */
-#endif /* _MULTIBUFST_H_ */
diff --git a/nx-X11/include/extensions/security.h b/nx-X11/include/extensions/security.h
index a0aabaf8e..b37d175bd 100644
--- a/nx-X11/include/extensions/security.h
+++ b/nx-X11/include/extensions/security.h
@@ -157,10 +157,6 @@ 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 */
diff --git a/nx-X11/include/extensions/xf86dga.h b/nx-X11/include/extensions/xf86dga.h
deleted file mode 100644
index d6e494158..000000000
--- a/nx-X11/include/extensions/xf86dga.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- Copyright (c) 1999 XFree86 Inc
-*/
-/* $XFree86: xc/include/extensions/xf86dga.h,v 3.20 1999/10/13 04:20:48 dawes Exp $ */
-
-#ifndef _XF86DGA_H_
-#define _XF86DGA_H_
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/extensions/xf86dga1.h>
-
-#define X_XDGAQueryVersion 0
-
-/* 1 through 9 are in xf86dga1.h */
-
-/* 10 and 11 are reserved to avoid conflicts with rogue DGA extensions */
-
-#define X_XDGAQueryModes 12
-#define X_XDGASetMode 13
-#define X_XDGASetViewport 14
-#define X_XDGAInstallColormap 15
-#define X_XDGASelectInput 16
-#define X_XDGAFillRectangle 17
-#define X_XDGACopyArea 18
-#define X_XDGACopyTransparentArea 19
-#define X_XDGAGetViewportStatus 20
-#define X_XDGASync 21
-#define X_XDGAOpenFramebuffer 22
-#define X_XDGACloseFramebuffer 23
-#define X_XDGASetClientVersion 24
-#define X_XDGAChangePixmapMode 25
-#define X_XDGACreateColormap 26
-
-
-#define XDGAConcurrentAccess 0x00000001
-#define XDGASolidFillRect 0x00000002
-#define XDGABlitRect 0x00000004
-#define XDGABlitTransRect 0x00000008
-#define XDGAPixmap 0x00000010
-
-#define XDGAInterlaced 0x00010000
-#define XDGADoublescan 0x00020000
-
-#define XDGAFlipImmediate 0x00000001
-#define XDGAFlipRetrace 0x00000002
-
-#define XDGANeedRoot 0x00000001
-
-#define XF86DGANumberEvents 7
-
-#define XDGAPixmapModeLarge 0
-#define XDGAPixmapModeSmall 1
-
-#define XF86DGAClientNotLocal 0
-#define XF86DGANoDirectVideoMode 1
-#define XF86DGAScreenNotActive 2
-#define XF86DGADirectNotActivated 3
-#define XF86DGAOperationNotSupported 4
-#define XF86DGANumberErrors (XF86DGAOperationNotSupported + 1)
-
-
-typedef struct {
- int num; /* A unique identifier for the mode (num > 0) */
- char *name; /* name of mode given in the XF86Config */
- float verticalRefresh;
- int flags; /* DGA_CONCURRENT_ACCESS, etc... */
- int imageWidth; /* linear accessible portion (pixels) */
- int imageHeight;
- int pixmapWidth; /* Xlib accessible portion (pixels) */
- int pixmapHeight; /* both fields ignored if no concurrent access */
- int bytesPerScanline;
- int byteOrder; /* MSBFirst, LSBFirst */
- int depth;
- int bitsPerPixel;
- unsigned long redMask;
- unsigned long greenMask;
- unsigned long blueMask;
- short visualClass;
- int viewportWidth;
- int viewportHeight;
- int xViewportStep; /* viewport position granularity */
- int yViewportStep;
- int maxViewportX; /* max viewport origin */
- int maxViewportY;
- int viewportFlags; /* types of page flipping possible */
- int reserved1;
- int reserved2;
-} XDGAMode;
-
-
-typedef struct {
- XDGAMode mode;
- unsigned char *data;
- Pixmap pixmap;
-} XDGADevice;
-
-
-#ifndef _XF86DGA_SERVER_
-_XFUNCPROTOBEGIN
-
-typedef struct {
- int type;
- unsigned long serial;
- Display *display;
- int screen;
- Time time;
- unsigned int state;
- unsigned int button;
-} XDGAButtonEvent;
-
-typedef struct {
- int type;
- unsigned long serial;
- Display *display;
- int screen;
- Time time;
- unsigned int state;
- unsigned int keycode;
-} XDGAKeyEvent;
-
-typedef struct {
- int type;
- unsigned long serial;
- Display *display;
- int screen;
- Time time;
- unsigned int state;
- int dx;
- int dy;
-} XDGAMotionEvent;
-
-typedef union {
- int type;
- XDGAButtonEvent xbutton;
- XDGAKeyEvent xkey;
- XDGAMotionEvent xmotion;
- long pad[24];
-} XDGAEvent;
-
-Bool XDGAQueryExtension(
- Display *dpy,
- int *eventBase,
- int *erroBase
-);
-
-Bool XDGAQueryVersion(
- Display *dpy,
- int *majorVersion,
- int *minorVersion
-);
-
-XDGAMode* XDGAQueryModes(
- Display *dpy,
- int screen,
- int *num
-);
-
-XDGADevice* XDGASetMode(
- Display *dpy,
- int screen,
- int mode
-);
-
-Bool XDGAOpenFramebuffer(
- Display *dpy,
- int screen
-);
-
-void XDGACloseFramebuffer(
- Display *dpy,
- int screen
-);
-
-void XDGASetViewport(
- Display *dpy,
- int screen,
- int x,
- int y,
- int flags
-);
-
-void XDGAInstallColormap(
- Display *dpy,
- int screen,
- Colormap cmap
-);
-
-Colormap XDGACreateColormap(
- Display *dpy,
- int screen,
- XDGADevice *device,
- int alloc
-);
-
-void XDGASelectInput(
- Display *dpy,
- int screen,
- long event_mask
-);
-
-void XDGAFillRectangle(
- Display *dpy,
- int screen,
- int x,
- int y,
- unsigned int width,
- unsigned int height,
- unsigned long color
-);
-
-
-void XDGACopyArea(
- Display *dpy,
- int screen,
- int srcx,
- int srcy,
- unsigned int width,
- unsigned int height,
- int dstx,
- int dsty
-);
-
-
-void XDGACopyTransparentArea(
- Display *dpy,
- int screen,
- int srcx,
- int srcy,
- unsigned int width,
- unsigned int height,
- int dstx,
- int dsty,
- unsigned long key
-);
-
-int XDGAGetViewportStatus(
- Display *dpy,
- int screen
-);
-
-void XDGASync(
- Display *dpy,
- int screen
-);
-
-Bool XDGASetClientVersion(
- Display *dpy
-);
-
-void XDGAChangePixmapMode(
- Display *dpy,
- int screen,
- int *x,
- int *y,
- int mode
-);
-
-
-void XDGAKeyEventToXKeyEvent(XDGAKeyEvent* dk, XKeyEvent* xk);
-
-
-_XFUNCPROTOEND
-#endif /* _XF86DGA_SERVER_ */
-#endif /* _XF86DGA_H_ */
diff --git a/nx-X11/include/extensions/xf86dga1.h b/nx-X11/include/extensions/xf86dga1.h
deleted file mode 100644
index 972b18e9e..000000000
--- a/nx-X11/include/extensions/xf86dga1.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86dga1.h,v 1.2 1999/04/17 07:05:41 dawes Exp $ */
-/*
-
-Copyright (c) 1995 Jon Tombs
-Copyright (c) 1995 XFree86 Inc
-
-*/
-
-/************************************************************************
-
- THIS IS THE OLD DGA API AND IS OBSOLETE. PLEASE DO NOT USE IT ANYMORE
-
-************************************************************************/
-
-#ifndef _XF86DGA1_H_
-#define _XF86DGA1_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define X_XF86DGAQueryVersion 0
-#define X_XF86DGAGetVideoLL 1
-#define X_XF86DGADirectVideo 2
-#define X_XF86DGAGetViewPortSize 3
-#define X_XF86DGASetViewPort 4
-#define X_XF86DGAGetVidPage 5
-#define X_XF86DGASetVidPage 6
-#define X_XF86DGAInstallColormap 7
-#define X_XF86DGAQueryDirectVideo 8
-#define X_XF86DGAViewPortChanged 9
-
-#define XF86DGADirectPresent 0x0001
-#define XF86DGADirectGraphics 0x0002
-#define XF86DGADirectMouse 0x0004
-#define XF86DGADirectKeyb 0x0008
-#define XF86DGAHasColormap 0x0100
-#define XF86DGADirectColormap 0x0200
-
-
-
-
-#ifndef _XF86DGA_SERVER_
-
-_XFUNCPROTOBEGIN
-
-Bool XF86DGAQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool XF86DGAQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Status XF86DGAGetVideoLL(
- Display* /* dpy */,
- int /* screen */,
- int * /* base addr */,
- int * /* width */,
- int * /* bank_size */,
- int * /* ram_size */
-);
-
-Status XF86DGAGetVideo(
- Display* /* dpy */,
- int /* screen */,
- char ** /* base addr */,
- int * /* width */,
- int * /* bank_size */,
- int * /* ram_size */
-);
-
-Status XF86DGADirectVideo(
- Display* /* dpy */,
- int /* screen */,
- int /* enable */
-);
-
-Status XF86DGADirectVideoLL(
- Display* /* dpy */,
- int /* screen */,
- int /* enable */
-);
-
-Status XF86DGAGetViewPortSize(
- Display* /* dpy */,
- int /* screen */,
- int * /* width */,
- int * /* height */
-);
-
-Status XF86DGASetViewPort(
- Display* /* dpy */,
- int /* screen */,
- int x /* X */,
- int y /* Y */
-);
-
-Status XF86DGAGetVidPage(
- Display* /* dpy */,
- int /* screen */,
- int * /* vid page */
-);
-
-Status XF86DGASetVidPage(
- Display* /* dpy */,
- int /* screen */,
- int /* vid page */
-);
-
-Status XF86DGAInstallColormap(
- Display* /* dpy */,
- int /* screen */,
- Colormap /*Colormap */
-);
-
-int XF86DGAForkApp(
- int screen
-);
-
-Status XF86DGAQueryDirectVideo(
- Display * /* dpy */,
- int /* screen */,
- int * /* flags */
-);
-
-Bool XF86DGAViewPortChanged(
- Display * /* dpy */,
- int /* screen */,
- int /* n */
-);
-
-
-_XFUNCPROTOEND
-
-#endif /* _XF86DGA_SERVER_ */
-
-#endif /* _XF86DGA1_H_ */
diff --git a/nx-X11/include/extensions/xf86dga1str.h b/nx-X11/include/extensions/xf86dga1str.h
deleted file mode 100644
index 0dfde9bc2..000000000
--- a/nx-X11/include/extensions/xf86dga1str.h
+++ /dev/null
@@ -1,194 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86dga1str.h,v 1.1 1999/03/28 15:31:33 dawes Exp $ */
-/*
-
-Copyright (c) 1995 Jon Tombs
-Copyright (c) 1995 XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR1_H_
-#define _XF86DGASTR1_H_
-
-typedef struct _XF86DGAQueryVersion {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
-} xXF86DGAQueryVersionReq;
-#define sz_xXF86DGAQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of DGA protocol */
- CARD16 minorVersion B16; /* minor version of DGA protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86DGAQueryVersionReply;
-#define sz_xXF86DGAQueryVersionReply 32
-
-typedef struct _XF86DGAGetVideoLL {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGAGetVideoLL */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86DGAGetVideoLLReq;
-#define sz_xXF86DGAGetVideoLLReq 8
-
-typedef struct _XF86DGAInstallColormap{
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad2;
- CARD32 id B32; /* colormap. */
-} xXF86DGAInstallColormapReq;
-#define sz_xXF86DGAInstallColormapReq 12
-
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32;
- CARD32 width B32;
- CARD32 bank_size B32;
- CARD32 ram_size B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86DGAGetVideoLLReply;
-#define sz_xXF86DGAGetVideoLLReply 32
-
-typedef struct _XF86DGADirectVideo {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGADirectVideo */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 enable B16;
-} xXF86DGADirectVideoReq;
-#define sz_xXF86DGADirectVideoReq 8
-
-
-typedef struct _XF86DGAGetViewPortSize {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGAGetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86DGAGetViewPortSizeReq;
-#define sz_xXF86DGAGetViewPortSizeReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 width B32;
- CARD32 height B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86DGAGetViewPortSizeReply;
-#define sz_xXF86DGAGetViewPortSizeReply 32
-
-typedef struct _XF86DGASetViewPort {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGASetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 x B32;
- CARD32 y B32;
-} xXF86DGASetViewPortReq;
-#define sz_xXF86DGASetViewPortReq 16
-
-typedef struct _XF86DGAGetVidPage {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGAGetVidPage */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86DGAGetVidPageReq;
-#define sz_xXF86DGAGetVidPageReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 vpage B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86DGAGetVidPageReply;
-#define sz_xXF86DGAGetVidPageReply 32
-
-
-typedef struct _XF86DGASetVidPage {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_XF86DGASetVidPage */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 vpage B16;
-} xXF86DGASetVidPageReq;
-#define sz_xXF86DGASetVidPageReq 8
-
-
-typedef struct _XF86DGAQueryDirectVideo {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86DGAQueryDirectVideoReq;
-#define sz_xXF86DGAQueryDirectVideoReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 flags B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86DGAQueryDirectVideoReply;
-#define sz_xXF86DGAQueryDirectVideoReply 32
-
-
-typedef struct _XF86DGAViewPortChanged {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 n B16;
-} xXF86DGAViewPortChangedReq;
-#define sz_xXF86DGAViewPortChangedReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 result B32;
- CARD32 pad B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86DGAViewPortChangedReply;
-#define sz_xXF86DGAViewPortChangedReply 32
-
-#endif /* _XF86DGASTR1_H_ */
-
diff --git a/nx-X11/include/extensions/xf86dgastr.h b/nx-X11/include/extensions/xf86dgastr.h
deleted file mode 100644
index 30e4ff722..000000000
--- a/nx-X11/include/extensions/xf86dgastr.h
+++ /dev/null
@@ -1,344 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86dgastr.h,v 3.13 2000/12/20 00:19:41 mvojkovi Exp $ */
-/*
-
-Copyright (c) 1995 Jon Tombs
-Copyright (c) 1995 XFree86 Inc.
-
-*/
-
-#ifndef _XF86DGASTR_H_
-#define _XF86DGASTR_H_
-
-#include <nx-X11/extensions/xf86dga1str.h>
-
-#define XF86DGANAME "XFree86-DGA"
-
-#define XDGA_MAJOR_VERSION 2 /* current version numbers */
-#define XDGA_MINOR_VERSION 0
-
-
-typedef struct _XDGAQueryVersion {
- CARD8 reqType; /* always DGAReqCode */
- CARD8 dgaReqType; /* always X_DGAQueryVersion */
- CARD16 length B16;
-} xXDGAQueryVersionReq;
-#define sz_xXDGAQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of DGA protocol */
- CARD16 minorVersion B16; /* minor version of DGA protocol */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXDGAQueryVersionReply;
-#define sz_xXDGAQueryVersionReply 32
-
-typedef struct _XDGAQueryModes {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXDGAQueryModesReq;
-#define sz_xXDGAQueryModesReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 number B32; /* number of modes available */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXDGAQueryModesReply;
-#define sz_xXDGAQueryModesReply 32
-
-
-typedef struct _XDGASetMode {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 mode B32; /* mode number to init */
- CARD32 pid B32; /* Pixmap descriptor */
-} xXDGASetModeReq;
-#define sz_xXDGASetModeReq 16
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 offset B32; /* offset into framebuffer map */
- CARD32 flags B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXDGASetModeReply;
-#define sz_xXDGASetModeReply 32
-
-typedef struct {
- CARD8 byte_order;
- CARD8 depth;
- CARD16 num B16;
- CARD16 bpp B16;
- CARD16 name_size B16;
- CARD32 vsync_num B32;
- CARD32 vsync_den B32;
- CARD32 flags B32;
- CARD16 image_width B16;
- CARD16 image_height B16;
- CARD16 pixmap_width B16;
- CARD16 pixmap_height B16;
- CARD32 bytes_per_scanline B32;
- CARD32 red_mask B32;
- CARD32 green_mask B32;
- CARD32 blue_mask B32;
- CARD16 visual_class B16;
- CARD16 pad1 B16;
- CARD16 viewport_width B16;
- CARD16 viewport_height B16;
- CARD16 viewport_xstep B16;
- CARD16 viewport_ystep B16;
- CARD16 viewport_xmax B16;
- CARD16 viewport_ymax B16;
- CARD32 viewport_flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
-} xXDGAModeInfo;
-#define sz_xXDGAModeInfo 72
-
-typedef struct _XDGAOpenFramebuffer {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXDGAOpenFramebufferReq;
-#define sz_xXDGAOpenFramebufferReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32; /* device name size if there is one */
- CARD32 mem1 B32; /* physical memory */
- CARD32 mem2 B32; /* spillover for _alpha_ */
- CARD32 size B32; /* size of map in bytes */
- CARD32 offset B32; /* optional offset into device */
- CARD32 extra B32; /* extra info associated with the map */
- CARD32 pad2 B32;
-} xXDGAOpenFramebufferReply;
-#define sz_xXDGAOpenFramebufferReply 32
-
-
-typedef struct _XDGACloseFramebuffer {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXDGACloseFramebufferReq;
-#define sz_xXDGACloseFramebufferReq 8
-
-
-typedef struct _XDGASetViewport {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 flags B32;
-} xXDGASetViewportReq;
-#define sz_xXDGASetViewportReq 16
-
-
-typedef struct _XDGAInstallColormap {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 cmap B32;
-} xXDGAInstallColormapReq;
-#define sz_xXDGAInstallColormapReq 12
-
-typedef struct _XDGASelectInput {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 mask B32;
-} xXDGASelectInputReq;
-#define sz_xXDGASelectInputReq 12
-
-typedef struct _XDGAFillRectangle {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD32 color B32;
-} xXDGAFillRectangleReq;
-#define sz_xXDGAFillRectangleReq 20
-
-
-typedef struct _XDGACopyArea {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 srcx B16;
- CARD16 srcy B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 dstx B16;
- CARD16 dsty B16;
-} xXDGACopyAreaReq;
-#define sz_xXDGACopyAreaReq 20
-
-typedef struct _XDGACopyTransparentArea {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 srcx B16;
- CARD16 srcy B16;
- CARD16 width B16;
- CARD16 height B16;
- CARD16 dstx B16;
- CARD16 dsty B16;
- CARD32 key B32;
-} xXDGACopyTransparentAreaReq;
-#define sz_xXDGACopyTransparentAreaReq 24
-
-
-typedef struct _XDGAGetViewportStatus {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXDGAGetViewportStatusReq;
-#define sz_xXDGAGetViewportStatusReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXDGAGetViewportStatusReply;
-#define sz_xXDGAGetViewportStatusReply 32
-
-typedef struct _XDGASync {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
-} xXDGASyncReq;
-#define sz_xXDGASyncReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXDGASyncReply;
-#define sz_xXDGASyncReply 32
-
-typedef struct _XDGASetClientVersion {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
-} xXDGASetClientVersionReq;
-#define sz_xXDGASetClientVersionReq 8
-
-
-typedef struct {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 flags B32;
-} xXDGAChangePixmapModeReq;
-#define sz_xXDGAChangePixmapModeReq 16
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 x B16;
- CARD16 y B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
- CARD32 pad7 B32;
-} xXDGAChangePixmapModeReply;
-#define sz_xXDGAChangePixmapModeReply 32
-
-typedef struct _XDGACreateColormap {
- CARD8 reqType;
- CARD8 dgaReqType;
- CARD16 length B16;
- CARD32 screen B32;
- CARD32 id B32;
- CARD32 mode B32;
- CARD8 alloc;
- CARD8 pad1;
- CARD16 pad2;
-} xXDGACreateColormapReq;
-#define sz_xXDGACreateColormapReq 20
-
-
-typedef struct {
- union {
- struct {
- BYTE type;
- BYTE detail;
- CARD16 sequenceNumber B16;
- } u;
- struct {
- CARD32 pad0 B32;
- CARD32 time B32;
- INT16 dx B16;
- INT16 dy B16;
- INT16 screen B16;
- CARD16 state B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- } event;
- } u;
-} dgaEvent;
-
-
-#endif /* _XF86DGASTR_H_ */
-
diff --git a/nx-X11/include/extensions/xf86misc.h b/nx-X11/include/extensions/xf86misc.h
deleted file mode 100644
index fb01a6357..000000000
--- a/nx-X11/include/extensions/xf86misc.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86misc.h,v 3.16 2002/11/20 04:04:56 dawes Exp $ */
-
-/*
- * Copyright (c) 1995, 1996 The XFree86 Project, Inc
- */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _XF86MISC_H_
-#define _XF86MISC_H_
-
-#include <nx-X11/Xfuncproto.h>
-
-#define X_XF86MiscQueryVersion 0
-#ifdef _XF86MISC_SAVER_COMPAT_
-#define X_XF86MiscGetSaver 1
-#define X_XF86MiscSetSaver 2
-#endif
-#define X_XF86MiscGetMouseSettings 3
-#define X_XF86MiscGetKbdSettings 4
-#define X_XF86MiscSetMouseSettings 5
-#define X_XF86MiscSetKbdSettings 6
-#define X_XF86MiscSetGrabKeysState 7
-#define X_XF86MiscSetClientVersion 8
-#define X_XF86MiscGetFilePaths 9
-#define X_XF86MiscPassMessage 10
-
-#define XF86MiscNumberEvents 0
-
-#define XF86MiscBadMouseProtocol 0
-#define XF86MiscBadMouseBaudRate 1
-#define XF86MiscBadMouseFlags 2
-#define XF86MiscBadMouseCombo 3
-#define XF86MiscBadKbdType 4
-#define XF86MiscModInDevDisabled 5
-#define XF86MiscModInDevClientNotLocal 6
-#define XF86MiscNoModule 7
-#define XF86MiscNumberErrors (XF86MiscNoModule + 1)
-
-/* Never renumber these */
-#define MTYPE_MICROSOFT 0
-#define MTYPE_MOUSESYS 1
-#define MTYPE_MMSERIES 2
-#define MTYPE_LOGITECH 3
-#define MTYPE_BUSMOUSE 4
-#define MTYPE_LOGIMAN 5
-#define MTYPE_PS_2 6
-#define MTYPE_MMHIT 7
-#define MTYPE_GLIDEPOINT 8
-#define MTYPE_IMSERIAL 9
-#define MTYPE_THINKING 10
-#define MTYPE_IMPS2 11
-#define MTYPE_THINKINGPS2 12
-#define MTYPE_MMANPLUSPS2 13
-#define MTYPE_GLIDEPOINTPS2 14
-#define MTYPE_NETPS2 15
-#define MTYPE_NETSCROLLPS2 16
-#define MTYPE_SYSMOUSE 17
-#define MTYPE_AUTOMOUSE 18
-#define MTYPE_ACECAD 19
-#define MTYPE_EXPPS2 20
-
-#define MTYPE_XQUEUE 127
-#define MTYPE_OSMOUSE 126
-#define MTYPE_UNKNOWN 125
-
-#define KTYPE_UNKNOWN 0
-#define KTYPE_84KEY 1
-#define KTYPE_101KEY 2
-#define KTYPE_OTHER 3
-#define KTYPE_XQUEUE 4
-
-#define MF_CLEAR_DTR 1
-#define MF_CLEAR_RTS 2
-#define MF_REOPEN 128
-
-#ifndef _XF86MISC_SERVER_
-
-/* return values for XF86MiscSetGrabKeysState */
-#define MiscExtGrabStateSuccess 0 /* No errors */
-#define MiscExtGrabStateLocked 1 /* A client already requested that
- * grabs cannot be removed/killed */
-#define MiscExtGrabStateAlready 2 /* Request for enabling/disabling
- * grab removeal/kill already done */
-
-_XFUNCPROTOBEGIN
-
-typedef struct {
- char* device;
- int type;
- int baudrate;
- int samplerate;
- int resolution;
- int buttons;
- Bool emulate3buttons;
- int emulate3timeout;
- Bool chordmiddle;
- int flags;
-} XF86MiscMouseSettings;
-
-typedef struct {
- int type;
- int rate;
- int delay;
- Bool servnumlock;
-} XF86MiscKbdSettings;
-
-typedef struct {
- char* configfile;
- char* modulepath;
- char* logfile;
-} XF86MiscFilePaths;
-
-Bool XF86MiscQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool XF86MiscQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Bool XF86MiscSetClientVersion(
- Display *dpy /* dpy */
-);
-
-Status XF86MiscGetMouseSettings(
- Display* /* dpy */,
- XF86MiscMouseSettings* /* mouse info */
-);
-
-Status XF86MiscGetKbdSettings(
- Display* /* dpy */,
- XF86MiscKbdSettings* /* keyboard info */
-);
-
-Status XF86MiscSetMouseSettings(
- Display* /* dpy */,
- XF86MiscMouseSettings* /* mouse info */
-);
-
-Status XF86MiscSetKbdSettings(
- Display* /* dpy */,
- XF86MiscKbdSettings* /* keyboard info */
-);
-
-int XF86MiscSetGrabKeysState(
- Display* /* dpy */,
- Bool /* enabled */
-);
-
-Status XF86MiscGetFilePaths(
- Display* /* dpy */,
- XF86MiscFilePaths* /* file paths/locations */
-);
-
-Status XF86MiscPassMessage(
- Display* /* dpy */,
- int /* screen */,
- const char* /* message name/type */,
- const char* /* message contents/value */,
- char ** /* returned message */
-);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/nx-X11/include/extensions/xf86mscstr.h b/nx-X11/include/extensions/xf86mscstr.h
deleted file mode 100644
index 2b8c0d07e..000000000
--- a/nx-X11/include/extensions/xf86mscstr.h
+++ /dev/null
@@ -1,238 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86mscstr.h,v 3.12 2002/11/20 04:04:56 dawes Exp $ */
-
-/*
- * Copyright (c) 1995, 1996 The XFree86 Project, Inc
- */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#ifndef _XF86MISCSTR_H_
-#define _XF86MISCSTR_H_
-
-#include <nx-X11/extensions/xf86misc.h>
-
-#define XF86MISCNAME "XFree86-Misc"
-
-#define XF86MISC_MAJOR_VERSION 0 /* current version numbers */
-#define XF86MISC_MINOR_VERSION 9
-
-typedef struct _XF86MiscQueryVersion {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscQueryVersion */
- CARD16 length B16;
-} xXF86MiscQueryVersionReq;
-#define sz_xXF86MiscQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of XFree86-Misc */
- CARD16 minorVersion B16; /* minor version of XFree86-Misc */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86MiscQueryVersionReply;
-#define sz_xXF86MiscQueryVersionReply 32
-
-#ifdef _XF86MISC_SAVER_COMPAT_
-typedef struct _XF86MiscGetSaver {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscGetSaver */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86MiscGetSaverReq;
-#define sz_xXF86MiscGetSaverReq 8
-
-typedef struct _XF86MiscSetSaver {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscSetSaver */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 suspendTime B32;
- CARD32 offTime B32;
-} xXF86MiscSetSaverReq;
-#define sz_xXF86MiscSetSaverReq 16
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 suspendTime B32;
- CARD32 offTime B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86MiscGetSaverReply;
-#define sz_xXF86MiscGetSaverReply 32
-#endif
-
-typedef struct _XF86MiscGetMouseSettings {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscGetMouseSettings */
- CARD16 length B16;
-} xXF86MiscGetMouseSettingsReq;
-#define sz_xXF86MiscGetMouseSettingsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 mousetype B32;
- CARD32 baudrate B32;
- CARD32 samplerate B32;
- CARD32 resolution B32;
- CARD32 buttons B32;
- BOOL emulate3buttons;
- BOOL chordmiddle;
- CARD16 pad2 B16;
- CARD32 emulate3timeout B32;
- CARD32 flags B32;
- CARD32 devnamelen B32; /* strlen(device)+1 */
-} xXF86MiscGetMouseSettingsReply;
-#define sz_xXF86MiscGetMouseSettingsReply 44
-
-typedef struct _XF86MiscGetKbdSettings {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscGetKbdSettings */
- CARD16 length B16;
-} xXF86MiscGetKbdSettingsReq;
-#define sz_xXF86MiscGetKbdSettingsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 kbdtype B32;
- CARD32 rate B32;
- CARD32 delay B32;
- BOOL servnumlock;
- BOOL pad2;
- CARD16 pad3 B16;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86MiscGetKbdSettingsReply;
-#define sz_xXF86MiscGetKbdSettingsReply 32
-
-typedef struct _XF86MiscSetMouseSettings {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscSetMouseSettings */
- CARD16 length B16;
- CARD32 mousetype B32;
- CARD32 baudrate B32;
- CARD32 samplerate B32;
- CARD32 resolution B32;
- CARD32 buttons B32;
- BOOL emulate3buttons;
- BOOL chordmiddle;
- CARD16 devnamelen B16;
- CARD32 emulate3timeout B32;
- CARD32 flags B32;
-} xXF86MiscSetMouseSettingsReq;
-#define sz_xXF86MiscSetMouseSettingsReq 36
-
-typedef struct _XF86MiscSetKbdSettings {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */
- CARD16 length B16;
- CARD32 kbdtype B32;
- CARD32 rate B32;
- CARD32 delay B32;
- BOOL servnumlock;
- BOOL pad1;
- CARD16 pad2 B16;
-} xXF86MiscSetKbdSettingsReq;
-#define sz_xXF86MiscSetKbdSettingsReq 20
-
-typedef struct _XF86MiscSetGrabKeysState {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscSetKbdSettings */
- CARD16 length B16;
- BOOL enable;
- BOOL pad1;
- CARD16 pad2 B16;
-} xXF86MiscSetGrabKeysStateReq;
-#define sz_xXF86MiscSetGrabKeysStateReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86MiscSetGrabKeysStateReply;
-#define sz_xXF86MiscSetGrabKeysStateReply 32
-
-typedef struct _XF86MiscSetClientVersion {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
-} xXF86MiscSetClientVersionReq;
-#define sz_xXF86MiscSetClientVersionReq 8
-
-typedef struct _XF86MiscGetFilePaths {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscGetFilePaths */
- CARD16 length B16;
-} xXF86MiscGetFilePathsReq;
-#define sz_xXF86MiscGetFilePathsReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 configlen B16;
- CARD16 modulelen B16;
- CARD16 loglen B16;
- CARD16 pad2 B16;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86MiscGetFilePathsReply;
-#define sz_xXF86MiscGetFilePathsReply 32
-
-typedef struct _XF86MiscPassMessage {
- CARD8 reqType; /* always XF86MiscReqCode */
- CARD8 xf86miscReqType; /* always X_XF86MiscPassMessage */
- CARD16 length B16;
- CARD16 typelen B16;
- CARD16 vallen B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86MiscPassMessageReq;
-#define sz_xXF86MiscPassMessageReq 12
-
-typedef struct {
- BYTE type; /* X_Reply */
- BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 mesglen B16;
- CARD16 pad2 B16;
- CARD32 status B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86MiscPassMessageReply;
-#define sz_xXF86MiscPassMessageReply 32
-
-#endif /* _XF86MISCSTR_H_ */
diff --git a/nx-X11/include/extensions/xf86vmode.h b/nx-X11/include/extensions/xf86vmode.h
deleted file mode 100644
index 624820dea..000000000
--- a/nx-X11/include/extensions/xf86vmode.h
+++ /dev/null
@@ -1,322 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
-/*
-
-Copyright 1995 Kaleb S. KEITHLEY
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-/* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VIDMODE_H_
-#define _XF86VIDMODE_H_
-
-#include <nx-X11/Xfuncproto.h>
-#include <nx-X11/Xmd.h>
-
-#define X_XF86VidModeQueryVersion 0
-#define X_XF86VidModeGetModeLine 1
-#define X_XF86VidModeModModeLine 2
-#define X_XF86VidModeSwitchMode 3
-#define X_XF86VidModeGetMonitor 4
-#define X_XF86VidModeLockModeSwitch 5
-#define X_XF86VidModeGetAllModeLines 6
-#define X_XF86VidModeAddModeLine 7
-#define X_XF86VidModeDeleteModeLine 8
-#define X_XF86VidModeValidateModeLine 9
-#define X_XF86VidModeSwitchToMode 10
-#define X_XF86VidModeGetViewPort 11
-#define X_XF86VidModeSetViewPort 12
-/* new for version 2.x of this extension */
-#define X_XF86VidModeGetDotClocks 13
-#define X_XF86VidModeSetClientVersion 14
-#define X_XF86VidModeSetGamma 15
-#define X_XF86VidModeGetGamma 16
-#define X_XF86VidModeGetGammaRamp 17
-#define X_XF86VidModeSetGammaRamp 18
-#define X_XF86VidModeGetGammaRampSize 19
-#define X_XF86VidModeGetPermissions 20
-
-#define CLKFLAG_PROGRAMABLE 1
-
-#ifdef XF86VIDMODE_EVENTS
-#define XF86VidModeNotify 0
-#define XF86VidModeNumberEvents (XF86VidModeNotify + 1)
-
-#define XF86VidModeNotifyMask 0x00000001
-
-#define XF86VidModeNonEvent 0
-#define XF86VidModeModeChange 1
-#else
-#define XF86VidModeNumberEvents 0
-#endif
-
-#define XF86VidModeBadClock 0
-#define XF86VidModeBadHTimings 1
-#define XF86VidModeBadVTimings 2
-#define XF86VidModeModeUnsuitable 3
-#define XF86VidModeExtensionDisabled 4
-#define XF86VidModeClientNotLocal 5
-#define XF86VidModeZoomLocked 6
-#define XF86VidModeNumberErrors (XF86VidModeZoomLocked + 1)
-
-#define XF86VM_READ_PERMISSION 1
-#define XF86VM_WRITE_PERMISSION 2
-
-#ifndef _XF86VIDMODE_SERVER_
-
-typedef struct {
- unsigned short hdisplay;
- unsigned short hsyncstart;
- unsigned short hsyncend;
- unsigned short htotal;
- unsigned short hskew;
- unsigned short vdisplay;
- unsigned short vsyncstart;
- unsigned short vsyncend;
- unsigned short vtotal;
- unsigned int flags;
- int privsize;
-#if defined(__cplusplus) || defined(c_plusplus)
- /* private is a C++ reserved word */
- INT32 *c_private;
-#else
- INT32 *private;
-#endif
-} XF86VidModeModeLine;
-
-typedef struct {
- unsigned int dotclock;
- unsigned short hdisplay;
- unsigned short hsyncstart;
- unsigned short hsyncend;
- unsigned short htotal;
- unsigned short hskew;
- unsigned short vdisplay;
- unsigned short vsyncstart;
- unsigned short vsyncend;
- unsigned short vtotal;
- unsigned int flags;
- int privsize;
-#if defined(__cplusplus) || defined(c_plusplus)
- /* private is a C++ reserved word */
- INT32 *c_private;
-#else
- INT32 *private;
-#endif
-} XF86VidModeModeInfo;
-
-typedef struct {
- float hi;
- float lo;
-} XF86VidModeSyncRange;
-
-typedef struct {
- char* vendor;
- char* model;
- float EMPTY;
- unsigned char nhsync;
- XF86VidModeSyncRange* hsync;
- unsigned char nvsync;
- XF86VidModeSyncRange* vsync;
-} XF86VidModeMonitor;
-
-typedef struct {
- int type; /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event; /* true if this came from a SendEvent req */
- Display *display; /* Display the event was read from */
- Window root; /* root window of event screen */
- int state; /* What happened */
- int kind; /* What happened */
- Bool forced; /* extents of new region */
- Time time; /* event timestamp */
-} XF86VidModeNotifyEvent;
-
-typedef struct {
- float red; /* Red Gamma value */
- float green; /* Green Gamma value */
- float blue; /* Blue Gamma value */
-} XF86VidModeGamma;
-
-
-#define XF86VidModeSelectNextMode(disp, scr) \
- XF86VidModeSwitchMode(disp, scr, 1)
-#define XF86VidModeSelectPrevMode(disp, scr) \
- XF86VidModeSwitchMode(disp, scr, -1)
-
-_XFUNCPROTOBEGIN
-
-Bool XF86VidModeQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */
-);
-
-Bool XF86VidModeQueryExtension(
- Display* /* dpy */,
- int* /* event_base */,
- int* /* error_base */
-);
-
-Bool XF86VidModeSetClientVersion(
- Display* /* dpy */
-);
-
-Bool XF86VidModeGetModeLine(
- Display* /* dpy */,
- int /* screen */,
- int* /* dotclock */,
- XF86VidModeModeLine* /* modeline */
-);
-
-Bool XF86VidModeGetAllModeLines(
- Display* /* dpy */,
- int /* screen */,
- int* /* modecount */,
- XF86VidModeModeInfo*** /* modelinesPtr */
-);
-
-Bool XF86VidModeAddModeLine(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeModeInfo* /* new modeline */,
- XF86VidModeModeInfo* /* after modeline */
-);
-
-Bool XF86VidModeDeleteModeLine(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeModeInfo* /* modeline */
-);
-
-Bool XF86VidModeModModeLine(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeModeLine* /* modeline */
-);
-
-Status XF86VidModeValidateModeLine(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeModeInfo* /* modeline */
-);
-
-Bool XF86VidModeSwitchMode(
- Display* /* dpy */,
- int /* screen */,
- int /* zoom */
-);
-
-Bool XF86VidModeSwitchToMode(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeModeInfo* /* modeline */
-);
-
-Bool XF86VidModeLockModeSwitch(
- Display* /* dpy */,
- int /* screen */,
- int /* lock */
-);
-
-Bool XF86VidModeGetMonitor(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeMonitor* /* monitor */
-);
-
-Bool XF86VidModeGetViewPort(
- Display* /* dpy */,
- int /* screen */,
- int* /* x return */,
- int* /* y return */
-);
-
-Bool XF86VidModeSetViewPort(
- Display* /* dpy */,
- int /* screen */,
- int /* x */,
- int /* y */
-);
-
-Bool XF86VidModeGetDotClocks(
- Display* /* dpy */,
- int /* screen */,
- int* /* flags return */,
- int* /* number of clocks return */,
- int* /* max dot clock return */,
- int** /* clocks return */
-);
-
-Bool XF86VidModeGetGamma(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeGamma* /* Gamma */
-);
-
-Bool XF86VidModeSetGamma(
- Display* /* dpy */,
- int /* screen */,
- XF86VidModeGamma* /* Gamma */
-);
-
-Bool XF86VidModeSetGammaRamp(
- Display* /* dpy */,
- int /* screen */,
- int /* size */,
- unsigned short* /* red array */,
- unsigned short* /* green array */,
- unsigned short* /* blue array */
-);
-
-Bool XF86VidModeGetGammaRamp(
- Display* /* dpy */,
- int /* screen */,
- int /* size */,
- unsigned short* /* red array */,
- unsigned short* /* green array */,
- unsigned short* /* blue array */
-);
-
-Bool XF86VidModeGetGammaRampSize(
- Display* /* dpy */,
- int /* screen */,
- int* /* size */
-);
-
-Bool XF86VidModeGetPermissions(
- Display* /* dpy */,
- int /* screen */,
- int* /* permissions */
-);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/nx-X11/include/extensions/xf86vmstr.h b/nx-X11/include/extensions/xf86vmstr.h
deleted file mode 100644
index 43c67980f..000000000
--- a/nx-X11/include/extensions/xf86vmstr.h
+++ /dev/null
@@ -1,562 +0,0 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
-/*
-
-Copyright 1995 Kaleb S. KEITHLEY
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-/* $Xorg: xf86vmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VIDMODESTR_H_
-#define _XF86VIDMODESTR_H_
-
-#include <nx-X11/extensions/xf86vmode.h>
-
-#define XF86VIDMODENAME "XFree86-VidModeExtension"
-
-#define XF86VIDMODE_MAJOR_VERSION 2 /* current version numbers */
-#define XF86VIDMODE_MINOR_VERSION 2
-/*
- * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
- * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
- * client.
- * major version 2 == uses new protocol version in XFree86 4.0.
- */
-
-typedef struct _XF86VidModeQueryVersion {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeQueryVersion */
- CARD16 length B16;
-} xXF86VidModeQueryVersionReq;
-#define sz_xXF86VidModeQueryVersionReq 4
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16; /* major version of XF86VidMode */
- CARD16 minorVersion B16; /* minor version of XF86VidMode */
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86VidModeQueryVersionReply;
-#define sz_xXF86VidModeQueryVersionReply 32
-
-typedef struct _XF86VidModeGetModeLine {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86VidModeGetModeLineReq,
- xXF86VidModeGetAllModeLinesReq,
- xXF86VidModeGetMonitorReq,
- xXF86VidModeGetViewPortReq,
- xXF86VidModeGetDotClocksReq,
- xXF86VidModeGetPermissionsReq;
-#define sz_xXF86VidModeGetModeLineReq 8
-#define sz_xXF86VidModeGetAllModeLinesReq 8
-#define sz_xXF86VidModeGetMonitorReq 8
-#define sz_xXF86VidModeGetViewPortReq 8
-#define sz_xXF86VidModeGetDotClocksReq 8
-#define sz_xXF86VidModeGetPermissionsReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad2 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
-} xXF86VidModeGetModeLineReply;
-#define sz_xXF86VidModeGetModeLineReply 52
-
-/* 0.x version */
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
-} xXF86OldVidModeGetModeLineReply;
-#define sz_xXF86OldVidModeGetModeLineReply 36
-
-typedef struct {
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD32 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
-} xXF86VidModeModeInfo;
-
-/* 0.x version */
-typedef struct {
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
-} xXF86OldVidModeModeInfo;
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 modecount B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86VidModeGetAllModeLinesReply;
-#define sz_xXF86VidModeGetAllModeLinesReply 32
-
-typedef struct _XF86VidModeAddModeLine {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
- CARD32 after_dotclock B32;
- CARD16 after_hdisplay B16;
- CARD16 after_hsyncstart B16;
- CARD16 after_hsyncend B16;
- CARD16 after_htotal B16;
- CARD16 after_hskew B16;
- CARD16 after_vdisplay B16;
- CARD16 after_vsyncstart B16;
- CARD16 after_vsyncend B16;
- CARD16 after_vtotal B16;
- CARD16 pad2 B16;
- CARD32 after_flags B32;
- CARD32 reserved4 B32;
- CARD32 reserved5 B32;
- CARD32 reserved6 B32;
-} xXF86VidModeAddModeLineReq;
-#define sz_xXF86VidModeAddModeLineReq 92
-
-/* 0.x version */
-typedef struct _XF86OldVidModeAddModeLine {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeAddMode */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
- CARD32 after_dotclock B32;
- CARD16 after_hdisplay B16;
- CARD16 after_hsyncstart B16;
- CARD16 after_hsyncend B16;
- CARD16 after_htotal B16;
- CARD16 after_vdisplay B16;
- CARD16 after_vsyncstart B16;
- CARD16 after_vsyncend B16;
- CARD16 after_vtotal B16;
- CARD32 after_flags B32;
-} xXF86OldVidModeAddModeLineReq;
-#define sz_xXF86OldVidModeAddModeLineReq 60
-
-typedef struct _XF86VidModeModModeLine {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeModModeLine */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
-} xXF86VidModeModModeLineReq;
-#define sz_xXF86VidModeModModeLineReq 48
-
-/* 0.x version */
-typedef struct _XF86OldVidModeModModeLine {
- CARD8 reqType; /* always XF86OldVidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86OldVidModeModModeLine */
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
-} xXF86OldVidModeModModeLineReq;
-#define sz_xXF86OldVidModeModModeLineReq 32
-
-typedef struct _XF86VidModeValidateModeLine {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 hskew B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD16 pad1 B16;
- CARD32 flags B32;
- CARD32 reserved1 B32;
- CARD32 reserved2 B32;
- CARD32 reserved3 B32;
- CARD32 privsize B32;
-} xXF86VidModeDeleteModeLineReq,
- xXF86VidModeValidateModeLineReq,
- xXF86VidModeSwitchToModeReq;
-#define sz_xXF86VidModeDeleteModeLineReq 52
-#define sz_xXF86VidModeValidateModeLineReq 52
-#define sz_xXF86VidModeSwitchToModeReq 52
-
-/* 0.x version */
-typedef struct _XF86OldVidModeValidateModeLine {
- CARD8 reqType; /* always XF86OldVidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD32 screen B32; /* could be CARD16 but need the pad */
- CARD32 dotclock B32;
- CARD16 hdisplay B16;
- CARD16 hsyncstart B16;
- CARD16 hsyncend B16;
- CARD16 htotal B16;
- CARD16 vdisplay B16;
- CARD16 vsyncstart B16;
- CARD16 vsyncend B16;
- CARD16 vtotal B16;
- CARD32 flags B32;
- CARD32 privsize B32;
-} xXF86OldVidModeDeleteModeLineReq,
- xXF86OldVidModeValidateModeLineReq,
- xXF86OldVidModeSwitchToModeReq;
-#define sz_xXF86OldVidModeDeleteModeLineReq 36
-#define sz_xXF86OldVidModeValidateModeLineReq 36
-#define sz_xXF86OldVidModeSwitchToModeReq 36
-
-typedef struct _XF86VidModeSwitchMode {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSwitchMode */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 zoom B16;
-} xXF86VidModeSwitchModeReq;
-#define sz_xXF86VidModeSwitchModeReq 8
-
-typedef struct _XF86VidModeLockModeSwitch {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeLockModeSwitch */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 lock B16;
-} xXF86VidModeLockModeSwitchReq;
-#define sz_xXF86VidModeLockModeSwitchReq 8
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 status B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86VidModeValidateModeLineReply;
-#define sz_xXF86VidModeValidateModeLineReply 32
-
-typedef struct {
- BYTE type; /* X_Reply */
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD8 vendorLength;
- CARD8 modelLength;
- CARD8 nhsync;
- CARD8 nvsync;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86VidModeGetMonitorReply;
-#define sz_xXF86VidModeGetMonitorReply 32
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 x B32;
- CARD32 y B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86VidModeGetViewPortReply;
-#define sz_xXF86VidModeGetViewPortReply 32
-
-typedef struct _XF86VidModeSetViewPort {
- CARD8 reqType; /* always VidModeReqCode */
- CARD8 xf86vidmodeReqType; /* always X_XF86VidModeSetViewPort */
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 x B32;
- CARD32 y B32;
-} xXF86VidModeSetViewPortReq;
-#define sz_xXF86VidModeSetViewPortReq 16
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 flags B32;
- CARD32 clocks B32;
- CARD32 maxclocks B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xXF86VidModeGetDotClocksReply;
-#define sz_xXF86VidModeGetDotClocksReply 32
-
-typedef struct _XF86VidModeSetClientVersion {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 major B16;
- CARD16 minor B16;
-} xXF86VidModeSetClientVersionReq;
-#define sz_xXF86VidModeSetClientVersionReq 8
-
-typedef struct _XF86VidModeGetGamma {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xXF86VidModeGetGammaReq;
-#define sz_xXF86VidModeGetGammaReq 32
-
-typedef struct {
- BYTE type;
- BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 red B32;
- CARD32 green B32;
- CARD32 blue B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
-} xXF86VidModeGetGammaReply;
-#define sz_xXF86VidModeGetGammaReply 32
-
-typedef struct _XF86VidModeSetGamma {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
- CARD32 red B32;
- CARD32 green B32;
- CARD32 blue B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
-} xXF86VidModeSetGammaReq;
-#define sz_xXF86VidModeSetGammaReq 32
-
-
-typedef struct _XF86VidModeSetGammaRamp {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 size B16;
-} xXF86VidModeSetGammaRampReq;
-#define sz_xXF86VidModeSetGammaRampReq 8
-
-typedef struct _XF86VidModeGetGammaRamp {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 size B16;
-} xXF86VidModeGetGammaRampReq;
-#define sz_xXF86VidModeGetGammaRampReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86VidModeGetGammaRampReply;
-#define sz_xXF86VidModeGetGammaRampReply 32
-
-typedef struct _XF86VidModeGetGammaRampSize {
- CARD8 reqType; /* always XF86VidModeReqCode */
- CARD8 xf86vidmodeReqType;
- CARD16 length B16;
- CARD16 screen B16;
- CARD16 pad B16;
-} xXF86VidModeGetGammaRampSizeReq;
-#define sz_xXF86VidModeGetGammaRampSizeReq 8
-
-typedef struct {
- BYTE type;
- BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 size B16;
- CARD16 pad0 B16;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86VidModeGetGammaRampSizeReply;
-#define sz_xXF86VidModeGetGammaRampSizeReply 32
-
-typedef struct {
- BYTE type;
- BOOL pad;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 permissions B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xXF86VidModeGetPermissionsReply;
-#define sz_xXF86VidModeGetPermissionsReply 32
-
-
-#endif /* _XF86VIDMODESTR_H_ */
-
diff --git a/nx-X11/include/extensions/xtrapbits.h b/nx-X11/include/extensions/xtrapbits.h
deleted file mode 100644
index 1189dc7d3..000000000
--- a/nx-X11/include/extensions/xtrapbits.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* $XFree86$ */
-/*
- * This include file is designed to be a portable way for systems to define
- * bit field manipulation of arrays of bits.
- */
-#ifndef __XTRAPBITS__
-#define __XTRAPBITS__ "@(#)xtrapbits.h 1.6 - 90/09/18 "
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1994 by Digital Equipment Corporation,
-Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- */
-typedef unsigned char *UByteP; /* Pointer to an unsigned byte array */
-#define BitsInByte 8L /* The number of bits in a byte */
-
-#define BitInByte(bit) /* Returns the bit mask of a byte */ \
- (1L << (((bit) % BitsInByte)))
-
-#define BitInWord(bit) /* Returns the bit mask of a word */ \
- (1L << (((bit) % (BitsInByte * 2L))))
-
-#define BitInLong(bit) /* Returns the bit mask of a long */ \
- (1L << (((bit) % (BitsInByte * 4L))))
-
-#define ByteInArray(array,bit) /* Returns the byte offset to get to a bit */ \
- (((UByteP)(array))[(bit) / BitsInByte])
-
-#define BitIsTrue(array,bit) /* Test to see if a specific bit is True */ \
- (ByteInArray(array,bit) & BitInByte(bit))
-
-#define BitIsFalse(array,bit) /* Test to see if a specific bit is False */ \
- (!(BitIsTrue(array,bit)))
-
-#define BitTrue(array,bit) /* Set a specific bit to be True */ \
- (ByteInArray(array,bit) |= BitInByte(bit))
-
-#define BitFalse(array,bit) /* Set a specific bit to be False */ \
- (ByteInArray(array,bit) &= ~BitInByte(bit))
-
-#define BitToggle(array,bit) /* Toggle a specific bit */ \
- (ByteInArray(array,bit) ^= BitInByte(bit))
-
-#define BitCopy(dest,src,bit) /* Copy a specific bit */ \
- BitIsTrue((src),(bit)) ? BitTrue((dest),(bit)) : BitFalse((dest),(bit))
-
-#define BitValue(array,bit) /* Return True or False depending on bit */ \
- (BitIsTrue((array),(bit)) ? True : False)
-
-#define BitSet(array,bit,value) /* Set bit to given value in array */ \
- (value) ? BitTrue((array),(bit)) : BitFalse((array),(bit))
-
-#endif /* __XTRAPBITS__ */
diff --git a/nx-X11/include/extensions/xtrapddmi.h b/nx-X11/include/extensions/xtrapddmi.h
deleted file mode 100644
index 71df0712d..000000000
--- a/nx-X11/include/extensions/xtrapddmi.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* $XFree86$ */
-
-#ifndef __XTRAPDDMI__
-#define __XTRAPDDMI__
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This header file is used by the XTrap server extension only
- * (not used by clients or the XTrap Toolkit). Information
- * contained herein should *not* be visible to clients (xtrapdi.h
- * is used for this). The name is historical.
- */
-#include <nx-X11/X.h>
-#include <nx-X11/extensions/xtrapbits.h>
-#include "dix.h"
-
-#ifndef MIN
-# define MIN(a,b) ((a) < (b) ? (a) : (b))
-#endif
-#ifndef MAX
-# define MAX(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
-#define XETrapNumEvents 1L /* constants used for AddExtension */
-
-/* Other constants used within the extension code */
-#define XETrapMinRepSize 32L /* Minimum number of longs */
-
-/* This structure will be globally declared to provide storage to hold
- * the various extension wide configuration information. Allocated on
- * a per-client basis.
- */
-typedef struct
-{
- ClientPtr client; /* Multi-client support and error handling */
- xXTrapGetCurReply cur; /* Struct of Miscellaneous state info */
- xXTrapGetStatsReply *stats; /* Pointer to stat's, malloc'd if requested */
- CARD32 last_input_time B32; /* last timestamp from input event */
- CARD16 protocol B16; /* current communication protocol */
-} XETrapEnv;
-
-#define XETrapSetHeaderEvent(phdr) ((phdr)->type = 0x1L)
-#define XETrapSetHeaderRequest(phdr) ((phdr)->type = 0x2L)
-#define XETrapSetHeaderSpecial(phdr) ((phdr)->type = 0x3L)
-#define XETrapSetHeaderCursor(phdr) ((phdr)->type = 0x4L)
-#define XETrapSetHeaderReply(phdr) ((phdr)->type = 0x5L)
-
-#ifndef vaxc
-#define globaldef
-#define globalref extern
-#endif
-
-/* Extension platform identifier (conditionally defined) */
-#if ( defined (__osf__) && defined(__alpha) )
-# define XETrapPlatform PF_DECOSF1
-#endif
-#ifdef ultrix
-# define XETrapPlatform PF_DECUltrix
-#endif
-#ifdef vms
-#ifdef VAXELN
-# define XETrapPlatform PF_DECELN
-#else
-# define XETrapPlatform PF_DECVMS
-#endif
-#endif
-#ifdef VT1000
-# define XETrapPlatform PF_DECVT1000
-#endif
-#ifdef VXT
-# define XETrapPlatform PF_DECXTerm
-#endif
-#ifdef PC
-# define XETrapPlatform PF_IBMAT
-#endif
-#ifdef sun
-# define XETrapPlatform PF_SunSparc
-#endif
-#ifndef XETrapPlatform
-# define XETrapPlatform PF_Other
-#endif /* XETrapPlatform */
-
-#endif /* __XTRAPDDMI__ */
diff --git a/nx-X11/include/extensions/xtrapdi.h b/nx-X11/include/extensions/xtrapdi.h
deleted file mode 100644
index 34696113d..000000000
--- a/nx-X11/include/extensions/xtrapdi.h
+++ /dev/null
@@ -1,507 +0,0 @@
-/* $XFree86$ */
-#ifndef __XTRAPDI__
-#define __XTRAPDI__
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1994 by Digital Equipment Corp.,
-Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This header file defines the common structures/constants
- * between the XTrap extension and clients. All protocol
- * definitions between XTrap extension/clients can be found
- * here.
- */
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#ifndef IN_MODULE
-#include <stdio.h>
-#endif
-#include <nx-X11/X.h>
-#include <nx-X11/Xmd.h>
-#ifdef SMT
-#define NEED_EVENTS
-#define NEED_REPLIES
-#endif
-#include <nx-X11/Xproto.h>
-#include <nx-X11/extensions/xtrapbits.h>
-#define XTrapExtName "DEC-XTRAP"
-/* Current Release, Version, and Revision of the XTrap Extension */
-#define XETrapRelease 3L
-#define XETrapVersion 4L
-#ifndef XETrapRevision /* Changed from the Makefile by users */
-# define XETrapRevision 0L
-#endif /* XETrapRevision */
-#define XETrapProtocol 32L
-
-#ifndef SIZEOF
-# ifdef __STDC__
-# define SIZEOF(x) sz_##x
-# else
-# define SIZEOF(x) sz_/**/x
-# endif /* if ANSI C compiler else not */
-#endif
-#ifndef sz_CARD32
-#define sz_CARD32 4L
-#endif
-#ifndef sz_CARD8
-#define sz_CARD8 1L
-#endif
-#ifndef True
-# define True 1L
-# define False 0L
-#endif
-
-typedef int (*int_function)();
-typedef void (*void_function)();
-
-/* This is used as flags to indicate desired request traps
- * Note: This has been padded to a CARD32 to keep structure aligned
- */
-#define XETrapMaxRequest (((SIZEOF(CARD32)+((256L-1L) / \
- (BitsInByte*SIZEOF(CARD8))))/SIZEOF(CARD32))*SIZEOF(CARD32))
-typedef CARD8 ReqFlags[XETrapMaxRequest];
-
-/* This is used as flags to indicate desired event traps
- * Until events become *fully vectored*, we'll have to fake it
- * by defining an array of 5 events (KeyPress, KeyRelease,
- * ButtonPress, ButtonRelease, and MotionNotify. The extra 2
- * are required as the event types start with "2" (errors and
- * replies are 0 & 1). The event type is the index into the
- * bits.
- * Note: This has been padded to a longword to keep structure aligned
- */
-#ifndef VECTORED_EVENTS
-#define XETrapCoreEvents (2L+5L)
-#else
-#define XETrapCoreEvents 128L
-#endif
-#define XETrapMaxEvent (((SIZEOF(CARD32)+((XETrapCoreEvents-1L) / \
- (BitsInByte*SIZEOF(CARD8))))/SIZEOF(CARD32))*SIZEOF(CARD32))
-typedef CARD8 EventFlags[XETrapMaxEvent];
-
-/* This structure is used in a request to specify the types of
- * configuration information that should be changed or updated.
- */
-typedef struct
-{
- CARD8 valid[4L]; /* Bits TRUE indicates data field is used */
- CARD8 data[4L]; /* Bits looked at if corresponding valid bit set */
- ReqFlags req; /* Bits coorespond to core requests */
- EventFlags event; /* Bits correspond to core events */
-} XETrapFlags;
-
-/* Bit definitions for the above XETrapFlags structure. */
-#define XETrapTimestamp 0L /* hdr timestamps desired */
-#define XETrapCmd 1L /* command key specified */
-#define XETrapCmdKeyMod 2L /* cmd key is a modifier */
-#define XETrapRequest 3L /* output requests array */
-#define XETrapEvent 4L /* future output events array */
-#define XETrapMaxPacket 5L /* Maximum packet length set */
-#define XETrapTransOut 6L /* obsolete */
-#define XETrapStatistics 7L /* collect counts on requests */
-#define XETrapWinXY 8L /* Fill in Window (X,Y) in hdr */
-#define XETrapTransIn 9L /* obsolete */
-#define XETrapCursor 10L /* Trap cursor state changes */
-#define XETrapXInput 11L /* Use XInput extension */
-#define XETrapVectorEvents 12L /* Use Vectored Events (128) */
-#define XETrapColorReplies 13L /* Return replies with Color Req's */
-#define XETrapGrabServer 14L /* Disables client GrabServers */
-
-typedef struct /* used by XEConfigRequest */
-{
- XETrapFlags flags; /* Flags to specify what should be chg'd */
- CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */
- CARD8 cmd_key; /* Keyboard command_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
- * ambiguous (int in Intrinsic.h and unsigned char in X.h.
- */
- CARD8 pad[1L]; /* pad out to a quadword */
-} XETrapCfg;
-
-/* These structures are used within the Xtrap request structure for
- * the various types of xtrap request
- */
-#ifndef _XINPUT
-/* (see the definition of XEvent as a reference) */
-typedef struct /* used by XESimulateXEventRequest for synthesizing core evts */
-{
- CARD8 type; /* (must be first) as in XEvent */
- CARD8 detail; /* Detail keycode/button as in XEvent */
- CARD8 screen; /* screen number (0 to n) */
- CARD8 pad; /* pad to longword */
- INT16 x B16; /* X & Y coord as in XEvent */
- INT16 y B16;
-} XETrapInputReq;
-#endif
-
-/* These are constants that refer to the extension request vector table.
- * A request will use these values as minor opcodes.
- */
-#define XETrap_Reset 0L /* set to steady state */
-#define XETrap_GetAvailable 1L /* get available funct from ext */
-#define XETrap_Config 2L /* configure extension */
-#define XETrap_StartTrap 3L /* use Trapping */
-#define XETrap_StopTrap 4L /* stop using Trapping */
-#define XETrap_GetCurrent 5L /* get current info from ext */
-#define XETrap_GetStatistics 6L /* get count statistics from ext */
-#ifndef _XINPUT
-#define XETrap_SimulateXEvent 7L /* async input simulation */
-#endif
-#define XETrap_GetVersion 8L /* Get (Just) Version */
-#define XETrap_GetLastInpTime 9L /* Get Timestamp of last client input */
-
-/* The following are formats of a request to the XTRAP
- * extension. The data-less XTrap requests all use xXTrapReq
- */
-typedef struct
-{
- CARD8 reqType;
- CARD8 minor_opcode;
- CARD16 length B16;
- CARD32 pad B32; /* Maintain quadword alignment */
-} xXTrapReq;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapReq (sizeof(xXTrapReq))
-/* For retrieving version/available info (passes lib-side protocol number) */
-typedef struct
-{
- CARD8 reqType;
- CARD8 minor_opcode;
- CARD16 length B16;
- CARD16 protocol B16; /* The xtrap extension protocol number */
- CARD16 pad B16; /* Maintain quadword alignment */
-} xXTrapGetReq;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapGetReq (sizeof(xXTrapGetReq))
-
-typedef struct
-{
- CARD8 reqType;
- CARD8 minor_opcode;
- CARD16 length B16;
- /*
- * The follwing is done so that structure padding wont be
- * a problem. The request structure contains a shadow for
- * the XETrapCfg structure. Since the XETrapCfg also has a
- * substructure (XETrapFlags) this structure is also shadowed.
- *
- * The following are a shadow of the XETrapFlags
- * structure.
- */
- CARD8 config_flags_valid[4L];
- CARD8 config_flags_data[4L];
- ReqFlags config_flags_req;
- EventFlags config_flags_event;
- /* End Shadow (XETrapFlags)*/
- CARD16 config_max_pkt_size B16; /* Max number of bytes in a packet */
- CARD8 config_cmd_key; /* Keyboard command_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
- * ambiguous (int in Intrinsic.h and unsigned char in X.h.
- */
- CARD8 config_pad[1L]; /* pad out to a quadword */
- /* End Shadow (XETrapCfg) */
- CARD32 pad B32; /* Maintain quadword alignment */
-} xXTrapConfigReq;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapConfigReq (sizeof(xXTrapConfigReq))
-
-#ifndef _XINPUT
-typedef struct
-{
- CARD8 reqType;
- CARD8 minor_opcode;
- CARD16 length B16;
- CARD32 pad B32; /* Maintain quadword alignment */
- XETrapInputReq input;
-} xXTrapInputReq;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapInputReq (sizeof(xXTrapInputReq))
-#endif
-
-
-/* The following structures are used by the server extension to send
- * information and replies to the client.
- */
-
-/* header for all X replies */
-typedef struct
-{
- CARD8 type;
- CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
-} XETrapRepHdr;
-
-/* Structure of Get Available Functionality reply */
-typedef struct
-{
- CARD32 pf_ident B32; /* Contains constant identifying the platform */
- CARD16 xtrap_release B16; /* The xtrap extension release number */
- CARD16 xtrap_version B16; /* The xtrap extension version number */
- CARD16 xtrap_revision B16; /* The xtrap extension revision number */
- CARD16 max_pkt_size B16; /* Maximum number of bytes in a packet */
- CARD8 valid[4]; /* What specific configuration flags are valid */
- CARD32 major_opcode B32; /* The major opcode identifying xtrap */
- CARD32 event_base B32; /* The event value we start at */
- CARD32 pad0 B32; /* obsolete field */
- CARD16 pad1 B16, pad2 B16, pad3 B16; /* obsolete field */
- CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */
- INT16 cur_x B16; /* Current X & Y coord for relative motion */
- INT16 cur_y B16;
-} XETrapGetAvailRep;
-
-typedef struct
-{
- CARD16 xtrap_release B16; /* The xtrap extension release number */
- CARD16 xtrap_version B16; /* The xtrap extension version number */
- CARD16 xtrap_revision B16; /* The xtrap extension revision number */
- CARD16 xtrap_protocol B16; /* The xtrap extension protocol number */
-} XETrapGetVersRep;
-
-typedef struct
-{
- CARD32 last_time B32; /* Timestamp of last input time */
-} XETrapGetLastInpTimeRep;
-
-/* Structure of Get Current Configuration Information reply */
-typedef struct
-{
- CARD8 state_flags[2]; /* Miscelaneous flags, see below #define's */
- CARD16 pad0 B16; /* Assure quadword alignment */
- XETrapCfg config; /* Current Config information */
- CARD32 pad1 B32;
-} XETrapGetCurRep;
-
-/* Mask definitions for the above flags. */
-#define XETrapTrapActive 0L /* If sending/receiving between client/ext */
-
-/* Structure of Get Statistics Information reply */
-typedef struct
-{
- CARD32 requests[256L]; /* Array containing request counts if trapped */
- CARD32 events[XETrapCoreEvents]; /* Array containing event stats */
-#ifndef VECTORED_EVENTS
- CARD32 pad B32; /* Pad out to a quadword */
-#endif
-} XETrapGetStatsRep;
-
-#define PF_Other 0L /* server not one of the below */
-#define PF_Apollo 10L /* server on Apollo system */
-#define PF_ATT 20L /* server on AT&T system */
-#define PF_Cray1 30L /* server on Cray 1 system */
-#define PF_Cray2 31L /* server on Cray 2 system */
-#define PF_DECUltrix 40L /* server on DEC ULTRIX system */
-#define PF_DECVMS 41L /* server on DEC VMS system */
-#define PF_DECVT1000 42L /* server on DEC-VT1000-terminal */
-#define PF_DECXTerm 43L /* server on DEC-X-terminal */
-#define PF_DECELN 44L /* server on DEC VAXELN X terminal */
-#define PF_DECOSF1 45L /* server on DEC's OSF/1 system */
-#define PF_HP9000s800 50L /* server on HP 9000/800 system */
-#define PF_HP9000s300 51L /* server on HP 9000/300 system */
-#define PF_IBMAT 60L /* server on IBM/AT system */
-#define PF_IBMRT 61L /* server on IBM/RT system */
-#define PF_IBMPS2 62L /* server on IBM/PS2 system */
-#define PF_IBMRS 63L /* server on IBM/RS system */
-#define PF_MacII 70L /* server on Mac II system */
-#define PF_Pegasus 80L /* server on Tektronix Pegasus system */
-#define PF_SGI 90L /* server on Silicon Graphcis system */
-#define PF_Sony 100L /* server on Sony system */
-#define PF_Sun3 110L /* server on Sun 3 system */
-#define PF_Sun386i 111L /* server on Sun 386i system */
-#define PF_SunSparc 112L /* server on Sun Sparc system */
-
-/* reply sent back by XETrapGetAvailable request */
-typedef struct
-{
- XETrapRepHdr hdr;
- XETrapGetAvailRep data;
-} xXTrapGetAvailReply;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapGetAvailReply sizeof(xXTrapGetAvailReply)
-
-/* reply sent back by XETrapGetVersion request */
-typedef struct
-{
- XETrapRepHdr hdr;
- XETrapGetVersRep data;
- CARD32 pad0 B32; /* pad out to 32 bytes */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
-} xXTrapGetVersReply;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapGetVersReply sizeof(xXTrapGetVersReply)
-
-/* reply sent back by XETrapGetLastInpTime request */
-typedef struct
-{
- XETrapRepHdr hdr;
- /*
- * The following is a shadow of the XETrapGetLastInpTimeRep
- * structure. This is done to avoid structure padding.
- */
- CARD32 data_last_time B32; /* Timestamp of last input time */
- CARD32 pad0 B32; /* pad out to 32 bytes */
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
-} xXTrapGetLITimReply;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapGetLITimReply sizeof(xXTrapGetLITimReply)
-
-/* reply sent back by XETrapGetCurrent request */
-typedef struct
-{
- XETrapRepHdr hdr;
- /*
- * The following is a shadow of the XETrapGetCurRep
- * structure. This is done to avoid structure padding.
- * Since the XETrapGetCurRep structure contains a sub-structure
- * (XETrapCfg) there is a shadow for that as well.*/
- CARD8 data_state_flags[2]; /* Misc flags, see below #define's */
- CARD16 data_pad0 B16; /* Assure quadword alignment */
- /* XETrapCfg Shadow Starts */
- CARD8 data_config_flags_valid[4L];
- CARD8 data_config_flags_data[4L];
- ReqFlags data_config_flags_req;
- EventFlags data_config_flags_event;
- CARD16 data_config_max_pkt_size B16; /* Max num of bytes in a pkt */
- CARD8 data_config_cmd_key; /* Keyboard cmd_key (KeyCode) */
-/*
- * cmd_key is intentionally *not* defined KeyCode since it's definition is
- * ambiguous (int in Intrinsic.h and unsigned char in X.h.
- */
- CARD8 data_config_pad[1L]; /* pad out to a quadword */
- /* End Shadow (XETrapCfg) */
- CARD32 pad1 B32;
-} xXTrapGetCurReply;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_xXTrapGetCurReply sizeof(xXTrapGetCurReply)
-
-/* reply sent back by XETrapGetStatistics request */
-/* Note:
- * The following does *not* use the standard XETrapRepHdr, but instead
- * one which is padded out to 32-bytes. This is because Cray's have a problem
- * reading arrays of CARD32s without using the _Read32 macro (see XERqsts.c).
- * This requires that none of the data be in the _Reply area.
- */
-typedef struct
-{
- CARD8 type;
- CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 pad0 B32;
- CARD32 pad1 B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- XETrapGetStatsRep data;
-} xXTrapGetStatsReply;
-#define sz_xXTrapGetStatsReply 1088
-
-typedef struct /* the XTrap Output header (for output from ext to client) */
-{ /* this must be quadword aligned for portability */
- CARD32 count B32; /* Length including this header */
- CARD32 timestamp B32; /* timestamp if desired */
- CARD8 type; /* event id, request id, special id */
- CARD8 screen; /* screen number (0 to n) */
- INT16 win_x B16; /* X coord of drawable, if any */
- INT16 win_y B16; /* X coord of drawable, if any */
- CARD16 client B16; /* to distinguish requests */
-} XETrapHeader;
-/* the following works because all fields are defined as bit (Bnn) fields */
-#define sz_XETrapHeader sizeof(XETrapHeader)
-
-#define XETrapHeaderIsEvent(phdr) (XETrapGetHeaderType(phdr) == 0x1L)
-#define XETrapHeaderIsRequest(phdr) (XETrapGetHeaderType(phdr) == 0x2L)
-#define XETrapHeaderIsSpecial(phdr) (XETrapGetHeaderType(phdr) == 0x3L)
-#define XETrapHeaderIsCursor(phdr) (XETrapGetHeaderType(phdr) == 0x4L)
-#define XETrapHeaderIsReply(phdr) (XETrapGetHeaderType(phdr) == 0x5L)
-
-/* Define a structure used for reading/writing datum of type XTrap */
-typedef struct
-{
- XETrapHeader hdr;
- union
- {
- xEvent event;
- xResourceReq req;
- xGenericReply reply;
- /* special? */
- } u;
-} XETrapDatum;
-
-/* this doesn't get picked up for VMS server builds (different Xproto.h) */
-#ifndef sz_xEvent
-#define sz_xEvent 32
-#endif
-/* Minimum size of a packet from the server extension */
-#define XETrapMinPktSize (SIZEOF(XETrapHeader) + SIZEOF(xEvent))
-
-/* Constants used with the XLIB transport */
-#define XETrapDataStart 0L /* Used in the detail field */
-#define XETrapDataContinued 1L /* Used in the detail field */
-#define XETrapDataLast 2L /* Used in the detail field */
-#define XETrapData 0L /* Used in the type field */
-#define XETrapNumberEvents 1L
-/* This is the representation on the wire(see also XLib.h) */
-#define sz_EventData 24L /* 32 bytes - type, detail, seq, index */
-typedef struct {
- CARD8 type;
- CARD8 detail;
- CARD16 sequenceNumber B16;
- CARD32 idx B32;
- CARD8 data[sz_EventData];
-} xETrapDataEvent;
-
-/* Error message indexes added to X for extension */
-#define BadIO 2L /* Can't read/write */
-#define BadStatistics 4L /* Stat's not avail. */
-#define BadDevices 5L /* Devices not vectored */
-#define BadScreen 7L /* Can't send event to given screen */
-#define BadSwapReq 8L /* Can't send swapped extension requests */
-#define XETrapNumErrors (BadSwapReq + 1)
-
-
-#define XEKeyIsClear 0
-#define XEKeyIsEcho 1
-#define XEKeyIsOther 2
-
-#endif /* __XTRAPDI__ */
diff --git a/nx-X11/include/extensions/xtrapemacros.h b/nx-X11/include/extensions/xtrapemacros.h
deleted file mode 100644
index f5dc2be31..000000000
--- a/nx-X11/include/extensions/xtrapemacros.h
+++ /dev/null
@@ -1,387 +0,0 @@
-/* $XFree86: xc/include/extensions/xtrapemacros.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
-#ifndef __XTRAPEMACROS__
-#define __XTRAPEMACROS__ "@(#)xtrapemacros.h 1.9 - 90/09/18 "
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
-Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This include file is designed to provide the *visible*
- * interface to XTrap data structures. Fields can be set
- * using these macros by client programs unless otherwise
- * specified; however, use of Trap Context convenience
- * routines is strongly encouraged (XETrapContext.c)
- */
-#include <nx-X11/extensions/xtrapbits.h>
-#include <signal.h>
-
-/* msleep macro to replace msleep() for portability reasons */
-#define msleep(m) usleep((m)*1000)
-
-/* Copying TC's assumes that the new TC must be created */
-#define XECopyTC(src,mask,dest) \
- (dest = XECreateTC(((src)->dpy), (mask), (&((src)->values))))
-
-/* Expands to SET each element of the TCValues structure
- * Returns the TCValues Mask so that the Set can be entered
- * as an argument to the XEChangeTC() routine call
- */
-/* Note: req_cb & evt_cb would only be used if you wanted to
- * *share* callbacks between Trap Contexts. Normally,
- * XEAddRequestCB() and XEAddEventCB() would be used.
- */
-#define XETrapSetCfgReqCB(tcv,x) ((tcv)->req_cb = (x))
-#define XETrapSetCfgEvtCB(tcv,x) ((tcv)->evt_cb = (x))
-#define XETrapSetCfgMaxPktSize(tcv,x) ((tcv)->v.max_pkt_size = (x))
-#define XETrapSetCfgCmdKey(tcv,x) ((tcv)->v.cmd_key = (x))
-/* Note: e is only pertinent for "valid" or "data" */
-#define XETrapSetCfgFlags(tcv,e,a) \
- memcpy((tcv)->v.flags.e, (a), sizeof((tcv)->v.flags.e))
-#define XETrapSetCfgFlagTimestamp(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapTimestamp, (x))
-#define XETrapSetCfgFlagCmd(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapCmd, (x))
-#define XETrapSetCfgFlagCmdKeyMod(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapCmdKeyMod, (x))
-#define XETrapSetCfgFlagRequest(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapRequest, (x))
-#define XETrapSetCfgFlagEvent(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapEvent, (x))
-#define XETrapSetCfgFlagMaxPacket(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapMaxPacket, (x))
-#define XETrapSetCfgFlagStatistics(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapStatistics, (x))
-#define XETrapSetCfgFlagWinXY(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapWinXY, (x))
-#define XETrapSetCfgFlagCursor(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapCursor, (x))
-#define XETrapSetCfgFlagReq(tcv,request,x) \
- BitSet((tcv)->v.flags.req, (request), (x))
-#define XETrapSetCfgFlagXInput(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapXInput, (x))
-#define XETrapSetCfgFlagColorReplies(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapColorReplies, (x))
-#define XETrapSetCfgFlagGrabServer(tcv,e,x) \
- BitSet((tcv)->v.flags.e, XETrapGrabServer, (x))
-#define XETrapSetCfgFlagEvt(tcv,evt,x) \
- BitSet((tcv)->v.flags.event, (evt), (x))
-
-#define XETrapSetValFlagDeltaTimes(tcv,x) \
- BitSet((tcv)->tc_flags, XETCDeltaTimes, (x))
-
-/* Fields returned in the "GetAvailable" request */
-#define XETrapGetAvailPFIdent(avail) ((avail)->pf_ident)
-#define XETrapGetAvailRelease(avail) ((avail)->xtrap_release)
-#define XETrapGetAvailVersion(avail) ((avail)->xtrap_version)
-#define XETrapGetAvailRevision(avail) ((avail)->xtrap_revision)
-#define XETrapGetAvailMaxPktSize(avail) ((avail)->max_pkt_size)
-#define XETrapGetAvailFlags(avail,a) \
- memcpy((a), (avail)->valid, sizeof((avail)->valid))
-#define XETrapGetAvailFlagTimestamp(avail) \
- (BitValue((avail)->valid, XETrapTimestamp))
-#define XETrapGetAvailFlagCmd(avail) \
- (BitValue((avail)->valid, XETrapCmd))
-#define XETrapGetAvailFlagCmdKeyMod(avail) \
- (BitValue((avail)->valid, XETrapCmdKeyMod))
-#define XETrapGetAvailFlagRequest(avail) \
- (BitValue((avail)->valid, XETrapRequest))
-#define XETrapGetAvailFlagEvent(avail) \
- (BitValue((avail)->valid, XETrapEvent))
-#define XETrapGetAvailFlagMaxPacket(avail) \
- (BitValue((avail)->valid, XETrapMaxPacket))
-#define XETrapGetAvailFlagStatistics(avail) \
- (BitValue((avail)->valid, XETrapStatistics))
-#define XETrapGetAvailFlagWinXY(avail) \
- (BitValue((avail)->valid, XETrapWinXY))
-#define XETrapGetAvailFlagCursor(avail) \
- (BitValue((avail)->valid, XETrapCursor))
-#define XETrapGetAvailFlagXInput(avail) \
- (BitValue((avail)->valid, XETrapXInput))
-#define XETrapGetAvailFlagVecEvt(avail) \
- (BitValue((avail)->valid, XETrapVectorEvents))
-#define XETrapGetAvailFlagColorReplies(avail) \
- (BitValue((avail)->valid, XETrapColorReplies))
-#define XETrapGetAvailFlagGrabServer(avail) \
- (BitValue((avail)->valid, XETrapGrabServer))
-#define XETrapGetAvailOpCode(avail) ((avail)->major_opcode)
-/* Macro's for creating current request and trap context macros */
-#define XETrapGetCfgMaxPktSize(cfg) ((cfg)->max_pkt_size)
-#define XETrapGetCfgCmdKey(cfg) ((cfg)->cmd_key)
-#define XETrapGetCfgFlags(cfg,e,a) \
- memcpy((a), (cfg)->flags.e, sizeof((cfg)->flags.e))
-#define XETrapGetCfgFlagTimestamp(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapTimestamp))
-#define XETrapGetCfgFlagCmd(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapCmd))
-#define XETrapGetCfgFlagCmdKeyMod(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapCmdKeyMod))
-#define XETrapGetCfgFlagRequest(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapRequest))
-#define XETrapGetCfgFlagEvent(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapEvent))
-#define XETrapGetCfgFlagMaxPacket(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapMaxPacket))
-#define XETrapGetCfgFlagStatistics(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapStatistics))
-#define XETrapGetCfgFlagWinXY(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapWinXY))
-#define XETrapGetCfgFlagCursor(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapCursor))
-#define XETrapGetCfgFlagXInput(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapXInput))
-#define XETrapGetCfgFlagColorReplies(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapColorReplies))
-#define XETrapGetCfgFlagGrabServer(cfg,e) \
- (BitValue((cfg)->flags.e, XETrapGrabServer))
-/* Request values are in "Xproto.h" of the flavor X_RequestType */
-#define XETrapGetCfgFlagReq(cfg,request) \
- (BitValue((cfg)->flags.req, (request)))
-/* Event types are in "X.h" of the flavor EventType (e.g. KeyPress) */
-#define XETrapGetCfgFlagEvt(cfg,evt) \
- (BitValue((cfg)->flags.event, (evt)))
-
-/* Fields returned int the "GetCurrent" Request */
-#define XETrapGetCurX(avail) ((avail)->cur_x)
-#define XETrapGetCurY(avail) ((avail)->cur_y)
-#define XETrapGetCurSFlags(cur,a) \
- memcpy((a), (cur)->state_flags, sizeof((cur)->state_flags))
-#define XETrapGetCurMaxPktSize(cur) (XETrapGetCfgMaxPktSize(&((cur)->config)))
-#define XETrapGetCurCmdKey(cur) (XETrapGetCfgCmdKey(&((cur)->config)))
-/* Note: e is only pertinent for "valid" or "data" */
-#define XETrapGetCurCFlags(cur,e,a) (XETrapGetCfgFlags(&((cur)->config),e,a))
-#define XETrapGetCurFlagTimestamp(cur,e) \
- (XETrapGetCfgFlagTimestamp(&((cur)->config),e))
-#define XETrapGetCurFlagCmd(cur,e) (XETrapGetCfgFlagCmd(&((cur)->config),e))
-#define XETrapGetCurFlagCmdKeyMod(cur,e) \
- (XETrapGetCfgFlagCmdKeyMod(&((cur)->config),e))
-#define XETrapGetCurFlagRequest(cur,r) \
- (XETrapGetCfgFlagRequest(&((cur)->config),r))
-#define XETrapGetCurFlagEvent(cur,e) \
- (XETrapGetCfgFlagEvent(&((cur)->config),e))
-#define XETrapGetCurFlagMaxPacket(cur,e) \
- (XETrapGetCfgFlagMaxPacket(&((cur)->config),e))
-#define XETrapGetCurFlagStatistics(cur,e) \
- (XETrapGetCfgFlagStatistics(&((cur)->config),e))
-#define XETrapGetCurFlagWinXY(cur,e) \
- (XETrapGetCfgFlagWinXY(&((cur)->config),e))
-#define XETrapGetCurFlagCursor(cur,e) \
- (XETrapGetCfgFlagCursor(&((cur)->config),e))
-#define XETrapGetCurFlagXInput(cur,e) \
- (XETrapGetCfgFlagXInput(&((cur)->config),e))
-#define XETrapGetCurFlagColorReplies(cur,e) \
- (XETrapGetCfgFlagColorReplies(&((cur)->config),e))
-#define XETrapGetCurFlagGrabServer(cur,e) \
- (XETrapGetCfgFlagGrabServer(&((cur)->config),e))
-/* Request values are in "Xproto.h" of the flavor X_RequestType */
-#define XETrapGetCurFlagReq(cur,r) (XETrapGetCfgFlagReq(&((cur)->config),r))
-/* Event types are in "X.h" of the flavor EventType (e.g. KeyPress) */
-#define XETrapGetCurFlagEvt(cur,e) (XETrapGetCfgFlagEvt(&((cur)->config),e))
-
-/* Fields returned int the "GetStatistics" Request */
-#define XETrapGetStatsReq(stat,e) ((stat)->requests[(e)])
-#define XETrapGetStatsEvt(stat,e) ((stat)->events[(e)])
-
-/* Fields returned in the "GetVersion" request */
-#define XETrapGetVersRelease(vers) ((vers)->xtrap_release)
-#define XETrapGetVersVersion(vers) ((vers)->xtrap_version)
-#define XETrapGetVersRevision(vers) ((vers)->xtrap_revision)
-
-/* Fields returned in the "GetLastInpTime" request */
-#define XETrapGetLastInpTime(time_rep) ((time_rep)->last_time)
-
-/* Expands to GET each element of the TCValues structure */
-#define XETrapGetTCReqCB(tc) ((tc)->values.req_cb)
-#define XETrapGetTCEvtCB(tc) ((tc)->values.evt_cb)
-#define XETrapGetTCTime(tc) ((tc)->values.last_time)
-/* TC specific flags */
-#define XETrapGetTCLFlags(tc,a) \
- memcpy((a), (tc)->values.tc_flags, sizeof((tc)->values.tc_flags))
-#define XETrapGetTCFlagDeltaTimes(tc) \
- (BitValue((tc)->values.tc_flags, XETCDeltaTimes))
-#define XETrapGetTCFlagTrapActive(tc) \
- (BitValue((tc)->values.tc_flags, XETCTrapActive))
-#define XETrapGetTCMaxPktSize(tc) (XETrapGetCfgMaxPktSize(&((tc)->values.v)))
-#define XETrapGetTCCmdKey(tc) (XETrapGetCfgCmdKey(&((tc)->values.v)))
-/* Note: e is only pertinent for "valid" or "data" */
-#define XETrapGetTCFlags(tc,e,a) (XETrapGetCfgFlags(&((tc)->values.v),e,a))
-#define XETrapGetTCFlagTimestamp(tc,e) \
- (XETrapGetCfgFlagTimestamp(&((tc)->values.v),e))
-#define XETrapGetTCFlagCmd(tc,e) \
- (XETrapGetCfgFlagCmd(&((tc)->values.v),e))
-#define XETrapGetTCFlagCmdKeyMod(tc,e) \
- (XETrapGetCfgFlagCmdKeyMod(&((tc)->values.v),e))
-#define XETrapGetTCFlagRequest(tc,r) \
- (XETrapGetCfgFlagRequest(&((tc)->values.v),r))
-#define XETrapGetTCFlagEvent(tc,e) \
- (XETrapGetCfgFlagEvent(&((tc)->values.v),e))
-#define XETrapGetTCFlagMaxPacket(tc,e) \
- (XETrapGetCfgFlagMaxPacket(&((tc)->values.v),e))
-#define XETrapGetTCFlagStatistics(tc,e) \
- (XETrapGetCfgFlagStatistics(&((tc)->values.v),e))
-#define XETrapGetTCFlagWinXY(tc,e) \
- (XETrapGetCfgFlagWinXY(&((tc)->values.v),e))
-#define XETrapGetTCFlagCursor(tc,e) \
- (XETrapGetCfgFlagCursor(&((tc)->values.v),e))
-#define XETrapGetTCFlagXInput(tc,e) \
- (XETrapGetCfgFlagXInput(&((tc)->values.v),e))
-#define XETrapGetTCFlagColorReplies(tc,e) \
- (XETrapGetCfgFlagColorReplies(&((tc)->values.v),e))
-#define XETrapGetTCFlagGrabServer(tc,e) \
- (XETrapGetCfgFlagGrabServer(&((tc)->values.v),e))
-/* Request values are in "Xproto.h" of the flavor X_RequestType */
-#define XETrapGetTCFlagReq(tc,r) \
- (XETrapGetCfgFlagReq(&((tc)->values.v),r))
-/* Event types are in "X.h" of the flavor EventType (e.g. KeyPress) */
-#define XETrapGetTCFlagEvt(tc,e) \
- (XETrapGetCfgFlagEvt(&((tc)->values.v),e))
-/* The following can/should *not* be set directly! */
-#define XETrapGetNext(tc) ((tc)->next)
-#define XETrapGetDpy(tc) ((tc)->dpy)
-#define XETrapGetEventBase(tc) ((tc)->eventBase)
-#define XETrapGetErrorBase(tc) ((tc)->errorBase)
-#define XETrapGetExtOpcode(tc) ((tc)->extOpcode)
-#define XETrapGetXBuff(tc) ((tc)->xbuff)
-#define XETrapGetXMaxSize(tc) ((tc)->xmax_size)
-#define XETrapGetExt(tc) ((tc)->ext_data)
-#define XETrapGetDirty(tc) ((tc)->dirty)
-#define XETrapGetValues(tc) memcpy((x),(tc)->values,sizeof((tc)->values))
-#define XETrapGetEventFunc(tc) ((tc)->eventFunc)
-
-#define XETrapGetHeaderCount(phdr) ((phdr)->count)
-#define XETrapGetHeaderTimestamp(phdr) ((phdr)->timestamp)
-#define XETrapGetHeaderType(phdr) ((phdr)->type)
-#define XETrapGetHeaderScreen(phdr) ((phdr)->screen)
-#define XETrapGetHeaderWindowX(phdr) ((phdr)->win_x)
-#define XETrapGetHeaderWindowY(phdr) ((phdr)->win_y)
-#define XETrapGetHeaderClient(phdr) ((phdr)->client)
-
-#define XEGetRelease(tc) ((tc)->release)
-#define XEGetVersion(tc) ((tc)->version)
-#define XEGetRevision(tc) ((tc)->revision)
-
-/* Condition handling macros */
-#if !defined(vms) && \
- (!defined(_InitExceptionHandling) || !defined(_ClearExceptionHandling))
-# ifndef _SetSIGBUSHandling
-# ifdef SIGBUS
-# define _SetSIGBUSHandling(rtn) (void)signal(SIGBUS, rtn)
-# else
-# define _SetSIGBUSHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGSEGVHandling
-# ifdef SIGSEGV
-# define _SetSIGSEGVHandling(rtn) (void)signal(SIGSEGV, rtn)
-# else
-# define _SetSIGSEGVHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGFPEHandling
-# ifdef SIGFPE
-# define _SetSIGFPEHandling(rtn) (void)signal(SIGFPE, rtn)
-# else
-# define _SetSIGFPEHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGILLHandling
-# ifdef SIGILL
-# define _SetSIGILLHandling(rtn) (void)signal(SIGILL, rtn)
-# else
-# define _SetSIGILLHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGSYSHandling
-# ifdef SIGSYS
-# define _SetSIGSYSHandling(rtn) (void)signal(SIGSYS, rtn)
-# else
-# define _SetSIGSYSHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGHUPHandling
-# ifdef SIGHUP
-# define _SetSIGHUPHandling(rtn) (void)signal(SIGHUP, rtn)
-# else
-# define _SetSIGHUPHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGPIPEHandling
-# ifdef SIGPIPE
-# define _SetSIGPIPEHandling(rtn) (void)signal(SIGPIPE, rtn)
-# else
-# define _SetSIGPIPEHandling(rtn) /* */
-# endif
-# endif
-# ifndef _SetSIGTERMHandling
-# ifdef SIGTERM
-# define _SetSIGTERMHandling(rtn) (void)signal(SIGTERM, rtn)
-# else
-# define _SetSIGTERMHandling(rtn) /* */
-# endif
-# endif
-#endif
-#ifndef _InitExceptionHandling
-#ifdef vms
-#define _InitExceptionHandling(rtn) \
- VAXC$ESTABLISH(rtn) /* VMS exception handler */
-#else /* vms */
-#define _InitExceptionHandling(rtn) \
- _SetSIGBUSHandling(rtn); /* Bus error */ \
- _SetSIGSEGVHandling(rtn); /* Accvio/Segment error */ \
- _SetSIGFPEHandling(rtn); /* Floating point exception */ \
- _SetSIGILLHandling(rtn); /* Illegal instruction */ \
- _SetSIGSYSHandling(rtn); /* Param error in sys call */ \
- _SetSIGHUPHandling(rtn); \
- _SetSIGPIPEHandling(rtn); \
- _SetSIGTERMHandling(rtn)
-#endif /* vms */
-#endif /* _InitExceptionHandling */
-
-#ifndef _ClearExceptionHandling
-#ifdef vms
-#define _ClearExceptionHandling() \
- LIB$REVERT()
-#else
-#define _ClearExceptionHandling() \
- _SetSIGBUSHandling(SIG_DFL); /* Bus error */ \
- _SetSIGSEGVHandling(SIG_DFL); /* Accvio/Segment error */ \
- _SetSIGFPEHandling(SIG_DFL); /* Floating point exception */ \
- _SetSIGILLHandling(SIG_DFL); /* Illegal instruction */ \
- _SetSIGSYSHandling(SIG_DFL); /* Param error in sys call */ \
- _SetSIGHUPHandling(SIG_DFL); \
- _SetSIGPIPEHandling(SIG_DFL); \
- _SetSIGTERMHandling(SIG_DFL)
-#endif /* vms */
-#endif /* _ClearExceptionHandling */
-
-#endif /* __XTRAPEMACROS__ */
diff --git a/nx-X11/include/extensions/xtraplib.h b/nx-X11/include/extensions/xtraplib.h
deleted file mode 100644
index b733dac7f..000000000
--- a/nx-X11/include/extensions/xtraplib.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* $XFree86$ */
-#ifndef __XTRAPLIB__
-#define __XTRAPLIB__
-
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
-Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This header file describes all the structures/constants required
- * for interfacing with the client toolkit *except* the common
- * client/extension definitions in xtrapdi.h. Namely, *no* extension-
- * only information or client/extension information can be found here.
- */
-#ifdef SMT
-#define NEED_EVENTS
-#define NEED_REPLIES
-#endif
-#include <nx-X11/Xlib.h>
-#include <nx-X11/Intrinsic.h>
-#include <nx-X11/extensions/xtrapdi.h>
-#include <nx-X11/extensions/xtrapemacros.h>
-
-typedef struct /* Callback structure */
-{
- void_function func;
- BYTE *data;
-} XETrapCB;
-
-/* Data structure for setting trap context */
-typedef struct
-{
- CARD8 tc_flags[2L]; /* Toolkit-side specific flags */
- XETrapCfg v; /* XTrap configuration values */
- XETrapCB *req_cb; /* Pointer to Request Callbacks */
- XETrapCB *evt_cb; /* Pointer to Event Callbacks (starting at 2) */
- CARD32 last_time B32; /* Last (delta) timestamp */
-} XETCValues;
-
- /* bits 0 thru 6 are formerly "families" (now obsolete) */
-#define XETCDeltaTimes 7
-#define XETCTrapActive 8
- /* bits 9 thru 15 are reserved for future expansion */
-
-/* Values bit masks (used when determining what's dirty */
-#define TCStatistics (1L<<0L)
-#define TCRequests (1L<<1L)
-#define TCEvents (1L<<2L)
-#define TCMaxPacket (1L<<3L)
-#define TCCmdKey (1L<<4L)
-#define TCTimeStamps (1L<<5L)
-#define TCWinXY (1L<<6L)
-#define TCXInput (1L<<7L)
-#define TCReqCBs (1L<<8L)
-#define TCEvtCBs (1L<<9L)
-#define TCCursor (1L<<10L)
-#define TCColorReplies (1L<<11L)
-#define TCGrabServer (1L<<12L)
-
-/* This is the representation we use in the library code for XLib transport */
-typedef struct {
- int type;
- unsigned long serial;
- Bool synthetic;
- Display *display;
- int detail;
- unsigned long idx;
- unsigned char data[sz_EventData];
-} XETrapDataEvent;
-
-/* Trap Context structure for maintaining XTrap State for client */
-typedef struct _XETC
-{
- struct _XETC *next; /* Ptr to next linked-listed TC */
- Display *dpy; /* Display ptr of current TC */
- INT32 eventBase /*B32*/; /* First event value */
- INT32 errorBase /*B32*/; /* First error value */
- INT32 extOpcode /*B32*/; /* Major opcode of the extension */
- BYTE *xbuff; /* Pointer to buffer for XLib Communications */
- CARD16 xmax_size /*B16*/; /* Max Size of a request */
- XExtData *ext_data; /* hook for extension to hang data */
- /*
- * The following are initialized with the client-side version number
- * However, when either a GetAvailable or GetVersion reply is received,
- * these values are updated with the *oldest* version numbers.
- */
- CARD16 release /*B16*/; /* The extension release number */
- CARD16 version /*B16*/; /* The xtrap extension version number */
- CARD16 revision /*B16*/; /* The xtrap extension revision number */
- CARD16 protocol /*B16*/; /* The xtrap extension protocol number */
- unsigned dirty /*B32*/; /* cache dirty bits */
- XETCValues values; /* shadow structure of values */
- Boolean (*eventFunc[XETrapNumberEvents])(XETrapDataEvent *event, struct _XETC *tc);
-} XETC;
-
-
-#endif /* __XTRAPLIB__ */
diff --git a/nx-X11/include/extensions/xtraplibp.h b/nx-X11/include/extensions/xtraplibp.h
deleted file mode 100644
index 087ba6e64..000000000
--- a/nx-X11/include/extensions/xtraplibp.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/* $XFree86$ */
-#ifndef __XTRAPLIBP__
-#define __XTRAPLIBP__
-
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991, 1994 by Digital Equipment Corp.,
-Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This header file contains the function prototypes for client/toolkit
- * routines sorted by module (globally defined routines *only*).
- */
-
-/* XEConTxt.c */
-XETC *XECreateTC (Display *dpy , CARD32 valuemask , XETCValues *value );
-int XEChangeTC (XETC *tc , CARD32 mask , XETCValues *values );
-void XEFreeTC (XETC *tc );
-int XETrapSetMaxPacket (XETC *tc , Bool set_flag , CARD16 size );
-int XETrapSetCommandKey (XETC *tc , Bool set_flag , KeySym cmd_key ,
- Bool mod_flag );
-int XETrapSetTimestamps (XETC *tc , Bool set_flag , Bool delta_flag );
-int XETrapSetWinXY (XETC *tc , Bool set_flag );
-int XETrapSetCursor (XETC *tc , Bool set_flag );
-int XETrapSetXInput (XETC *tc , Bool set_flag );
-int XETrapSetColorReplies (XETC *tc , Bool set_flag );
-int XETrapSetGrabServer (XETC *tc , Bool set_flag );
-int XETrapSetStatistics (XETC *tc , Bool set_flag );
-int XETrapSetRequests (XETC *tc , Bool set_flag , ReqFlags requests );
-int XETrapSetEvents (XETC *tc , Bool set_flag , EventFlags events );
-Bool XESetCmdGateState (XETC *tc , CARD8 type, Bool *gate_closed ,
- CARD8 *next_key , Bool *key_ignore );
-
-/* XERqsts.c */
-int XEFlushConfig (XETC *tc );
-int XEResetRequest (XETC *tc );
-int XEGetVersionRequest (XETC *tc , XETrapGetVersRep *ret );
-int XEGetLastInpTimeRequest (XETC *tc , XETrapGetLastInpTimeRep *ret );
-int XEGetAvailableRequest (XETC *tc , XETrapGetAvailRep *ret );
-int XEStartTrapRequest (XETC *tc );
-int XEStopTrapRequest (XETC *tc );
-int XESimulateXEventRequest (XETC *tc , CARD8 type , CARD8 detail ,
- CARD16 x , CARD16 y , CARD8 screen );
-int XEGetCurrentRequest (XETC *tc , XETrapGetCurRep *ret );
-int XEGetStatisticsRequest (XETC *tc , XETrapGetStatsRep *ret );
-
-/* XECallBcks.c */
-int XEAddRequestCB (XETC *tc , CARD8 req , void_function func , BYTE *data );
-int XEAddRequestCBs (XETC *tc , ReqFlags req_flags , void_function func ,
- BYTE *data );
-int XEAddEventCB (XETC *tc , CARD8 evt , void_function func , BYTE *data );
-int XEAddEventCBs (XETC *tc , EventFlags evt_flags , void_function func ,
- BYTE *data );
-
-/* The following seem to never be used. Perhaps they should be removed */
-void XERemoveRequestCB (XETC *tc, CARD8 req);
-void XERemoveRequestCBs (XETC *tc, ReqFlags req_flags);
-void XERemoveAllRequestCBs (XETC *tc);
-void XERemoveEventCB (XETC *tc, CARD8 evt);
-void XERemoveEventCBs (XETC *tc, EventFlags evt_flags);
-void XERemoveAllEventCBs (XETC *tc);
-
-
-/* XEDsptch.c */
-Boolean XETrapDispatchXLib (XETrapDataEvent *event , XETC *tc);
-
-/* XEWrappers.c */
-Boolean XETrapDispatchEvent (XEvent *pevent , XETC *tc );
-XtInputMask XETrapAppPending (XtAppContext app);
-void XETrapAppMainLoop (XtAppContext app , XETC *tc );
-int XETrapAppWhileLoop (XtAppContext app , XETC *tc , Bool *done );
-int XETrapWaitForSomething (XtAppContext app );
-Boolean (*XETrapSetEventHandler(XETC *tc, CARD32 id, Boolean (*pfunc)(XETrapDataEvent *event, XETC *tc))) (XETrapDataEvent *event, XETC *tc);
-
-/* XEPrInfo.c */
-void XEPrintRelease (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintTkRelease ( FILE *ofp, XETC *tc);
-void XEPrintPlatform (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintAvailFlags (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintAvailPktSz (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintStateFlags (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintMajOpcode (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintCurXY (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintTkFlags (FILE *ofp , XETC *tc );
-void XEPrintLastTime (FILE *ofp , XETC *tc );
-void XEPrintCfgFlags (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintRequests (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintEvents (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintCurPktSz (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintCmdKey (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintEvtStats (FILE *ofp , XETrapGetStatsRep *pstats , XETC *tc);
-void XEPrintReqStats (FILE *ofp , XETrapGetStatsRep *pstats , XETC *tc);
-void XEPrintAvail (FILE *ofp , XETrapGetAvailRep *pavail );
-void XEPrintTkState (FILE *ofp , XETC *tc );
-void XEPrintCurrent (FILE *ofp , XETrapGetCurRep *pcur );
-void XEPrintStatistics (FILE *ofp , XETrapGetStatsRep *pstats, XETC *tc );
-
-/* XEStrMap.c */
-INT16 XEEventStringToID (char *string );
-INT16 XERequestStringToID (char *string );
-CARD32 XEPlatformStringToID (char *string );
-char *XEEventIDToString (CARD8 id , XETC *tc);
-char *XERequestIDToExtString (register CARD8 id , XETC *tc);
-char *XERequestIDToString (CARD8 id , XETC *tc);
-char *XEPlatformIDToString (CARD32 id );
-
-/* XETrapInit.c */
-Bool XETrapQueryExtension (Display *dpy,INT32 *event_base_return,
- INT32 *error_base_return, INT32 *opcode_return);
-
-
-#endif /* __XTRAPLIBP__ */
diff --git a/nx-X11/include/extensions/xtrapproto.h b/nx-X11/include/extensions/xtrapproto.h
deleted file mode 100644
index 7eb8f9d47..000000000
--- a/nx-X11/include/extensions/xtrapproto.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/* $XFree86: xc/include/extensions/xtrapproto.h,v 1.1 2001/11/02 23:29:26 dawes Exp $ */
-
-#ifndef __XTRAPPROTO__
-#define __XTRAPPROTO__
-
-/*****************************************************************************
-Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 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.
-
-*****************************************************************************/
-/*
- *
- * CONTRIBUTORS:
- *
- * Dick Annicchiarico
- * Robert Chesler
- * Dan Coutu
- * Gene Durso
- * Marc Evans
- * Alan Jamison
- * Mark Henry
- * Ken Miller
- *
- * DESCRIPTION:
- * This header file contains the function prototypes for extension
- * routines sorted by module (globally defined routines *only*).
- */
-#ifndef Bool
-# define Bool int
-#endif
-/* xtrapdi.c */
-int XETrapDestroyEnv (void * value , XID id );
-void XETrapCloseDown ( ExtensionEntry *extEntry );
-Bool XETrapRedirectDevices (void );
-void DEC_XTRAPInit (void );
-int XETrapCreateEnv (ClientPtr client );
-int XETrapDispatch (ClientPtr client );
-int sXETrapDispatch (ClientPtr client );
-int XETrapReset (xXTrapReq *request , ClientPtr client );
-int XETrapGetAvailable (xXTrapGetReq *request , ClientPtr client );
-int XETrapGetCurrent (xXTrapReq *request , ClientPtr client );
-int XETrapGetStatistics (xXTrapReq *request , ClientPtr client );
-int XETrapConfig (xXTrapConfigReq *request , ClientPtr client );
-int XETrapStartTrap (xXTrapReq *request , ClientPtr client );
-int XETrapStopTrap (xXTrapReq *request , ClientPtr client );
-int XETrapGetVersion (xXTrapGetReq *request , ClientPtr client );
-int XETrapGetLastInpTime (xXTrapReq *request , ClientPtr client );
-int XETrapRequestVector (ClientPtr client );
-int XETrapKeyboard (xEvent *x_event , DevicePtr keybd , int count );
-#ifndef VECTORED_EVENTS
-int XETrapPointer (xEvent *x_event , DevicePtr ptrdev , int count );
-#else
-int XETrapEventVector (ClientPtr client , xEvent *x_event );
-#endif
-void XETrapStampAndMail (xEvent *x_event );
-void sReplyXTrapDispatch (ClientPtr client , int size , char *reply );
-int XETrapWriteXLib (XETrapEnv *penv , BYTE *data , CARD32 nbytes );
-
-/* xtrapddmi.c */
-void XETrapPlatformSetup (void );
-int XETrapSimulateXEvent (xXTrapInputReq *request , ClientPtr client );
-
-/* xtrapdiswap.c */
-int sXETrapReset (xXTrapReq *request , ClientPtr client );
-int sXETrapGetAvailable (xXTrapGetReq *request , ClientPtr client );
-int sXETrapConfig (xXTrapConfigReq *request , ClientPtr client );
-int sXETrapStartTrap (xXTrapReq *request , ClientPtr client );
-int sXETrapStopTrap (xXTrapReq *request , ClientPtr client );
-int sXETrapGetCurrent (xXTrapReq *request , ClientPtr client );
-int sXETrapGetStatistics (xXTrapReq *request , ClientPtr client );
-int sXETrapSimulateXEvent (xXTrapInputReq *request , ClientPtr client );
-int sXETrapGetVersion (xXTrapGetReq *request , ClientPtr client );
-int sXETrapGetLastInpTime (xXTrapReq *request , ClientPtr client );
-void sReplyXETrapGetAvail (ClientPtr client , int size , char *reply );
-void sReplyXETrapGetVers (ClientPtr client , int size , char *reply );
-void sReplyXETrapGetLITim (ClientPtr client , int size , char *reply );
-void sReplyXETrapGetCur (ClientPtr client , int size , char *reply );
-void sReplyXETrapGetStats (ClientPtr client , int size , char *reply );
-void sXETrapHeader (XETrapHeader *hdr );
-void XETSwSimpleReq (xReq *data );
-void XETSwResourceReq (xResourceReq *data );
-void XETSwCreateWindow (xCreateWindowReq *data , ClientPtr client );
-void XETSwChangeWindowAttributes (xChangeWindowAttributesReq *data , ClientPtr client );
-void XETSwReparentWindow (xReparentWindowReq *data );
-void XETSwConfigureWindow (xConfigureWindowReq *data , ClientPtr client );
-void XETSwInternAtom (xInternAtomReq *data );
-void XETSwChangeProperty (xChangePropertyReq *data );
-void XETSwDeleteProperty (xDeletePropertyReq *data );
-void XETSwGetProperty (xGetPropertyReq *data );
-void XETSwSetSelectionOwner (xSetSelectionOwnerReq *data );
-void XETSwConvertSelection (xConvertSelectionReq *data );
-void XETSwSendEvent (xSendEventReq *data );
-void XETSwGrabPointer (xGrabPointerReq *data );
-void XETSwGrabButton (xGrabButtonReq *data );
-void XETSwUngrabButton (xUngrabButtonReq *data );
-void XETSwChangeActivePointerGrab (xChangeActivePointerGrabReq *data );
-void XETSwGrabKeyboard (xGrabKeyboardReq *data );
-void XETSwGrabKey (xGrabKeyReq *data );
-void XETSwUngrabKey (xUngrabKeyReq *data );
-void XETSwGetMotionEvents (xGetMotionEventsReq *data );
-void XETSwTranslateCoords (xTranslateCoordsReq *data );
-void XETSwWarpPointer (xWarpPointerReq *data );
-void XETSwSetInputFocus (xSetInputFocusReq *data );
-void XETSwOpenFont (xOpenFontReq *data );
-void XETSwListFonts (xListFontsReq *data );
-void XETSwListFontsWithInfo (xListFontsWithInfoReq *data );
-void XETSwSetFontPath (xSetFontPathReq *data );
-void XETSwCreatePixmap (xCreatePixmapReq *data );
-void XETSwCreateGC (xCreateGCReq *data , ClientPtr client );
-void XETSwChangeGC (xChangeGCReq *data , ClientPtr client );
-void XETSwCopyGC (xCopyGCReq *data );
-void XETSwSetDashes (xSetDashesReq *data );
-void XETSwSetClipRectangles (xSetClipRectanglesReq *data , ClientPtr client );
-void XETSwClearToBackground (xClearAreaReq *data );
-void XETSwCopyArea (xCopyAreaReq *data );
-void XETSwCopyPlane (xCopyPlaneReq *data );
-void XETSwPoly (xPolyPointReq *data , ClientPtr client );
-void XETSwFillPoly (xFillPolyReq *data , ClientPtr client );
-void XETSwPutImage (xPutImageReq *data );
-void XETSwGetImage (xGetImageReq *data );
-void XETSwPolyText (xPolyTextReq *data );
-void XETSwImageText (xImageTextReq *data );
-void XETSwCreateColormap (xCreateColormapReq *data );
-void XETSwCopyColormapAndFree (xCopyColormapAndFreeReq *data );
-void XETSwAllocColor (xAllocColorReq *data );
-void XETSwAllocNamedColor (xAllocNamedColorReq *data );
-void XETSwAllocColorCells (xAllocColorCellsReq *data );
-void XETSwAllocColorPlanes (xAllocColorPlanesReq *data );
-void XETSwFreeColors (xFreeColorsReq *data , ClientPtr client );
-void XETSwStoreColors (xStoreColorsReq *data , ClientPtr client );
-void XETSwStoreNamedColor (xStoreNamedColorReq *data );
-void XETSwQueryColors (xQueryColorsReq *data , ClientPtr client );
-void XETSwLookupColor (xLookupColorReq *data );
-void XETSwCreateCursor (xCreateCursorReq *data );
-void XETSwCreateGlyphCursor (xCreateGlyphCursorReq *data );
-void XETSwRecolorCursor (xRecolorCursorReq *data );
-void XETSwQueryBestSize (xQueryBestSizeReq *data );
-void XETSwQueryExtension (xQueryExtensionReq *data );
-void XETSwChangeKeyboardMapping (xChangeKeyboardMappingReq *data );
-void XETSwChangeKeyboardControl (xChangeKeyboardControlReq *data , ClientPtr client );
-void XETSwChangePointerControl (xChangePointerControlReq *data );
-void XETSwSetScreenSaver (xSetScreenSaverReq *data );
-void XETSwChangeHosts (xChangeHostsReq *data );
-void XETSwRotateProperties (xRotatePropertiesReq *data , ClientPtr client );
-void XETSwNoOperation (xReq *data );
-#ifdef vms
-void SwapLongs (long *list , unsigned long count );
-void SwapShorts (short *list , unsigned long count );
-int SwapColorItem (xColorItem *pItem );
-#endif /* vms */
-
-
-#endif /* __XTRAPPROTO__ */