Import of XFree86 3.9.17

17 files changed, 617 insertions, 95 deletions

diff --git a/xc/include/GL/gl.h b/xc/include/GL/gl.h
index 2b3f1c0a9..8b7a7e2e8 100644
--- a/xc/include/GL/gl.h
+++ b/xc/include/GL/gl.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-/* $XFree86: xc/include/GL/gl.h,v 1.2 1999/06/14 07:23:27 dawes Exp $ */
+/* $XFree86: xc/include/GL/gl.h,v 1.3 1999/12/14 01:32:21 robin Exp $ */
 /*
 ** The contents of this file are subject to the GLX Public License Version 1.0
 ** (the "License"). You may not use this file except in compliance with the
@@ -1523,6 +1523,25 @@ typedef void GLvoid;
 #define GL_LOGIC_OP GL_INDEX_LOGIC_OP
 #define GL_TEXTURE_COMPONENTS GL_TEXTURE_INTERNAL_FORMAT
 
+	/* GL_EXT_paletted_texture */
+#define	GL_TABLE_TOO_LARGE_EXT			0x8031
+#define	GL_COLOR_TABLE_FORMAT_EXT		0x80D8
+#define	GL_COLOR_TABLE_WIDTH_EXT		0x80D9
+#define	GL_COLOR_TABLE_RED_SIZE_EXT		0x80DA
+#define	GL_COLOR_TABLE_GREEN_SIZE_EXT		0x80DB
+#define	GL_COLOR_TABLE_BLUE_SIZE_EXT		0x80DC
+#define	GL_COLOR_TABLE_ALPHA_SIZE_EXT	 	0x80DD
+#define	GL_COLOR_TABLE_LUMINANCE_SIZE_EXT	0x80DE
+#define	GL_COLOR_TABLE_INTENSITY_SIZE_EXT	0x80DF
+#define	GL_TEXTURE_INDEX_SIZE_EXT		0x80ED
+#define	GL_COLOR_INDEX1_EXT			0x80E2
+#define	GL_COLOR_INDEX2_EXT			0x80E3
+#define	GL_COLOR_INDEX4_EXT			0x80E4
+#define	GL_COLOR_INDEX8_EXT			0x80E5
+#define	GL_COLOR_INDEX12_EXT			0x80E6
+#define	GL_COLOR_INDEX16_EXT			0x80E7
+
+
 /*************************************************************/
 
 extern void glAccum (GLenum op, GLfloat value);
diff --git a/xc/include/Xalloca.h b/xc/include/Xalloca.h
index a5913943c..5ff0a1485 100644
--- a/xc/include/Xalloca.h
+++ b/xc/include/Xalloca.h
@@ -103,12 +103,14 @@ from The Open Group.
  */
 /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */
 #        ifndef __sgi			/* IRIX 5/6 has definition */
+#         ifndef __QNX__
 #          define __Xnullarg		/* as nothing */
 #          ifndef X_NOT_STDC_ENV
              extern void *alloca(__Xnullarg);
 #          else
              extern char *alloca(__Xnullarg);
 #          endif
+#         endif /* __QNX__ */
 #        endif /* __sgi */
 #        define ALLOCATE_LOCAL(size) alloca((int)(size))
 #        define DEALLOCATE_LOCAL(ptr)  /* as nothing */
diff --git a/xc/include/Xarch.h b/xc/include/Xarch.h
index 2e046e00b..b17bd722e 100644
--- a/xc/include/Xarch.h
+++ b/xc/include/Xarch.h
@@ -25,7 +25,7 @@
  * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-/* $XFree86: xc/include/Xarch.h,v 1.8 1999/03/14 05:50:53 dawes Exp $ */
+/* $XFree86: xc/include/Xarch.h,v 1.9 1999/12/27 00:39:19 robin Exp $ */
 
 
 /*
@@ -87,9 +87,18 @@
 #define LITTLE_ENDIAN 1234
 #define BIG_ENDIAN    4321
 
-#ifdef QNX
+#if defined(__QNX__) && !defined(__QNXNTO__)
 #define BYTE_ORDER LITTLE_ENDIAN
 #endif
+
+#if defined(__QNXNTO__)
+#if defined(i386) || defined(__i386__) || defined(__x86__)
+#define BYTE_ORDER LITTLE_ENDIAN
+#else
+#define BYTE_ORDER BIG_ENDIAN
+#endif
+#endif
+
 #ifdef Lynx
 #if defined(i386) || defined(__i386__) || defined(__x86__)
 #define BYTE_ORDER LITTLE_ENDIAN
diff --git a/xc/include/Xfuncs.h b/xc/include/Xfuncs.h
index f1e558dd4..49f2713e8 100644
--- a/xc/include/Xfuncs.h
+++ b/xc/include/Xfuncs.h
@@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  *
  */
