mirror of
https://gitlab.freedesktop.org/xorg/proto/xorgproto.git
synced 2026-05-08 19:28:02 +02:00
shape: remove shape.h, split into shapeconst.h
Rename shapestr.h to shapeproto.h
This commit is contained in:
Peter Hutterer
parent
7cfdafd5ec
commit
35ec266909
4 changed files with 75 additions and 193 deletions
|
|
@ -12,8 +12,8 @@ xext_HEADERS = \
|
|||
multibufproto.h \
|
||||
secur.h \
|
||||
securproto.h \
|
||||
shape.h \
|
||||
shapestr.h \
|
||||
shapeconst.h \
|
||||
shapeproto.h \
|
||||
shm.h \
|
||||
shmproto.h \
|
||||
sync.h \
|
||||
|
|
|
|||
180
shape.h
180
shape.h
|
|
@ -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 <X11/Xfuncproto.h>
|
||||
|
||||
#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 <X11/Xutil.h>
|
||||
|
||||
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_ */
|
||||
57
shapeconst.h
Normal file
57
shapeconst.h
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
/************************************************************
|
||||
|
||||
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 _SHAPECONST_H_
|
||||
#define _SHAPECONST_H_
|
||||
|
||||
/*
|
||||
* Protocol requests constants and alignment values
|
||||
* These would really be in SHAPE's X.h and Xproto.h equivalents
|
||||
*/
|
||||
|
||||
#define SHAPENAME "SHAPE"
|
||||
|
||||
#define SHAPE_MAJOR_VERSION 1 /* current version numbers */
|
||||
#define SHAPE_MINOR_VERSION 1
|
||||
|
||||
#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)
|
||||
|
||||
#endif /* _SHAPECONST_H_ */
|
||||
|
|
@ -26,23 +26,28 @@ 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_
|
||||
#ifndef _SHAPEPROTO_H_
|
||||
#define _SHAPEPROTO_H_
|
||||
|
||||
#include <X11/extensions/shapeconst.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
|
||||
#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
|
||||
|
||||
typedef struct _ShapeQueryVersion {
|
||||
CARD8 reqType; /* always ShapeReqCode */
|
||||
|
|
@ -95,7 +100,7 @@ typedef struct _ShapeMask {
|
|||
CARD32 src B32; /* 1 bit pixmap */
|
||||
} xShapeMaskReq;
|
||||
#define sz_xShapeMaskReq 20
|
||||
|
||||
|
||||
typedef struct _ShapeCombine {
|
||||
CARD8 reqType; /* always ShapeReqCode */
|
||||
CARD8 shapeReqType; /* always X_ShapeCombine */
|
||||
|
|
@ -110,7 +115,7 @@ typedef struct _ShapeCombine {
|
|||
Window src B32;
|
||||
} xShapeCombineReq;
|
||||
#define sz_xShapeCombineReq 20
|
||||
|
||||
|
||||
typedef struct _ShapeOffset {
|
||||
CARD8 reqType; /* always ShapeReqCode */
|
||||
CARD8 shapeReqType; /* always X_ShapeOffset */
|
||||
|
|
@ -231,4 +236,4 @@ typedef struct {
|
|||
#undef Window
|
||||
#undef Time
|
||||
|
||||
#endif /* _SHAPESTR_H_ */
|
||||
#endif /* _SHAPEPROTO_H_ */
|
||||
Loading…
Add table
Reference in a new issue