summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-06-25 10:46:33 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-16 11:29:45 +1000
commitc63abdd1eb7bc1d8ae4e25073ef2f29d94991e2b (patch)
treeade6c1884c30f6dee7112dfeead465f81abe494d
parent0adb09e032e3bd56426620b19438be9c0c66dd54 (diff)
XShm: remove XShm.h library header, split into shm.h, shmproto.h
Removing Xlib function prototypes. Move extension name to shm.h Move protocol request opcodes to shmproto.h
-rw-r--r--Makefile.am4
-rw-r--r--XShm.h161
-rw-r--r--shm.h45
-rw-r--r--shmproto.h (renamed from shmstr.h)53
4 files changed, 59 insertions, 204 deletions
diff --git a/Makefile.am b/Makefile.am
index 11a2bad..0b5d7c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,8 @@ xext_HEADERS = \
securstr.h \
shape.h \
shapestr.h \
- shmstr.h \
+ shm.h \
+ shmproto.h \
sync.h \
syncstr.h \
Xag.h \
@@ -28,7 +29,6 @@ xext_HEADERS = \
EVI.h \
EVIproto.h \
Xext.h \
- XShm.h \
xtestext1.h \
XTest.h \
xteststr.h
diff --git a/XShm.h b/XShm.h
deleted file mode 100644
index 4ae14ca..0000000
--- a/XShm.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* $XFree86: xc/include/extensions/XShm.h,v 1.11 2003/04/03 15:11:07 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.
-
-********************************************************/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-/* $Xorg: XShm.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _XSHM_H_
-#define _XSHM_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_ShmQueryVersion 0
-#define X_ShmAttach 1
-#define X_ShmDetach 2
-#define X_ShmPutImage 3
-#define X_ShmGetImage 4
-#define X_ShmCreatePixmap 5
-
-#define ShmCompletion 0
-#define ShmNumberEvents (ShmCompletion + 1)
-
-#define BadShmSeg 0
-#define ShmNumberErrors (BadShmSeg + 1)
-
-typedef unsigned long ShmSeg;
-
-#ifndef _XSHM_SERVER_
-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 */
- Drawable drawable; /* drawable of request */
- int major_code; /* ShmReqCode */
- int minor_code; /* X_ShmPutImage */
- ShmSeg shmseg; /* the ShmSeg used in the request */
- unsigned long offset; /* the offset into ShmSeg used in the request */
-} XShmCompletionEvent;
-
-typedef struct {
- ShmSeg shmseg; /* resource id */
- int shmid; /* kernel id */
- char *shmaddr; /* address in client */
- Bool readOnly; /* how the server should attach it */
-} XShmSegmentInfo;
-
-_XFUNCPROTOBEGIN
-
-Bool XShmQueryExtension(
- Display* /* dpy */
-);
-
-int XShmGetEventBase(
- Display* /* dpy */
-);
-
-Bool XShmQueryVersion(
- Display* /* dpy */,
- int* /* majorVersion */,
- int* /* minorVersion */,
- Bool* /* sharedPixmaps */
-);
-
-int XShmPixmapFormat(
- Display* /* dpy */
-);
-
-Status XShmAttach(
- Display* /* dpy */,
- XShmSegmentInfo* /* shminfo */
-);
-
-Status XShmDetach(
- Display* /* dpy */,
- XShmSegmentInfo* /* shminfo */
-);
-
-Status XShmPutImage(
- Display* /* dpy */,
- Drawable /* d */,
- GC /* gc */,
- XImage* /* image */,
- int /* src_x */,
- int /* src_y */,
- int /* dst_x */,
- int /* dst_y */,
- unsigned int /* src_width */,
- unsigned int /* src_height */,
- Bool /* send_event */
-);
-
-Status XShmGetImage(
- Display* /* dpy */,
- Drawable /* d */,
- XImage* /* image */,
- int /* x */,
- int /* y */,
- unsigned long /* plane_mask */
-);
-
-XImage *XShmCreateImage(
- Display* /* dpy */,
- Visual* /* visual */,
- unsigned int /* depth */,
- int /* format */,
- char* /* data */,
- XShmSegmentInfo* /* shminfo */,
- unsigned int /* width */,
- unsigned int /* height */
-);
-
-Pixmap XShmCreatePixmap(
- Display* /* dpy */,
- Drawable /* d */,
- char* /* data */,
- XShmSegmentInfo* /* shminfo */,
- unsigned int /* width */,
- unsigned int /* height */,
- unsigned int /* depth */
-);
-
-_XFUNCPROTOEND
-
-#else /* _XSHM_SERVER_ */
-
-#include "screenint.h"
-#include "pixmap.h"
-#include "gc.h"
-
-extern void ShmRegisterFbFuncs(
- ScreenPtr /* pScreen */
-);
-
-#endif
-
-#endif
diff --git a/shm.h b/shm.h
new file mode 100644
index 0000000..37d616e
--- /dev/null
+++ b/shm.h
@@ -0,0 +1,45 @@
+/* $XFree86: xc/include/extensions/shmstr.h,v 3.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.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _SHM_H_
+#define _SHM_H_
+
+#define SHMNAME "MIT-SHM"
+
+#define SHM_MAJOR_VERSION 1 /* current version numbers */
+#define SHM_MINOR_VERSION 1
+
+#define ShmCompletion 0
+#define ShmNumberEvents (ShmCompletion + 1)
+
+#define BadShmSeg 0
+#define ShmNumberErrors (BadShmSeg + 1)
+
+
+#endif /* _SHM_H_ */
diff --git a/shmstr.h b/shmproto.h
index b15538d..1e2ee86 100644
--- a/shmstr.h
+++ b/shmproto.h
@@ -27,12 +27,10 @@ in this Software without prior written authorization from The Open Group.
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-#ifndef _SHMSTR_H_
-#define _SHMSTR_H_
+#ifndef _SHMPROTO_H_
+#define _SHMPROTO_H_
-/* $Xorg: shmstr.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#include "XShm.h"
+#include <X11/extensions/shm.h>
#define ShmSeg CARD32
#define Drawable CARD32
@@ -40,39 +38,12 @@ in this Software without prior written authorization from The Open Group.
#define GContext CARD32
#define Pixmap CARD32
-#define SHMNAME "MIT-SHM"
-
-#define SHM_MAJOR_VERSION 1 /* current version numbers */
-#define SHM_MINOR_VERSION 1
-
-#ifdef _XSHM_SERVER_
-#define XSHM_PUT_IMAGE_ARGS \
- DrawablePtr /* dst */, \
- GCPtr /* pGC */, \
- int /* depth */, \
- unsigned int /* format */, \
- int /* w */, \
- int /* h */, \
- int /* sx */, \
- int /* sy */, \
- int /* sw */, \
- int /* sh */, \
- int /* dx */, \
- int /* dy */, \
- char * /* data */
-
-#define XSHM_CREATE_PIXMAP_ARGS \
- ScreenPtr /* pScreen */, \
- int /* width */, \
- int /* height */, \
- int /* depth */, \
- char * /* addr */
-
-typedef struct _ShmFuncs {
- PixmapPtr (* CreatePixmap)(XSHM_CREATE_PIXMAP_ARGS);
- void (* PutImage)(XSHM_PUT_IMAGE_ARGS);
-} ShmFuncs, *ShmFuncsPtr;
-#endif
+#define X_ShmQueryVersion 0
+#define X_ShmAttach 1
+#define X_ShmDetach 2
+#define X_ShmPutImage 3
+#define X_ShmGetImage 4
+#define X_ShmCreatePixmap 5
typedef struct _ShmQueryVersion {
CARD8 reqType; /* always ShmReqCode */
@@ -139,7 +110,7 @@ typedef struct _ShmPutImage {
CARD8 bpad;
ShmSeg shmseg B32;
CARD32 offset B32;
-} xShmPutImageReq;
+} xShmPutImageReq;
#define sz_xShmPutImageReq 40
typedef struct _ShmGetImage {
@@ -158,7 +129,7 @@ typedef struct _ShmGetImage {
CARD8 pad2;
ShmSeg shmseg B32;
CARD32 offset B32;
-} xShmGetImageReq;
+} xShmGetImageReq;
#define sz_xShmGetImageReq 32
typedef struct _ShmGetImageReply {
@@ -214,4 +185,4 @@ typedef struct _ShmCompletion {
#undef GContext
#undef Pixmap
-#endif /* _SHMSTR_H_ */
+#endif /* _SHMPROTO_H_ */