-/* $XFree86: xc/include/Xfuncs.h,v 3.4 1999/02/05 04:49:46 dawes Exp $ */
+/* $XFree86: xc/include/Xfuncs.h,v 3.5 1999/12/13 02:12:42 robin Exp $ */
 
 #ifndef _XFUNCS_H_
 #define _XFUNCS_H_
@@ -29,6 +29,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xosdefs.h>
 
 /* the old Xfuncs.h, for pre-R6 */
+#if !(defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS))
 
 #ifdef X_USEBFUNCS
 void bcopy();
@@ -94,4 +95,6 @@ int bcmp();
 #define atexit(f) on_exit(f, 0)
 #endif
 
+#endif /* !(defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS)) */
+
 #endif /* _XFUNCS_H_ */
diff --git a/xc/include/Xos.h b/xc/include/Xos.h
index a593f1cc3..8e3fa08fd 100644
--- a/xc/include/Xos.h
+++ b/xc/include/Xos.h
@@ -23,7 +23,7 @@ in this Software without prior written authorization from The Open Group.
  * The X Window System is a Trademark of The Open Group.
  *
  */
-/* $XFree86: xc/include/Xos.h,v 3.26 1998/10/25 07:11:11 dawes Exp $ */
+/* $XFree86: xc/include/Xos.h,v 3.27 1999/12/27 00:39:19 robin Exp $ */
 
 /* This is a collection of things to try and minimize system dependencies
  * in a "signficant" number of source files.
@@ -210,7 +210,16 @@ struct timeval {
 #elif defined(MINIX) || defined(_SEQUENT_) || defined(Lynx)
 #include <time.h>
 #else
+#ifdef __QNX__
+typedef unsigned long fd_mask;
+/* Make sure we get 256 bit select masks */
+#define FD_SETSIZE 256
+#include <sys/select.h>
+#include <sys/time.h>
+#include <time.h>
+#else
 #include <sys/time.h>
+#endif /* QNX */
 #endif /* defined(_POSIX_SOURCE) && defined(SVR4) */
 
 #endif /* SYSV */
@@ -282,7 +291,7 @@ typedef unsigned long fd_mask;
 #define NGROUPS 16
 #endif
 
-#if defined(ISC) || defined(__EMX__)
+#if defined(ISC) || defined(__EMX__) || (defined(__QNX__) && !defined(UNIXCONN))
 /*
  *	Some OS's may not have this
  */
diff --git a/xc/include/Xpoll.h b/xc/include/Xpoll.h
index 312e8b21a..59687bb2c 100644
--- a/xc/include/Xpoll.h
+++ b/xc/include/Xpoll.h
@@ -23,7 +23,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/include/Xpoll.h,v 3.5 1998/12/13 12:23:40 dawes Exp $ */
+/* $XFree86: xc/include/Xpoll.h,v 3.6 1999/12/27 00:39:19 robin Exp $ */
 
 #ifndef _XPOLL_H_
 #define _XPOLL_H_
@@ -46,6 +46,11 @@ from The Open Group.
 #include <unistd.h>
 #endif
 
+#ifdef __QNX__  /* Make sure we get 256 bit select masks */
+#define FD_SETSIZE 256
+#include <sys/select.h>
+#endif
+
 /* AIX 4.2 fubar-ed <sys/select.h>, so go to heroic measures to get it */
 #if defined(AIXV4) && !defined(NFDBITS)
 #include <sys/select.h>
diff --git a/xc/include/Xthreads.h b/xc/include/Xthreads.h
index f5a676de8..30e139f82 100644
--- a/xc/include/Xthreads.h
+++ b/xc/include/Xthreads.h
@@ -21,7 +21,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  * *
  */
-/* $XFree86: xc/include/Xthreads.h,v 3.5 1998/10/02 07:38:52 dawes Exp $ */
+/* $XFree86: xc/include/Xthreads.h,v 3.6 1999/10/13 04:20:47 dawes Exp $ */
 
 #ifndef _XTHREADS_H_
 #define _XTHREADS_H_
@@ -227,12 +227,17 @@ typedef pthread_mutex_t xmutex_rec;
 #define xcondition_wait(c,m) pthread_cond_wait(c,m)
 #define xcondition_signal(c) pthread_cond_signal(c)
 #define xcondition_broadcast(c) pthread_cond_broadcast(c)
-#if defined(_DECTHREADS_) || defined(linux)
+#if defined(_DECTHREADS_)
 static xthread_t _X_no_thread_id;
 #define xthread_have_id(id) !pthread_equal(id, _X_no_thread_id)
 #define xthread_clear_id(id) id = _X_no_thread_id
 #define xthread_equal(id1,id2) pthread_equal(id1, id2)
