From e77e37ff0f97a5845fa0c634e978361541d7991f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Fri, 1 Jul 2016 00:05:30 +0200 Subject: remove XShape code from libNX_Xext use system libXext instead --- nx-X11/include/extensions/Imakefile | 1 - nx-X11/include/extensions/shape.h | 180 ------------------------ nx-X11/include/extensions/shapestr.h | 234 -------------------------------- nx-X11/include/extensions/xfixesproto.h | 2 +- 4 files changed, 1 insertion(+), 416 deletions(-) delete mode 100644 nx-X11/include/extensions/shape.h delete mode 100644 nx-X11/include/extensions/shapestr.h (limited to 'nx-X11/include') diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 9f03df68c..3a26bed58 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -67,7 +67,6 @@ HEADERS = Xext.h \ $(EXTRAHEADERS) \ record.h recordstr.h \ security.h securstr.h \ - shape.h shapestr.h \ sync.h syncstr.h \ dpms.h dpmsstr.h \ $(NULL) diff --git a/nx-X11/include/extensions/shape.h b/nx-X11/include/extensions/shape.h deleted file mode 100644 index 5e85ffc04..000000000 --- a/nx-X11/include/extensions/shape.h +++ /dev/null @@ -1,180 +0,0 @@ -/* $XFree86: xc/include/extensions/shape.h,v 1.3 2001/12/14 19:53:29 dawes 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. - -********************************************************/ - -/* $Xorg: shape.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - -#ifndef _SHAPE_H_ -#define _SHAPE_H_ - -#include - -#define X_ShapeQueryVersion 0 -#define X_ShapeRectangles 1 -#define X_ShapeMask 2 -#define X_ShapeCombine 3 -#define X_ShapeOffset 4 -#define X_ShapeQueryExtents 5 -#define X_ShapeSelectInput 6 -#define X_ShapeInputSelected 7 -#define X_ShapeGetRectangles 8 - -#define ShapeSet 0 -#define ShapeUnion 1 -#define ShapeIntersect 2 -#define ShapeSubtract 3 -#define ShapeInvert 4 - -#define ShapeBounding 0 -#define ShapeClip 1 -#define ShapeInput 2 - -#define ShapeNotifyMask (1L << 0) -#define ShapeNotify 0 - -#define ShapeNumberEvents (ShapeNotify + 1) - -#ifndef _SHAPE_SERVER_ - -#include - -typedef struct { - int type; /* of event */ - unsigned long serial; /* # of last request processed by server */ - Bool send_event; /* true if this came frome a SendEvent request */ - Display *display; /* Display the event was read from */ - Window window; /* window of event */ - int kind; /* ShapeBounding or ShapeClip */ - int x, y; /* extents of new region */ - unsigned width, height; - Time time; /* server timestamp when region changed */ - Bool shaped; /* true if the region exists */ -} XShapeEvent; - -_XFUNCPROTOBEGIN - -extern Bool XShapeQueryExtension ( - Display* /* display */, - int* /* event_base */, - int* /* error_base */ -); - -extern Status XShapeQueryVersion ( - Display* /* display */, - int* /* major_version */, - int* /* minor_version */ -); - -extern void XShapeCombineRegion ( - Display* /* display */, - Window /* dest */, - int /* dest_kind */, - int /* x_off */, - int /* y_off */, - Region /* region */, - int /* op */ -); - -extern void XShapeCombineRectangles ( - Display* /* display */, - Window /* dest */, - int /* dest_kind */, - int /* x_off */, - int /* y_off */, - XRectangle* /* rectangles */, - int /* n_rects */, - int /* op */, - int /* ordering */ -); - -extern void XShapeCombineMask ( - Display* /* display */, - Window /* dest */, - int /* dest_kind */, - int /* x_off */, - int /* y_off */, - Pixmap /* src */, - int /* op */ -); - -extern void XShapeCombineShape ( - Display* /* display */, - Window /* dest */, - int /* dest_kind */, - int /* x_off */, - int /* y_off */, - Window /* src */, - int /* src_kind */, - int /* op */ -); - -extern void XShapeOffsetShape ( - Display* /* display */, - Window /* dest */, - int /* dest_kind */, - int /* x_off */, - int /* y_off */ -); - -extern Status XShapeQueryExtents ( - Display* /* display */, - Window /* window */, - Bool* /* bounding_shaped */, - int* /* x_bounding */, - int* /* y_bounding */, - unsigned int* /* w_bounding */, - unsigned int* /* h_bounding */, - Bool* /* clip_shaped */, - int* /* x_clip */, - int* /* y_clip */, - unsigned int* /* w_clip */, - unsigned int* /* h_clip */ -); - -extern void XShapeSelectInput ( - Display* /* display */, - Window /* window */, - unsigned long /* mask */ -); - -extern unsigned long XShapeInputSelected ( - Display* /* display */, - Window /* window */ -); - -extern XRectangle *XShapeGetRectangles ( - Display* /* display */, - Window /* window */, - int /* kind */, - int* /* count */, - int* /* ordering */ -); - -_XFUNCPROTOEND - -#endif /* _SHAPE_SERVER_ */ - -#endif /* _SHAPE_H_ */ diff --git a/nx-X11/include/extensions/shapestr.h b/nx-X11/include/extensions/shapestr.h deleted file mode 100644 index 4742ba8e9..000000000 --- a/nx-X11/include/extensions/shapestr.h +++ /dev/null @@ -1,234 +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. - -********************************************************/ - -/* $Xorg: shapestr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */ - -#ifndef _SHAPESTR_H_ -#define _SHAPESTR_H_ - -/* - * Protocol requests constants and alignment values - * These would really be in SHAPE's X.h and Xproto.h equivalents - */ - -#include "shape.h" - -#define Window CARD32 -#define Time CARD32 - -#define SHAPENAME "SHAPE" - -#define SHAPE_MAJOR_VERSION 1 /* current version numbers */ -#define SHAPE_MINOR_VERSION 1 - -typedef struct _ShapeQueryVersion { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeQueryVersion */ - CARD16 length B16; -} xShapeQueryVersionReq; -#define sz_xShapeQueryVersionReq 4 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; - CARD16 majorVersion B16; /* major version of SHAPE protocol */ - CARD16 minorVersion B16; /* minor version of SHAPE protocol */ - CARD32 pad0 B32; - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; -} xShapeQueryVersionReply; -#define sz_xShapeQueryVersionReply 32 - -typedef struct _ShapeRectangles { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeRectangles */ - CARD16 length B16; - CARD8 op; /* Set, ... */ - CARD8 destKind; /* ShapeBounding or ShapeClip */ - CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */ - CARD8 pad0; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; -} xShapeRectanglesReq; /* followed by xRects */ -#define sz_xShapeRectanglesReq 16 - -typedef struct _ShapeMask { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeMask */ - CARD16 length B16; - - CARD8 op; /* Set, ... */ - CARD8 destKind; /* ShapeBounding or ShapeClip */ - CARD16 junk B16; /* not used */ - - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; - CARD32 src B32; /* 1 bit pixmap */ -} xShapeMaskReq; -#define sz_xShapeMaskReq 20 - -typedef struct _ShapeCombine { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeCombine */ - CARD16 length B16; - CARD8 op; /* Set, ... */ - CARD8 destKind; /* ShapeBounding or ShapeClip */ - CARD8 srcKind; /* ShapeBounding or ShapeClip */ - CARD8 junk; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; - Window src B32; -} xShapeCombineReq; -#define sz_xShapeCombineReq 20 - -typedef struct _ShapeOffset { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeOffset */ - CARD16 length B16; - CARD8 destKind; /* ShapeBounding or ShapeClip */ - CARD8 junk1; /* not used */ - CARD16 junk2 B16; /* not used */ - Window dest B32; - INT16 xOff B16; - INT16 yOff B16; -} xShapeOffsetReq; -#define sz_xShapeOffsetReq 16 - -typedef struct _ShapeQueryExtents { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeQueryExtents */ - CARD16 length B16; - Window window B32; -} xShapeQueryExtentsReq; -#define sz_xShapeQueryExtentsReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 unused; /* not used */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD8 boundingShaped; /* window has bounding shape */ - CARD8 clipShaped; /* window has clip shape */ - CARD16 unused1 B16; - INT16 xBoundingShape B16; /* extents of bounding shape */ - INT16 yBoundingShape B16; - CARD16 widthBoundingShape B16; - CARD16 heightBoundingShape B16; - INT16 xClipShape B16; /* extents of clip shape */ - INT16 yClipShape B16; - CARD16 widthClipShape B16; - CARD16 heightClipShape B16; - CARD32 pad1 B32; -} xShapeQueryExtentsReply; -#define sz_xShapeQueryExtentsReply 32 - -typedef struct _ShapeSelectInput { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeSelectInput */ - CARD16 length B16; - Window window B32; - BYTE enable; /* xTrue -> send events */ - BYTE pad1; - CARD16 pad2 B16; -} xShapeSelectInputReq; -#define sz_xShapeSelectInputReq 12 - -typedef struct _ShapeNotify { - BYTE type; /* always eventBase + ShapeNotify */ - BYTE kind; /* either ShapeBounding or ShapeClip */ - CARD16 sequenceNumber B16; - Window window B32; - INT16 x B16; - INT16 y B16; /* extents of new shape */ - CARD16 width B16; - CARD16 height B16; - Time time B32; /* time of change */ - BYTE shaped; /* set when a shape actual exists */ - BYTE pad0; - CARD16 pad1 B16; - CARD32 pad2 B32; - CARD32 pad3 B32; -} xShapeNotifyEvent; -#define sz_xShapeNotifyEvent 32 - -typedef struct _ShapeInputSelected { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeInputSelected */ - CARD16 length B16; - Window window B32; -} xShapeInputSelectedReq; -#define sz_xShapeInputSelectedReq 8 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 enabled; /* current status */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* 0 */ - CARD32 pad1 B32; /* unused */ - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; - CARD32 pad6 B32; -} xShapeInputSelectedReply; -#define sz_xShapeInputSelectedReply 32 - -typedef struct _ShapeGetRectangles { - CARD8 reqType; /* always ShapeReqCode */ - CARD8 shapeReqType; /* always X_ShapeGetRectangles */ - CARD16 length B16; - Window window B32; - CARD8 kind; /* ShapeBounding or ShapeClip */ - CARD8 junk1; - CARD16 junk2 B16; -} xShapeGetRectanglesReq; -#define sz_xShapeGetRectanglesReq 12 - -typedef struct { - BYTE type; /* X_Reply */ - CARD8 ordering; /* UnSorted, YSorted, YXSorted, YXBanded */ - CARD16 sequenceNumber B16; - CARD32 length B32; /* not zero */ - CARD32 nrects B32; /* number of rectangles */ - CARD32 pad1 B32; - CARD32 pad2 B32; - CARD32 pad3 B32; - CARD32 pad4 B32; - CARD32 pad5 B32; -} xShapeGetRectanglesReply; /* followed by xRectangles */ -#define sz_xShapeGetRectanglesReply 32 - -#undef Window -#undef Time - -#endif /* _SHAPESTR_H_ */ diff --git a/nx-X11/include/extensions/xfixesproto.h b/nx-X11/include/extensions/xfixesproto.h index 0ef6a2fd6..b3f35e878 100644 --- a/nx-X11/include/extensions/xfixesproto.h +++ b/nx-X11/include/extensions/xfixesproto.h @@ -28,7 +28,7 @@ #include #include #define _SHAPE_SERVER_ -#include +#include #undef _SHAPE_SERVER_ #define Window CARD32 -- cgit v1.2.3