Merge remote branch 'xf86rushproto/master'

8 files changed, 362 insertions, 0 deletions

diff --git a/xf86rushproto/.gitignore b/xf86rushproto/.gitignore
new file mode 100644
index 0000000..2747e9f
--- /dev/null
+++ b/xf86rushproto/.gitignore
@@ -0,0 +1,14 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+xf86rushproto.pc
+*~
+xf86rushproto-*.tar.*
+ChangeLog
+tags
diff --git a/xf86rushproto/COPYING b/xf86rushproto/COPYING
new file mode 100644
index 0000000..9f1e999
--- /dev/null
+++ b/xf86rushproto/COPYING
@@ -0,0 +1,20 @@
+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 THE
+XFREE86 PROJECT 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 XFree86 Project 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 XFree86 Project.
diff --git a/xf86rushproto/Makefile.am b/xf86rushproto/Makefile.am
new file mode 100644
index 0000000..a3c3ccf
--- /dev/null
+++ b/xf86rushproto/Makefile.am
@@ -0,0 +1,19 @@
+xf86rushdir = $(includedir)/X11/extensions
+xf86rush_HEADERS = \
+	xf86rush.h \
+	xf86rushstr.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xf86rushproto.pc
+
+EXTRA_DIST = xf86rushproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/xf86rushproto/autogen.sh b/xf86rushproto/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/xf86rushproto/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/xf86rushproto/configure.ac b/xf86rushproto/configure.ac
new file mode 100644
index 0000000..5606f90
--- /dev/null
+++ b/xf86rushproto/configure.ac
@@ -0,0 +1,12 @@
+AC_PREREQ([2.57])
+AC_INIT([XF86RushProto], [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+
+AC_OUTPUT([Makefile
+           xf86rushproto.pc])
diff --git a/xf86rushproto/xf86rush.h b/xf86rushproto/xf86rush.h
new file mode 100644
index 0000000..1db7d13
--- /dev/null
+++ b/xf86rushproto/xf86rush.h
@@ -0,0 +1,113 @@
+/* $XFree86: xc/include/extensions/xf86rush.h,v 1.4 2000/02/29 03:09:00 dawes Exp $ */
+/*
+
+Copyright (c) 1998  Daryll Strauss
+
+*/
+
+#ifndef _XF86RUSH_H_
+#define _XF86RUSH_H_
+
+#include <X11/extensions/Xv.h>
+#include <X11/Xfuncproto.h>
+
+#define X_XF86RushQueryVersion		0
+#define X_XF86RushLockPixmap		1
+#define X_XF86RushUnlockPixmap		2
+#define X_XF86RushUnlockAllPixmaps	3
+#define X_XF86RushGetCopyMode		4
+#define X_XF86RushSetCopyMode		5
+#define X_XF86RushGetPixelStride	6
+#define X_XF86RushSetPixelStride	7
+#define X_XF86RushOverlayPixmap		8
+#define X_XF86RushStatusRegOffset	9
+#define X_XF86RushAT3DEnableRegs	10
+#define X_XF86RushAT3DDisableRegs	11
+
+#define XF86RushNumberEvents		0
+
+#define XF86RushClientNotLocal		0
+#define XF86RushNumberErrors		(XF86RushClientNotLocal + 1)
+
+#ifndef _XF86RUSH_SERVER_
+
+_XFUNCPROTOBEGIN
+
+Bool XF86RushQueryVersion(
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+);
+
+Bool XF86RushQueryExtension(
+    Display*		/* dpy */,
+    int*		/* event_base */,
+    int*		/* error_base */
+);
+
+Bool XF86RushLockPixmap(
+    Display *		/* dpy */,
+    int			/* screen */,
+    Pixmap		/* Pixmap */,
+    void **		/* Return address */
+);
+
+Bool XF86RushUnlockPixmap(
+    Display *		/* dpy */,
+    int			/* screen */,
+    Pixmap		/* Pixmap */
+); 
+
+Bool XF86RushUnlockAllPixmaps(
+    Display *		/* dpy */
+);
+
+Bool XF86RushSetCopyMode(
+    Display *		/* dpy */,
+    int			/* screen */,
+    int			/* copy mode */
+);
+
+Bool XF86RushSetPixelStride(
+    Display *		/* dpy */,
+    int			/* screen */,
+    int			/* pixel stride */
+);
+
+Bool XF86RushOverlayPixmap(
+    Display *		/* dpy */,
+    XvPortID		/* port */,
+    Drawable		/* d */,
+    GC			/* gc */,
+    Pixmap		/* pixmap */,
+    int			/* src_x */,
+    int			/* src_y */,
+    unsigned int	/* src_w */,
+    unsigned int	/* src_h */,
+    int			/* dest_x */,
+    int			/* dest_y */,
+    unsigned int	/* dest_w */,
+    unsigned int	/* dest_h */,
+    unsigned int	/* id */
+);
+
+int XF86RushStatusRegOffset(
+    Display *		/* dpy */,
+    int			/* screen */
+);
+
+Bool XF86RushAT3DEnableRegs(
+    Display *		/* dpy */,
+    int			/* screen */
+);
+
+Bool XF86RushAT3DDisableRegs(
+    Display *		/* dpy */,
+    int			/* screen */
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XF86RUSH_SERVER_ */
+
+#endif /* _XF86RUSH_H_ */
diff --git a/xf86rushproto/xf86rushproto.pc.in b/xf86rushproto/xf86rushproto.pc.in
new file mode 100644
index 0000000..deb5615
--- /dev/null
+++ b/xf86rushproto/xf86rushproto.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XF86RushProto
+Description: XF86Rush extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
diff --git a/xf86rushproto/xf86rushstr.h b/xf86rushproto/xf86rushstr.h
new file mode 100644
index 0000000..8dca46a
--- /dev/null
+++ b/xf86rushproto/xf86rushstr.h
@@ -0,0 +1,163 @@
+/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.4 2000/02/29 03:09:02 dawes Exp $ */
+/*
+
+Copyright (c) 1998  Daryll Strauss
+
+*/
+
+#ifndef _XF86RUSHSTR_H_
+#define _XF86RUSHSTR_H_
+
+#include <X11/extensions/xf86rush.h>
+
+#define XF86RUSHNAME "XFree86-Rush"
+
+#define XF86RUSH_MAJOR_VERSION	1	/* current version numbers */
+#define XF86RUSH_MINOR_VERSION	1
+
+typedef struct _XF86RushQueryVersion {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushQueryVersion */
+    CARD16	length B16;
+} xXF86RushQueryVersionReq;
+#define sz_xXF86RushQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of Rush protocol */
+    CARD16	minorVersion B16;	/* minor version of Rush protocol */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86RushQueryVersionReply;
+#define sz_xXF86RushQueryVersionReply	32
+
+typedef struct _XF86RushLockPixmap {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushLockPixmap */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	pixmap B32;
+} xXF86RushLockPixmapReq;
+#define sz_xXF86RushLockPixmapReq	12
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	addr B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86RushLockPixmapReply;
+#define sz_xXF86RushLockPixmapReply	32
+
+typedef struct _XF86RushUnlockPixmap {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushUnlockPixmap */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	pixmap B32;
+} xXF86RushUnlockPixmapReq;
+#define sz_xXF86RushUnlockPixmapReq	12
+
+typedef struct _XF86RushUnlockAllPixmaps {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushUnlockAllPixmaps */
+    CARD16      length B16;
+} xXF86RushUnlockAllPixmapsReq;
+#define sz_xXF86RushUnlockAllPixmapsReq   4
+
+typedef struct _XF86RushSetCopyMode {
+    CARD8       reqType;                /* always RushReqCode */
+    CARD8       rushReqType;            /* always X_RushSetCopyMode */
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+    CARD32      CopyMode B32;
+} xXF86RushSetCopyModeReq;
+#define sz_xXF86RushSetCopyModeReq      12
+
+
+typedef struct _XF86RushSetPixelStride {
+    CARD8       reqType;                /* always RushReqCode */
+    CARD8       rushReqType;            /* always X_RushSetCopyMode */
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+    CARD32      PixelStride B32;
+} xXF86RushSetPixelStrideReq;
+#define sz_xXF86RushSetPixelStrideReq      12
+
+typedef struct {
+    CARD8	reqType;               /* always RushReqCode */
+    CARD8	rushReqType;           /* always X_RushOverlayPixmap */
+    CARD16	length B16;
+    XvPortID	port B32;
+    Drawable	drawable B32;
+    GContext	gc B32;
+    Pixmap	pixmap B32;
+    CARD32	id B32;
+    INT16	src_x B16;
+    INT16	src_y B16;
+    CARD16	src_w B16;
+    CARD16	src_h B16;
+    INT16	drw_x B16;
+    INT16	drw_y B16;
+    CARD16	drw_w B16;
+    CARD16	drw_h B16;
+} xXF86RushOverlayPixmapReq;
+#define sz_xXF86RushOverlayPixmapReq 40
+
+typedef struct _XF86RushStatusRegOffset {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushStatusRegOffset */
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86RushStatusRegOffsetReq;
+#define sz_xXF86RushStatusRegOffsetReq   8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	offset B32;		/* Offset of Rush status reg in mem */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86RushStatusRegOffsetReply;
+#define sz_xXF86RushStatusRegOffsetReply	32
+
+typedef struct _XF86RushAT3DEnableRegs {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushAT3DEnableRegs */
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86RushAT3DEnableRegsReq;
+#define sz_xXF86RushAT3DEnableRegsReq   8
+
+typedef struct _XF86RushAT3DDisableRegs {
+    CARD8	reqType;		/* always RushReqCode */
+    CARD8	rushReqType;		/* always X_RushAT3DDisableRegs */
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86RushAT3DDisableRegsReq;
+#define sz_xXF86RushAT3DDisableRegsReq   8
+
+#endif /* _XF86RUSHSTR_H_ */