-#endif /* _DECTHREADS_ || linux */
+#endif /* _DECTHREADS_ */
+#if defined(linux)
+#define xthread_have_id(id) !pthread_equal(id, 0)
+#define xthread_clear_id(id) id = 0
+#define xthread_equal(id1,id2) pthread_equal(id1, id2)
+#endif /* linux */
 #if _CMA_VENDOR_ == _CMA__IBM
 #ifdef DEBUG			/* too much of a hack to enable normally */
 /* see also cma__obj_set_name() */
diff --git a/xc/include/extensions/Imakefile b/xc/include/extensions/Imakefile
index 1efef22bc..d44149a8b 100644
--- a/xc/include/extensions/Imakefile
+++ b/xc/include/extensions/Imakefile
@@ -1,5 +1,5 @@
 XCOMM $TOG: Imakefile /main/50 1997/11/24 16:47:55 kaleb $
-XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.26 1999/08/14 10:49:15 dawes Exp $
+XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.28 1999/12/13 01:39:39 robin Exp $
 
 #if BuildScreenSaverLibrary
 SCREENSAVERHEADERS = saver.h saverproto.h scrnsaver.h
@@ -40,7 +40,7 @@ HEADERS = Xext.h multibuf.h shape.h sync.h XShm.h MITMisc.h \
 	security.h securstr.h \
 	Print.h Printstr.h \
 	Xcup.h Xcupstr.h \
-	panoramiX.h panoramiXext.h panoramiXproto.h \
+	panoramiXext.h panoramiXproto.h \
 	dpms.h dpmsstr.h \
 	XEVI.h XEVIstr.h
 
