summaryrefslogtreecommitdiff
path: root/Xext/shmint.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-15 16:51:05 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-15 17:00:05 +1000
commitd3f6b43a240eb763025b3cbf546cb7ae502c94fa (patch)
tree39efc86bdd824630252af780b2d0c78b09f74c75 /Xext/shmint.h
parent693babbf12cc7969c3e211c4037c7af0d41c13e9 (diff)
Update to xextproto 7.0.99.1.
xextproto had Xlib client headers moved into libXext. Protocol header files are named fooproto.h, header files with constants foo.h or fooconst.h where foo.h was already in use for client-side headers.
Diffstat (limited to 'Xext/shmint.h')
-rw-r--r--Xext/shmint.h30
1 files changed, 28 insertions, 2 deletions
diff --git a/Xext/shmint.h b/Xext/shmint.h
index ec1688d53..8f8a00d4f 100644
--- a/Xext/shmint.h
+++ b/Xext/shmint.h
@@ -23,13 +23,39 @@
#ifndef _SHMINT_H_
#define _SHMINT_H_
-#define _XSHM_SERVER_
-#include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
#include "screenint.h"
#include "pixmap.h"
#include "gc.h"
+#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;
+
extern _X_EXPORT void
ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);