@@ -56,3 +56,5 @@ InstallDriverSDKNonExecFile(Xvproto.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(dpms.h,$(DRIVERSDKINCLUDEDIR)/extensions)
 InstallDriverSDKNonExecFile(xf86dga1str.h,$(DRIVERSDKINCLUDEDIR))
 InstallDriverSDKNonExecFile(xf86dgastr.h,$(DRIVERSDKINCLUDEDIR)/extensions)
+InstallDriverSDKNonExecFile(xf86rush.h,$(DRIVERSDKINCLUDEDIR))
+InstallDriverSDKNonExecFile(xf86rushstr.h,$(DRIVERSDKINCLUDEDIR))
diff --git a/xc/include/extensions/Print.h b/xc/include/extensions/Print.h
index e1f3b635c..ca71fbcd6 100644
--- a/xc/include/extensions/Print.h
+++ b/xc/include/extensions/Print.h
@@ -1,3 +1,5 @@
+/* $XFree86: xc/include/extensions/Print.h,v 1.3 1999/12/16 02:26:31 robin Exp $ */
+
 /* $XConsortium: Print.h /main/3 1996/12/10 14:59:02 rws $ */
 /******************************************************************************
  ******************************************************************************
@@ -261,7 +263,7 @@ typedef void (*XPFinishProc)( Display *display,
 /*
  * Typedefs for XpSetLocaleHinter and XpGetLocaleHinter
  */
-typedef char * (*XPHinterProc)();
+typedef char * (*XPHinterProc)(void);
 
 /*******************************************************************
  *
@@ -319,8 +321,6 @@ typedef struct {
  * Function prototypes for library side.
  */
 
-#if NeedFunctionPrototypes
-
 extern XPContext XpCreateContext (
     Display		*display,
     char		*printer_name
@@ -531,10 +531,7 @@ extern char *XpGetLocaleHinter (
     XPHinterProc *hinter_proc
 );
 
-
-
-
-extern char *XpGetLocaleNetString();
+extern char *XpGetLocaleNetString(void);
 
 extern char *XpNotifyPdm (
     Display		*print_display,
@@ -545,50 +542,6 @@ extern char *XpNotifyPdm (
     Bool		auth_flag
 );
 
-#else
-
-extern XPContext XpCreateContext ();
-extern void XpSetContext ();
-extern XPContext XpGetContext ();
-extern void XpDestroyContext ();
-extern Screen *XpGetScreenOfContext ();
-extern Status XpGetPageDimensions ();
-extern void XpStartJob ();
-extern void XpEndJob ();
-extern void XpCancelJob ();
-extern void XpStartDoc ();
-extern void XpEndDoc ();
-extern void XpCancelDoc ();
-extern void XpPutDocumentData ();
-extern Status XpGetDocumentData ();
-extern void XpStartPage ();
-extern void XpEndPage ();
-extern void XpCancelPage ();
-extern void XpSelectInput ();
-extern unsigned long XpInputSelected ();
-extern Bool XpSetImageResolution ();
-extern int XpGetImageResolution ();
-extern char *XpGetAttributes ();
-extern void XpSetAttributes ();
-extern char *XpGetOneAttribute ();
-extern XPPrinterList XpGetPrinterList ();
-extern void XpFreePrinterList ();
-extern void XpRehashPrinterList ();
-extern Status XpQueryVersion ();
-extern Bool XpQueryExtension ();
-extern Screen **XpQueryScreens ();
-extern Status XpGetPdmStartParams ();
-extern Status XpGetAuthParams ();
-extern Status XpSendAuth ();
-extern Status XpSendOneTicket ();
-extern void XpSetLocaleHinter ();
-extern char *XpGetLocaleHinter ();
-
-extern char *XpGetLocaleNetString ();
-extern char *XpNotifyPdm ();
-
-#endif /* NeedFunctionPrototypes */
-
 #endif /* _XP_PRINT_SERVER_ */
 
 _XFUNCPROTOEND
diff --git a/xc/include/extensions/Printstr.h b/xc/include/extensions/Printstr.h
index 40c67f509..e3a38628c 100644
--- a/xc/include/extensions/Printstr.h
+++ b/xc/include/extensions/Printstr.h
@@ -1,3 +1,5 @@
+/* $XFree86: xc/include/extensions/Printstr.h,v 1.3 1999/12/16 02:26:32 robin Exp $ */
+
 /* $XConsortium: Printstr.h /main/2 1996/11/16 15:20:15 rws $ */
 /******************************************************************************
  ******************************************************************************
@@ -676,27 +678,70 @@ extern int           _xp_hinter_init;
  */
 #define Suspended 84
 
+struct _XpContext;
+
 extern void XpRegisterPrinterScreen(
     ScreenPtr pScreen,
-    int (*CreateContext)());
+    int (*CreateContext)(struct _XpContext *));
 
 typedef struct _xpprintFuncs {
-    int (*StartJob)(); /* pContext, client */
-    int (*EndJob)(); /* pContext, client */
-    int (*StartDoc)(); /* pContext, client */
-    int (*EndDoc)(); /* pContext, client */
-    int (*StartPage)(); /* pContext, pWin, client, exposures */
-    int (*EndPage)(); /* pContext, client */
-    int (*PutDocumentData)(); /* pContext,pDraw,pData,len_data,pFmt,len_fmt,pOpt,len_opt, client */
-    int (*GetDocumentData)(); /* pContext,pData,len_data,pFmt,len_fmt,pOpt,len_opt, client */
-    int (*DestroyContext)(); /* pContext, client */
-    char *(*GetAttributes)(); /* pContext, pool */
-    char *(*GetOneAttribute)(); /* pContext, pool, attr */
-    int (*SetAttributes)(); /* pContext, pool, attrs */
-    int (*AugmentAttributes)(); /* pContext, pool, attrs */
-    int (*GetMediumDimensions)(); /* pPrintContext, pWidth, pHeight */
-    int (*GetReproducibleArea)(); /* pPrintContext, pRect */
-    int (*SetImageResolution)(); /* pPrintContext, imageRes, pStatus */
+    int (*StartJob)(
+	struct _XpContext *	/* pContext */,
+	Bool			/* sendClientData */,
+	ClientPtr		/* client */);
+    int (*EndJob)(struct _XpContext *, int);
+    int (*StartDoc)(
+	struct _XpContext *	/* pContext */,
+	XPDocumentType		/* type */);
+    int (*EndDoc)(struct _XpContext *, int);
+    int (*StartPage)(
+	struct _XpContext *	/* pContext */,
+	WindowPtr		/* pWin */);
+    int (*EndPage)(
+	struct _XpContext *	/* pContext */,
+	WindowPtr		/* pWin */);
+    int (*PutDocumentData)(
+	struct _XpContext *	/* pContext */,
+    	DrawablePtr		/* pDraw */,
+	char *			/* pData */,
+	int			/* len_data */,
+	char *			/* pDoc_fmt */,
+	int			/* len_fmt */,
+	char *			/* pOptions */,
+	int			/* len_options */,
+	ClientPtr		/* client */);
+    int (*GetDocumentData)(
+	struct _XpContext *	/* pContext */,
+	ClientPtr		/* client */,
+	int			/* maxBufferSize */);
+    int (*DestroyContext)(
+	struct _XpContext *);	/* pContext */
+    char *(*GetAttributes)(
+	struct _XpContext *,
+	XPAttributes 		/* pool */);
+    char *(*GetOneAttribute)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*SetAttributes)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*AugmentAttributes)(
+	struct _XpContext *	/* pContext */,
+	XPAttributes 		/* pool */,
+	char *			/* attrs */);
+    int (*GetMediumDimensions)(
+	struct _XpContext *	/* pPrintContext */,
+	CARD16 *		/* pWidth */,
+	CARD16 *		/* pHeight */);
+    int (*GetReproducibleArea)(
+	struct _XpContext *	/* pPrintContext */,
+	xRectangle *		/* pRect */);
+    int (*SetImageResolution)(
+	struct _XpContext *	/* pPrintContext */,
+	int			/* imageRes */,
+	Bool *			/* pStatus */);
 } XpDriverFuncs, *XpDriverFuncsPtr;
 
 /*
@@ -721,12 +766,20 @@ typedef struct _XpContext {
 	int imageRes;
 } XpContextRec, *XpContextPtr;
 
-extern XpContextPtr XpGetPrintContext(
-    ClientPtr client);
+#include "fontstruct.h"	/* FontResolutionPtr */
+
+extern Bool XpAllocateContextPrivate(int, unsigned);
+extern FontResolutionPtr XpGetClientResolutions(ClientPtr, int *);
+extern XpContextPtr XpContextOfClient(ClientPtr);
+extern XpContextPtr XpGetPrintContext(ClientPtr);
+extern int XpAllocateContextPrivateIndex(void);
+extern int XpRehashPrinterList(void);
+extern void XpSetFontResFunc(ClientPtr);
+extern void XpUnsetFontResFunc(ClientPtr);
+
 
 #endif /* _XP_PRINT_SERVER_ */
 
 _XFUNCPROTOEND
 
 #endif /* _XpPrintstr_H_ */
-
diff --git a/xc/include/extensions/Xv.h b/xc/include/extensions/Xv.h
index 7fd5695d3..a6a027195 100644
--- a/xc/include/extensions/Xv.h
+++ b/xc/include/extensions/Xv.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xv.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xv.h,v 1.5 1999/12/11 19:28:48 mvojkovi Exp $ */
 
 #ifndef XV_H
 #define XV_H
@@ -48,7 +48,7 @@ SOFTWARE.
 
 #define XvName "XVideo"
 #define XvVersion 2
-#define XvRevision 1
+#define XvRevision 2
 
 /* Symbols */
 
@@ -62,10 +62,27 @@ typedef XID XvEncodingID;
 
 #define XvInputMask      (1L<<XvInput)
 #define XvOutputMask     (1L<<XvOutput)
+#define XvVideoMask	 0x00000004
+#define XvStillMask	 0x00000008
+#define XvImageMask	 0x00000010
+
+/* These two are not client viewable */
+#define XvPixmapMask	 0x00010000
+#define XvWindowMask	 0x00020000
+
 
 #define XvGettable	0x01
 #define XvSettable	0x02
 
+#define XvRGB		0
+#define XvYUV		1
+
+#define XvPacked	0
+#define XvPlanar	1
+
+#define XvTopToBottom	0
+#define XvBottomToTop	1
+
 
 /* Events */
 
diff --git a/xc/include/extensions/Xvlib.h b/xc/include/extensions/Xvlib.h
index 26a81a42a..28e7ce4e2 100644
--- a/xc/include/extensions/Xvlib.h
+++ b/xc/include/extensions/Xvlib.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvlib.h,v 1.2 1999/08/31 08:39:02 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xvlib.h,v 1.3 1999/12/11 19:28:48 mvojkovi Exp $ */
 
 #ifndef XVLIB_H
 #define XVLIB_H
@@ -63,6 +63,8 @@ typedef struct {
 
 typedef struct {
   int flags;	/* XvGettable, XvSettable */
+  int min_value;
+  int max_value;
   char *name;
 } XvAttribute;
 
@@ -119,6 +121,46 @@ typedef union {
   long pad[24];
 } XvEvent;
 
+typedef struct {
+  int id;                      /* Unique descriptor for the format */
+  int type;                    /* XvRGB, XvYUV */
+  int byte_order;              /* LSBFirst, MSBFirst */
+  char guid[16];               /* Globally Unique IDentifier */
+  int bits_per_pixel;
+  int format;                  /* XvPacked, XvPlanar */
+  int num_planes;
+
+  /* for RGB formats only */
+  int depth;
+  unsigned int red_mask;       
+  unsigned int green_mask;   
+  unsigned int blue_mask;   
+
+  /* for YUV formats only */
+  unsigned int y_sample_bits;
+  unsigned int u_sample_bits;
+  unsigned int v_sample_bits;   
+  unsigned int horz_y_period;
+  unsigned int horz_u_period;
+  unsigned int horz_v_period;
+  unsigned int vert_y_period;
+  unsigned int vert_u_period;
+  unsigned int vert_v_period;
+  char component_order[32];    /* eg. UYVY */
+  int scanline_order;          /* XvTopToBottom, XvBottomToTop */
+} XvImageFormatValues; 
+
+typedef struct {
+  int id;
+  int width, height;
+  int data_size;              /* bytes */
+  int num_planes;
+  int *pitches;               /* bytes */
+  int *offsets;               /* bytes */
+  char *data;
+  XPointer obdata;     
+} XvImage;
+
 _XFUNCPROTOBEGIN
 
 extern int XvQueryExtension(
@@ -311,6 +353,80 @@ extern void XvFreeEncodingInfo(
 #endif
 );
 
+
+extern XvImageFormatValues * XvListImageFormats (
+#if NeedFunctionPrototypes
+   Display 	*display,
+   XvPortID 	port_id,
+   int 		*count_return
+#endif
+);
+
+extern XvImage * XvCreateImage (
+#if NeedFunctionPrototypes
+   Display *display,
+   XvPortID port,
+   int id,
+   char *data,
+   int width, 
+   int height 
+#endif
+);
+
+extern int XvPutImage (
+#if NeedFunctionPrototypes
+  Display *display,
+   XvPortID id,
+   Drawable d,
+   GC gc,
+   XvImage *image,
+   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
+#endif
+);
+
+extern int XvShmPutImage (
+#if NeedFunctionPrototypes
+   Display *display,
+   XvPortID id,
+   Drawable d,
+   GC gc,
+   XvImage *image,
+   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,
+   Bool send_event
+#endif
+);
+
+#ifdef _XSHM_H_
+
+extern XvImage * XvShmCreateImage (
+#if NeedFunctionPrototypes
+   Display *display,
+   XvPortID port,
+   int id,
+   char* data,
+   int width, 
+   int height,
+   XShmSegmentInfo *shminfo
+#endif
+);
+
+#endif
+
+
 _XFUNCPROTOEND
 
 #endif /* XVLIB_H */
diff --git a/xc/include/extensions/Xvproto.h b/xc/include/extensions/Xvproto.h
index ed810b4f2..874bf3e2b 100644
--- a/xc/include/extensions/Xvproto.h
+++ b/xc/include/extensions/Xvproto.h
@@ -21,7 +21,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/include/extensions/Xvproto.h,v 1.3 1999/05/23 06:33:22 dawes Exp $ */
+/* $XFree86: xc/include/extensions/Xvproto.h,v 1.4 1999/12/11 19:28:48 mvojkovi Exp $ */
 
 #ifndef XVPROTO_H
 #define XVPROTO_H
@@ -55,6 +55,7 @@ SOFTWARE.
 
 #define XvPortID CARD32
 #define XvEncodingID CARD32
+#define ShmSeg CARD32
 
 /* Structures */
 
@@ -93,9 +94,47 @@ typedef struct {
 
 typedef struct {
   CARD32 flags B32;
+  INT32 min B32;
+  INT32 max B32;
   CARD32 size  B32;
 } xvAttributeInfo;
-#define sz_xvAttributeInfo 8
+#define sz_xvAttributeInfo 16
+
+typedef struct {
+  CARD32 id B32;
+  CARD8 type;
+  CARD8 byte_order;
+  CARD16 pad1 B16;
+  CARD8 guid[16];
+  CARD8 bpp;
+  CARD8 num_planes;
+  CARD16 pad2 B16;
+  CARD8 depth;
+  CARD8 pad3;
+  CARD16 pad4 B16;
+  CARD32 red_mask B32;
+  CARD32 green_mask B32;
+  CARD32 blue_mask B32;
+  CARD8 format;
+  CARD8 pad5;
+  CARD16 pad6 B16;
+  CARD32 y_sample_bits B32;
+  CARD32 u_sample_bits B32;
+  CARD32 v_sample_bits B32;   
+  CARD32 horz_y_period B32;
+  CARD32 horz_u_period B32;
+  CARD32 horz_v_period B32;
+  CARD32 vert_y_period B32;
+  CARD32 vert_u_period B32;
+  CARD32 vert_v_period B32;
+  CARD8 comp_order[32];
+  CARD8 scanline_order;
+  CARD8 pad7;
+  CARD16 pad8 B16;
+  CARD32 pad9 B32;
+  CARD32 pad10 B32;
+} xvImageFormatInfo;
+#define sz_xvImageFormatInfo 128
 
 
 /* Requests */
@@ -116,9 +155,13 @@ typedef struct {
 #define xv_SetPortAttribute               13
 #define xv_GetPortAttribute               14
 #define xv_QueryPortAttributes            15
-#define xv_LastRequest                    16
+#define xv_ListImageFormats               16
+#define xv_QueryImageAttributes           17
+#define xv_PutImage                       18
+#define xv_ShmPutImage                    19
+#define xv_LastRequest                    xv_ShmPutImage
 
-#define xvNumRequests                     (xv_LastRequest)
+#define xvNumRequests                     (xv_LastRequest + 1)
 
 typedef struct {
   CARD8 reqType;
@@ -298,7 +341,6 @@ typedef struct {
 } xvQueryBestSizeReq;
 #define sz_xvQueryBestSizeReq 20
 
-
 typedef struct {
   CARD8 reqType;
   CARD8 xvReqType;
@@ -307,6 +349,72 @@ typedef struct {
 } xvQueryPortAttributesReq;
 #define sz_xvQueryPortAttributesReq 8
 
+typedef struct {
+  CARD8 reqType;
+  CARD8 xvReqType;
+  CARD16 length B16;
+  XvPortID port B32;
+  Drawable drawable B32;
+  GContext gc 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;
+  CARD16 width B16;
+  CARD16 height B16;
+} xvPutImageReq;
+#define sz_xvPutImageReq 40
+
+typedef struct {
+  CARD8 reqType;
+  CARD8 xvReqType;
+  CARD16 length B16;
+  XvPortID port B32;
+  Drawable drawable B32;
+  GContext gc B32;
+  ShmSeg shmseg B32;
+  CARD32 id B32;
+  CARD32 offset 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;
+  CARD16 width B16;
+  CARD16 height B16;
+  CARD8 send_event;
+  CARD8 pad1;
+  CARD16 pad2 B16;
+} xvShmPutImageReq;
+#define sz_xvShmPutImageReq 52
+
+typedef struct {
+  CARD8 reqType;
+  CARD8 xvReqType;
+  CARD16 length B16;
+  XvPortID port B32;
+} xvListImageFormatsReq;
+#define sz_xvListImageFormatsReq 8
+
+typedef struct {
+  CARD8 reqType;
+  CARD8 xvReqType;
+  CARD16 length B16;
+  CARD32 port B32;
+  CARD32 id B32;
+  CARD16 width B16;
+  CARD16 height B16;
+} xvQueryImageAttributesReq;
+#define sz_xvQueryImageAttributesReq 16
+
 
 /* Replies */
 
@@ -398,7 +506,6 @@ typedef struct {
 } xvQueryBestSizeReply;
 #define sz_xvQueryBestSizeReply 32
 
-
 typedef struct {
   BYTE type;  /* X_Reply */
   BYTE padb1;
@@ -413,6 +520,34 @@ typedef struct {
 } xvQueryPortAttributesReply;
 #define sz_xvQueryPortAttributesReply 32
 
+typedef struct {
+  BYTE type;  /* X_Reply */
+  BYTE padb1;
+  CARD16 sequenceNumber B16;
+  CARD32 length B32;
+  CARD32 num_formats B32; 
+  CARD32 padl4 B32;
+  CARD32 padl5 B32;
+  CARD32 padl6 B32;
+  CARD32 padl7 B32;
+  CARD32 padl8 B32;
+} xvListImageFormatsReply;
+#define sz_xvListImageFormatsReply 32
+
+typedef struct {
+  BYTE type;  /* X_Reply */
+  BYTE padb1;
+  CARD16 sequenceNumber B16;
+  CARD32 length B32; 
+  CARD32 num_planes B32; 
+  CARD32 data_size B32;
+  CARD16 width B16;
+  CARD16 height B16;
+  CARD32 padl6 B32;
+  CARD32 padl7 B32;
+  CARD32 padl8 B32;
+} xvQueryImageAttributesReply;
+#define sz_xvQueryImageAttributesReply 32
 
 /* DEFINE EVENT STRUCTURE */
 
@@ -452,6 +587,7 @@ typedef struct {
 
 #undef XvPortID
 #undef XvEncodingID
+#undef ShmSeg
 
 #endif /* XVPROTO_H */
 
diff --git a/xc/include/extensions/xf86dga.h b/xc/include/extensions/xf86dga.h
index 5c0951005..6918a5130 100644
--- a/xc/include/extensions/xf86dga.h
+++ b/xc/include/extensions/xf86dga.h
@@ -1,7 +1,7 @@
 /*
    Copyright (c) 1999  XFree86 Inc
 */
-/* $XFree86: xc/include/extensions/xf86dga.h,v 3.19 1999/08/22 05:57:22 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86dga.h,v 3.20 1999/10/13 04:20:48 dawes Exp $ */
 
 #ifndef _XF86DGA_H_
 #define _XF86DGA_H_
@@ -32,7 +32,7 @@
 #define X_XDGACreateColormap		26
 
 
-#define XDGAConcurrentAcces	0x00000001
+#define XDGAConcurrentAccess	0x00000001
 #define XDGASolidFillRect	0x00000002
 #define XDGABlitRect		0x00000004
 #define XDGABlitTransRect	0x00000008
diff --git a/xc/include/extensions/xf86rush.h b/xc/include/extensions/xf86rush.h
new file mode 100644
index 000000000..a4fc5eb71
--- /dev/null
+++ b/xc/include/extensions/xf86rush.h
@@ -0,0 +1,88 @@
+/* $XFree86: xc/include/extensions/xf86rush.h,v 1.2 1999/09/27 06:29:07 dawes Exp $ */
+/*
+
+Copyright (c) 1998  Daryll Strauss
+
+*/
+
+#ifndef _XF86RUSH_H_
+#define _XF86RUSH_H_
+
+#include <X11/Xfuncproto.h>
+
+#define X_XF86RushQueryVersion		0
+#define X_XF86RushLockPixmap		1
+#define X_XF86RushUnlockPixmap		2
+#define X_XF86RushUnlockAllPixmaps	3
+#define X_XF86RushSetCopyMode		4
+#define X_XF86RushSetPixelStride	5
+
+#define XF86RushNumberEvents		0
+
+#define XF86RushClientNotLocal		0
+#define XF86RushNumberErrors		(XF86RushClientNotLocal + 1)
+
+#ifndef _XF86RUSH_SERVER_
+
+_XFUNCPROTOBEGIN
+
+Bool XF86RushQueryVersion(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+#endif
+);
+
+Bool XF86RushQueryExtension(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int*		/* event_base */,
+    int*		/* error_base */
+#endif
+);
+
+Bool XF86RushLockPixmap(
+#if NeedFunctionPrototypes
+    Display *		/* dpy */,
+    int			/* screen */,
+    Pixmap		/* Pixmap */,
+    void **		/* Return address */
+#endif
+);
+
+Bool XF86RushUnlockPixmap(
+#if NeedFunctionPrototypes
+    Display *		/* dpy */,
+    int			/* screen */,
+    Pixmap		/* Pixmap */
+#endif
+); 
+
+Bool XF86RushUnlockAllPixmaps(
+#if NeedFunctionPrototypes
+    Display *		/* dpy */
+#endif			    
+);
+
+Bool XF86RushSetCopyMode(
+#if NeedFunctionPrototypes
+    Display *		/* dpy */,
+    int			/* screen */,
+    int			/* copy mode */
+#endif			    
+);
+
+Bool XF86RushSetPixelStride(
+#if NeedFunctionPrototypes
+    Display *		/* dpy */,
+    int			/* screen */,
+    int			/* pixel stride */
+#endif			    
+);
+
+_XFUNCPROTOEND
+
+#endif /* _XF86RUSH_SERVER_ */
+
+#endif /* _XF86RUSH_H_ */
diff --git a/xc/include/extensions/xf86rushstr.h b/xc/include/extensions/xf86rushstr.h
new file mode 100644
index 000000000..dbf17b4ba
--- /dev/null
+++ b/xc/include/extensions/xf86rushstr.h
@@ -0,0 +1,102 @@
+/* $XFree86: xc/include/extensions/xf86rushstr.h,v 1.2 1999/09/27 06:29:07 dawes Exp $ */
+/*
+
+Copyright (c) 1998  Daryll Strauss
+
+*/
+
+#ifndef _XF86RUSHSTR_H_
+#define _XF86RUSHSTR_H_
+
+#include "xf86rush.h"
+
+#define XF86RUSHNAME "XFree86-Rush"
+
+#define XF86RUSH_MAJOR_VERSION	1	/* current version numbers */
+#define XF86RUSH_MINOR_VERSION	0
+
+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
+
+#endif /* _XF86RUSHSTR_H_ */
diff --git a/xc/include/fonts/fontproto.h b/xc/include/fonts/fontproto.h
index ad34d1200..12f1e4503 100644
--- a/xc/include/fonts/fontproto.h
+++ b/xc/include/fonts/fontproto.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/fonts/fontproto.h,v 1.1 1999/08/21 13:47:34 dawes Exp $ */
+/* $XFree86: xc/include/fonts/fontproto.h,v 1.2 1999/09/04 09:14:08 dawes Exp $ */
 
 /***********************************************************
 
@@ -52,7 +52,10 @@ extern void remove_fs_handlers ( FontPathElementPtr fpe,
 
 extern int client_auth_generation ( ClientPtr client );
 
+#ifndef ___CLIENTSIGNAL_DEFINED___
+#define ___CLIENTSIGNAL_DEFINED___
 extern Bool ClientSignal ( ClientPtr client );
+#endif /* ___CLIENTSIGNAL_DEFINED___ */
 
 extern void DeleteFontClientID ( Font id );
 extern Font GetNewFontClientID ( void );