From ae24ecf53488a3806ca5fff2cee21c03204f9f96 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri, 14 Nov 2003 15:54:35 +0000
Subject: R6.6 is the Xorg base-line

---
 xf86vmode.h | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xf86vmstr.h | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 550 insertions(+)
 create mode 100644 xf86vmode.h
 create mode 100644 xf86vmstr.h

diff --git a/xf86vmode.h b/xf86vmode.h
new file mode 100644
index 0000000..508fa2c
--- /dev/null
+++ b/xf86vmode.h
@@ -0,0 +1,272 @@
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.20.2.1 1997/07/13 14:44:57 dawes Exp $ */
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+/* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VIDMODE_H_
+#define _XF86VIDMODE_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+
+#define X_XF86VidModeQueryVersion	0
+#define X_XF86VidModeGetModeLine	1
+#define X_XF86VidModeModModeLine	2
+#define X_XF86VidModeSwitchMode		3
+#define X_XF86VidModeGetMonitor		4
+#define X_XF86VidModeLockModeSwitch	5
+#define X_XF86VidModeGetAllModeLines	6
+#define X_XF86VidModeAddModeLine	7
+#define X_XF86VidModeDeleteModeLine	8
+#define X_XF86VidModeValidateModeLine	9
+#define X_XF86VidModeSwitchToMode	10
+#define X_XF86VidModeGetViewPort	11
+#define X_XF86VidModeSetViewPort	12
+
+#ifdef XF86VIDMODE_EVENTS
+#define XF86VidModeNotify		0
+#define XF86VidModeNumberEvents		(XF86VidModeNotify + 1)
+
+#define XF86VidModeNotifyMask		0x00000001
+
+#define XF86VidModeNonEvent		0
+#define XF86VidModeModeChange		1
+#else
+#define XF86VidModeNumberEvents		0
+#endif
+
+#define XF86VidModeBadClock		0
+#define XF86VidModeBadHTimings		1
+#define XF86VidModeBadVTimings		2
+#define XF86VidModeModeUnsuitable	3
+#define XF86VidModeExtensionDisabled	4
+#define XF86VidModeClientNotLocal	5
+#define XF86VidModeZoomLocked		6
+#define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
+
+#ifndef _XF86VIDMODE_SERVER_
+
+typedef struct {
+    unsigned short	hdisplay;
+    unsigned short	hsyncstart;
+    unsigned short	hsyncend;
+    unsigned short	htotal;
+    unsigned short	vdisplay;
+    unsigned short	vsyncstart;
+    unsigned short	vsyncend;
+    unsigned short	vtotal;
+    unsigned int	flags;
+    int			privsize;
+#if defined(__cplusplus) || defined(c_plusplus)
+    /* private is a C++ reserved word */
+    INT32		*c_private;
+#else
+    INT32		*private;
+#endif
+} XF86VidModeModeLine;
+
+typedef struct {
+    unsigned int	dotclock;
+    unsigned short	hdisplay;
+    unsigned short	hsyncstart;
+    unsigned short	hsyncend;
+    unsigned short	htotal;
+    unsigned short	vdisplay;
+    unsigned short	vsyncstart;
+    unsigned short	vsyncend;
+    unsigned short	vtotal;
+    unsigned int	flags;
+    int			privsize;
+#if defined(__cplusplus) || defined(c_plusplus)
+    /* private is a C++ reserved word */
+    INT32		*c_private;
+#else
+    INT32		*private;
+#endif
+} XF86VidModeModeInfo;
+
+typedef struct {
+    float		hi;
+    float		lo;
+} XF86VidModeSyncRange;
+
+typedef struct {
+    char*			vendor;
+    char*			model;
+    float			bandwidth;
+    unsigned char		nhsync;
+    XF86VidModeSyncRange*	hsync;
+    unsigned char		nvsync;
+    XF86VidModeSyncRange*	vsync;
+} XF86VidModeMonitor;
+    
+typedef struct {
+    int type;			/* of event */
+    unsigned long serial;	/* # of last request processed by server */
+    Bool send_event;		/* true if this came from a SendEvent req */
+    Display *display;		/* Display the event was read from */
+    Window root;		/* root window of event screen */
+    int state;			/* What happened */
+    int kind;			/* What happened */
+    Bool forced;		/* extents of new region */
+    Time time;			/* event timestamp */
+} XF86VidModeNotifyEvent;
+
+#define XF86VidModeSelectNextMode(disp, scr) \
+	XF86VidModeSwitchMode(disp, scr, 1)
+#define XF86VidModeSelectPrevMode(disp, scr) \
+	XF86VidModeSwitchMode(disp, scr, -1)
+
+_XFUNCPROTOBEGIN
+
+Bool XF86VidModeQueryVersion(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */
+#endif
+);
+
+Bool XF86VidModeQueryExtension(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int*		/* event_base */,
+    int*		/* error_base */
+#endif
+);
+
+Bool XF86VidModeGetModeLine(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    int*			/* dotclock */,
+    XF86VidModeModeLine*	/* modeline */
+#endif
+);
+
+Bool XF86VidModeGetAllModeLines(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    int*			/* modecount */,
+    XF86VidModeModeInfo***	/* modelinesPtr */
+#endif
+);
+
+Bool XF86VidModeAddModeLine(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeModeInfo*	/* new modeline */,
+    XF86VidModeModeInfo*	/* after modeline */
+#endif
+);
+
+Bool XF86VidModeDeleteModeLine(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeModeInfo*	/* modeline */
+#endif
+);
+
+Bool XF86VidModeModModeLine(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeModeLine*	/* modeline */
+#endif
+);
+
+Status XF86VidModeValidateModeLine(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeModeInfo*	/* modeline */
+#endif
+);
+
+Bool XF86VidModeSwitchMode(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int			/* screen */,
+    int			/* zoom */
+#endif
+);
+
+Bool XF86VidModeSwitchToMode(
+#if NeedFunctionPrototypes
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeModeInfo*	/* modeline */
+#endif
+);
+
+Bool XF86VidModeLockModeSwitch(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int			/* screen */,
+    int			/* lock */
+#endif
+);
+
+Bool XF86VidModeGetMonitor(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int			/* screen */,
+    XF86VidModeMonitor*	/* monitor */
+#endif
+);
+
+Bool XF86VidModeGetViewPort(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int			/* screen */,
+    int*		/* x return */,
+    int*		/* y return */
+#endif
+);
+
+Bool XF86VidModeSetViewPort(
+#if NeedFunctionPrototypes
+    Display*		/* dpy */,
+    int			/* screen */,
+    int			/* x */,
+    int			/* y */
+#endif
+);
+
+_XFUNCPROTOEND
+
+#endif
+
+#endif
diff --git a/xf86vmstr.h b/xf86vmstr.h
new file mode 100644
index 0000000..0a216eb
--- /dev/null
+++ b/xf86vmstr.h
@@ -0,0 +1,278 @@
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.16 1996/10/16 14:28:58 dawes Exp $ */
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+/* $Xorg: xf86vmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VIDMODESTR_H_
+#define _XF86VIDMODESTR_H_
+
+#include "xf86vmode.h"
+
+#define XF86VIDMODENAME "XFree86-VidModeExtension"
+
+#define XF86VIDMODE_MAJOR_VERSION	0	/* current version numbers */
+#define XF86VIDMODE_MINOR_VERSION	7
+/*
+ * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
+ * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
+ *                    client.
+ */
+
+typedef struct _XF86VidModeQueryVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
+    CARD16	length B16;
+} xXF86VidModeQueryVersionReq;
+#define sz_xXF86VidModeQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of XF86VidMode */
+    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeQueryVersionReply;
+#define sz_xXF86VidModeQueryVersionReply	32
+
+typedef struct _XF86VidModeGetModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+} xXF86VidModeGetModeLineReq,
+  xXF86VidModeGetAllModeLinesReq,
+  xXF86VidModeGetMonitorReq,
+  xXF86VidModeGetViewPortReq;
+#define sz_xXF86VidModeGetModeLineReq		8
+#define sz_xXF86VidModeGetAllModeLinesReq	8
+#define sz_xXF86VidModeGetMonitorReq		8
+#define sz_xXF86VidModeGetViewPortReq		8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86VidModeGetModeLineReply;
+#define sz_xXF86VidModeGetModeLineReply	36
+
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86VidModeModeInfo;
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	modecount B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetAllModeLinesReply;
+#define sz_xXF86VidModeGetAllModeLinesReply	32
+
+typedef struct _XF86VidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD32	after_flags B32;
+} xXF86VidModeAddModeLineReq;
+#define sz_xXF86VidModeAddModeLineReq	60
+
+typedef struct _XF86VidModeModModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86VidModeModModeLineReq;
+#define sz_xXF86VidModeModModeLineReq	32
+
+typedef struct _XF86VidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86VidModeDeleteModeLineReq,
+  xXF86VidModeValidateModeLineReq,
+  xXF86VidModeSwitchToModeReq;
+#define sz_xXF86VidModeDeleteModeLineReq	36
+#define sz_xXF86VidModeValidateModeLineReq	36
+#define sz_xXF86VidModeSwitchToModeReq		36
+
+typedef struct _XF86VidModeSwitchMode {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	zoom B16;
+} xXF86VidModeSwitchModeReq;
+#define sz_xXF86VidModeSwitchModeReq	8
+
+typedef struct _XF86VidModeLockModeSwitch {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	lock B16;
+} xXF86VidModeLockModeSwitchReq;
+#define sz_xXF86VidModeLockModeSwitchReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeValidateModeLineReply;
+#define sz_xXF86VidModeValidateModeLineReply	32
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	vendorLength;
+    CARD8	modelLength;
+    CARD8	nhsync;
+    CARD8	nvsync;
+    CARD32	bandwidth B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86VidModeGetMonitorReply;
+#define sz_xXF86VidModeGetMonitorReply	32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	x B32;
+    CARD32	y B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86VidModeGetViewPortReply;
+#define sz_xXF86VidModeGetViewPortReply	32
+
+typedef struct _XF86VidModeSetViewPort {
+    CARD8	reqType;		/* always VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32      x B32;
+    CARD32	y B32;
+} xXF86VidModeSetViewPortReq;
+#define sz_xXF86VidModeSetViewPortReq	16
+
+#endif /* _XF86VIDMODESTR_H_ */
-- 
cgit v1.2.3


From 754f6a23806c0eb9878f35410b4ce37d69b2f4f8 Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Fri, 14 Nov 2003 16:48:43 +0000
Subject: XFree86 4.3.0.1

---
 xf86vmode.h | 110 ++++++++++++++++------
 xf86vmstr.h | 308 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 376 insertions(+), 42 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 508fa2c..99e6323 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.20.2.1 1997/07/13 14:44:57 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
@@ -51,6 +51,17 @@ from Kaleb S. KEITHLEY
 #define X_XF86VidModeSwitchToMode	10
 #define X_XF86VidModeGetViewPort	11
 #define X_XF86VidModeSetViewPort	12
+/* new for version 2.x of this extension */
+#define X_XF86VidModeGetDotClocks	13
+#define X_XF86VidModeSetClientVersion	14
+#define X_XF86VidModeSetGamma		15
+#define X_XF86VidModeGetGamma		16
+#define X_XF86VidModeGetGammaRamp	17
+#define X_XF86VidModeSetGammaRamp	18
+#define X_XF86VidModeGetGammaRampSize	19
+#define X_XF86VidModeGetPermissions	20
+
+#define CLKFLAG_PROGRAMABLE		1
 
 #ifdef XF86VIDMODE_EVENTS
 #define XF86VidModeNotify		0
@@ -73,6 +84,9 @@ from Kaleb S. KEITHLEY
 #define XF86VidModeZoomLocked		6
 #define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
 
+#define XF86VM_READ_PERMISSION	1
+#define XF86VM_WRITE_PERMISSION	2
+
 #ifndef _XF86VIDMODE_SERVER_
 
 typedef struct {
@@ -80,6 +94,7 @@ typedef struct {
     unsigned short	hsyncstart;
     unsigned short	hsyncend;
     unsigned short	htotal;
+    unsigned short	hskew;
     unsigned short	vdisplay;
     unsigned short	vsyncstart;
     unsigned short	vsyncend;
@@ -100,6 +115,7 @@ typedef struct {
     unsigned short	hsyncstart;
     unsigned short	hsyncend;
     unsigned short	htotal;
+    unsigned short	hskew;
     unsigned short	vdisplay;
     unsigned short	vsyncstart;
     unsigned short	vsyncend;
@@ -122,7 +138,7 @@ typedef struct {
 typedef struct {
     char*			vendor;
     char*			model;
-    float			bandwidth;
+    float			EMPTY;
     unsigned char		nhsync;
     XF86VidModeSyncRange*	hsync;
     unsigned char		nvsync;
@@ -141,6 +157,13 @@ typedef struct {
     Time time;			/* event timestamp */
 } XF86VidModeNotifyEvent;
 
+typedef struct {
+    float red;			/* Red Gamma value */
+    float green;		/* Green Gamma value */
+    float blue;			/* Blue Gamma value */
+} XF86VidModeGamma;
+
+
 #define XF86VidModeSelectNextMode(disp, scr) \
 	XF86VidModeSwitchMode(disp, scr, 1)
 #define XF86VidModeSelectPrevMode(disp, scr) \
@@ -149,120 +172,147 @@ typedef struct {
 _XFUNCPROTOBEGIN
 
 Bool XF86VidModeQueryVersion(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* majorVersion */,
     int*		/* minorVersion */
-#endif
 );
 
 Bool XF86VidModeQueryExtension(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int*		/* event_base */,
     int*		/* error_base */
-#endif
+);
+
+Bool XF86VidModeSetClientVersion(
+    Display*		/* dpy */
 );
 
 Bool XF86VidModeGetModeLine(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     int*			/* dotclock */,
     XF86VidModeModeLine*	/* modeline */
-#endif
 );
 
 Bool XF86VidModeGetAllModeLines(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     int*			/* modecount */,
     XF86VidModeModeInfo***	/* modelinesPtr */
-#endif
 );
 
 Bool XF86VidModeAddModeLine(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     XF86VidModeModeInfo*	/* new modeline */,
     XF86VidModeModeInfo*	/* after modeline */
-#endif
 );
 
 Bool XF86VidModeDeleteModeLine(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     XF86VidModeModeInfo*	/* modeline */
-#endif
 );
 
 Bool XF86VidModeModModeLine(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     XF86VidModeModeLine*	/* modeline */
-#endif
 );
 
 Status XF86VidModeValidateModeLine(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     XF86VidModeModeInfo*	/* modeline */
-#endif
 );
 
 Bool XF86VidModeSwitchMode(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     int			/* zoom */
-#endif
 );
 
 Bool XF86VidModeSwitchToMode(
-#if NeedFunctionPrototypes
     Display*			/* dpy */,
     int				/* screen */,
     XF86VidModeModeInfo*	/* modeline */
-#endif
 );
 
 Bool XF86VidModeLockModeSwitch(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     int			/* lock */
-#endif
 );
 
 Bool XF86VidModeGetMonitor(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     XF86VidModeMonitor*	/* monitor */
-#endif
 );
 
 Bool XF86VidModeGetViewPort(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     int*		/* x return */,
     int*		/* y return */
-#endif
 );
 
 Bool XF86VidModeSetViewPort(
-#if NeedFunctionPrototypes
     Display*		/* dpy */,
     int			/* screen */,
     int			/* x */,
     int			/* y */
-#endif
+);
+
+Bool XF86VidModeGetDotClocks(
+    Display*		/* dpy */,
+    int			/* screen */,
+    int*		/* flags return */,
+    int*		/* number of clocks return */,
+    int*		/* max dot clock return */,
+    int**		/* clocks return */
+);
+
+Bool XF86VidModeGetGamma(
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeGamma*		/* Gamma */
+);
+
+Bool XF86VidModeSetGamma(
+    Display*			/* dpy */,
+    int				/* screen */,
+    XF86VidModeGamma*		/* Gamma */
+);
+
+Bool XF86VidModeSetGammaRamp(
+    Display*                    /* dpy */,
+    int                         /* screen */,
+    int				/* size */, 
+    unsigned short*             /* red array */,
+    unsigned short*             /* green array */,
+    unsigned short*             /* blue array */
+);
+
+Bool XF86VidModeGetGammaRamp(
+    Display*                    /* dpy */,
+    int                         /* screen */,
+    int                         /* size */,
+    unsigned short*             /* red array */,
+    unsigned short*             /* green array */,
+    unsigned short*             /* blue array */
+);
+
+Bool XF86VidModeGetGammaRampSize(
+    Display*                    /* dpy */,
+    int                         /* screen */,
+    int*                        /* size */
+);
+
+Bool XF86VidModeGetPermissions(
+    Display*                    /* dpy */,
+    int                         /* screen */,
+    int*			/* permissions */
 );
 
 _XFUNCPROTOEND
diff --git a/xf86vmstr.h b/xf86vmstr.h
index 0a216eb..db6f6e6 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.16 1996/10/16 14:28:58 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
@@ -35,16 +35,17 @@ from Kaleb S. KEITHLEY
 #ifndef _XF86VIDMODESTR_H_
 #define _XF86VIDMODESTR_H_
 
-#include "xf86vmode.h"
+#include <X11/extensions/xf86vmode.h>
 
 #define XF86VIDMODENAME "XFree86-VidModeExtension"
 
-#define XF86VIDMODE_MAJOR_VERSION	0	/* current version numbers */
-#define XF86VIDMODE_MINOR_VERSION	7
+#define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
+#define XF86VIDMODE_MINOR_VERSION	2
 /*
  * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
  * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
  *                    client.
+ * major version 2 == uses new protocol version in XFree86 4.0.
  */
 
 typedef struct _XF86VidModeQueryVersion {
@@ -78,11 +79,15 @@ typedef struct _XF86VidModeGetModeLine {
 } xXF86VidModeGetModeLineReq,
   xXF86VidModeGetAllModeLinesReq,
   xXF86VidModeGetMonitorReq,
-  xXF86VidModeGetViewPortReq;
+  xXF86VidModeGetViewPortReq,
+  xXF86VidModeGetDotClocksReq,
+  xXF86VidModeGetPermissionsReq;
 #define sz_xXF86VidModeGetModeLineReq		8
 #define sz_xXF86VidModeGetAllModeLinesReq	8
 #define sz_xXF86VidModeGetMonitorReq		8
 #define sz_xXF86VidModeGetViewPortReq		8
+#define sz_xXF86VidModeGetDotClocksReq		8
+#define sz_xXF86VidModeGetPermissionsReq	8
 
 typedef struct {
     BYTE	type;			/* X_Reply */
@@ -94,14 +99,39 @@ typedef struct {
     CARD16	hsyncstart B16;
     CARD16	hsyncend B16;
     CARD16	htotal B16;
+    CARD16	hskew B16;
     CARD16	vdisplay B16;
     CARD16	vsyncstart B16;
     CARD16	vsyncend B16;
     CARD16	vtotal B16;
+    CARD16	pad2 B16;
     CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
     CARD32	privsize B32;
 } xXF86VidModeGetModeLineReply;
-#define sz_xXF86VidModeGetModeLineReply	36
+#define sz_xXF86VidModeGetModeLineReply	52
+
+/* 0.x version */
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeGetModeLineReply;
+#define sz_xXF86OldVidModeGetModeLineReply	36
 
 typedef struct {
     CARD32	dotclock B32;
@@ -109,14 +139,34 @@ typedef struct {
     CARD16	hsyncstart B16;
     CARD16	hsyncend B16;
     CARD16	htotal B16;
+    CARD32	hskew B16;
     CARD16	vdisplay B16;
     CARD16	vsyncstart B16;
     CARD16	vsyncend B16;
     CARD16	vtotal B16;
+    CARD16	pad1 B16;
     CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
     CARD32	privsize B32;
 } xXF86VidModeModeInfo;
 
+/* 0.x version */
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModeInfo;
+
 typedef struct {
     BYTE	type;			/* X_Reply */
     BOOL	pad1;
@@ -141,24 +191,64 @@ typedef struct _XF86VidModeAddModeLine {
     CARD16	hsyncstart B16;
     CARD16	hsyncend B16;
     CARD16	htotal B16;
+    CARD16	hskew B16;
     CARD16	vdisplay B16;
     CARD16	vsyncstart B16;
     CARD16	vsyncend B16;
     CARD16	vtotal B16;
+    CARD16	pad1 B16;
     CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
     CARD32	privsize B32;
     CARD32	after_dotclock B32;
     CARD16	after_hdisplay B16;
     CARD16	after_hsyncstart B16;
     CARD16	after_hsyncend B16;
     CARD16	after_htotal B16;
+    CARD16	after_hskew B16;
     CARD16	after_vdisplay B16;
     CARD16	after_vsyncstart B16;
     CARD16	after_vsyncend B16;
     CARD16	after_vtotal B16;
+    CARD16	pad2 B16;
     CARD32	after_flags B32;
+    CARD32	reserved4 B32;
+    CARD32	reserved5 B32;
+    CARD32	reserved6 B32;
 } xXF86VidModeAddModeLineReq;
-#define sz_xXF86VidModeAddModeLineReq	60
+#define sz_xXF86VidModeAddModeLineReq	92
+
+/* 0.x version */
+typedef struct _XF86OldVidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD32	after_flags B32;
+} xXF86OldVidModeAddModeLineReq;
+#define sz_xXF86OldVidModeAddModeLineReq	60
 
 typedef struct _XF86VidModeModModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
@@ -169,14 +259,38 @@ typedef struct _XF86VidModeModModeLine {
     CARD16	hsyncstart B16;
     CARD16	hsyncend B16;
     CARD16	htotal B16;
+    CARD16	hskew B16;
     CARD16	vdisplay B16;
     CARD16	vsyncstart B16;
     CARD16	vsyncend B16;
     CARD16	vtotal B16;
+    CARD16	pad1 B16;
     CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
     CARD32	privsize B32;
 } xXF86VidModeModModeLineReq;
-#define sz_xXF86VidModeModModeLineReq	32
+#define sz_xXF86VidModeModModeLineReq	48
+
+/* 0.x version */
+typedef struct _XF86OldVidModeModModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModModeLineReq;
+#define sz_xXF86OldVidModeModModeLineReq	32
 
 typedef struct _XF86VidModeValidateModeLine {
     CARD8	reqType;		/* always XF86VidModeReqCode */
@@ -188,18 +302,47 @@ typedef struct _XF86VidModeValidateModeLine {
     CARD16	hsyncstart B16;
     CARD16	hsyncend B16;
     CARD16	htotal B16;
+    CARD16	hskew B16;
     CARD16	vdisplay B16;
     CARD16	vsyncstart B16;
     CARD16	vsyncend B16;
     CARD16	vtotal B16;
+    CARD16	pad1 B16;
     CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
     CARD32	privsize B32;
 } xXF86VidModeDeleteModeLineReq,
   xXF86VidModeValidateModeLineReq,
   xXF86VidModeSwitchToModeReq;
-#define sz_xXF86VidModeDeleteModeLineReq	36
-#define sz_xXF86VidModeValidateModeLineReq	36
-#define sz_xXF86VidModeSwitchToModeReq		36
+#define sz_xXF86VidModeDeleteModeLineReq	52
+#define sz_xXF86VidModeValidateModeLineReq	52
+#define sz_xXF86VidModeSwitchToModeReq		52
+
+/* 0.x version */
+typedef struct _XF86OldVidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeDeleteModeLineReq,
+  xXF86OldVidModeValidateModeLineReq,
+  xXF86OldVidModeSwitchToModeReq;
+#define sz_xXF86OldVidModeDeleteModeLineReq	36
+#define sz_xXF86OldVidModeValidateModeLineReq	36
+#define sz_xXF86OldVidModeSwitchToModeReq	36
 
 typedef struct _XF86VidModeSwitchMode {
     CARD8	reqType;		/* always XF86VidModeReqCode */
@@ -242,11 +385,11 @@ typedef struct {
     CARD8	modelLength;
     CARD8	nhsync;
     CARD8	nvsync;
-    CARD32	bandwidth B32;
     CARD32	pad2 B32;
     CARD32	pad3 B32;
     CARD32	pad4 B32;
     CARD32	pad5 B32;
+    CARD32	pad6 B32;
 } xXF86VidModeGetMonitorReply;
 #define sz_xXF86VidModeGetMonitorReply	32
 
@@ -275,4 +418,145 @@ typedef struct _XF86VidModeSetViewPort {
 } xXF86VidModeSetViewPortReq;
 #define sz_xXF86VidModeSetViewPortReq	16
 
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	flags B32;
+    CARD32	clocks B32;
+    CARD32	maxclocks B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xXF86VidModeGetDotClocksReply;
+#define sz_xXF86VidModeGetDotClocksReply	32
+
+typedef struct _XF86VidModeSetClientVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXF86VidModeSetClientVersionReq;
+#define sz_xXF86VidModeSetClientVersionReq	8
+
+typedef struct _XF86VidModeGetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetGammaReq;
+#define sz_xXF86VidModeGetGammaReq		32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeGetGammaReply;
+#define sz_xXF86VidModeGetGammaReply		32
+
+typedef struct _XF86VidModeSetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeSetGammaReq;
+#define sz_xXF86VidModeSetGammaReq		32
+
+
+typedef struct _XF86VidModeSetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeSetGammaRampReq;
+#define sz_xXF86VidModeSetGammaRampReq             8 
+
+typedef struct _XF86VidModeGetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeGetGammaRampReq;
+#define sz_xXF86VidModeGetGammaRampReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampReply;
+#define sz_xXF86VidModeGetGammaRampReply            32
+
+typedef struct _XF86VidModeGetGammaRampSize {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86VidModeGetGammaRampSizeReq;
+#define sz_xXF86VidModeGetGammaRampSizeReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampSizeReply;
+#define sz_xXF86VidModeGetGammaRampSizeReply            32
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      permissions B32;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetPermissionsReply;
+#define sz_xXF86VidModeGetPermissionsReply            32
+
+
 #endif /* _XF86VIDMODESTR_H_ */
+
-- 
cgit v1.2.3


From d5a66212db8227a44377cd7bd970c4e2fc45105f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 26 Feb 2004 09:22:28 +0000
Subject: Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST
 2004

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 99e6323..3f69401 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index db6f6e6..1782939 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86$ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From e40543bec997d79ff38179b53e29a3b81cddd243 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Thu, 26 Feb 2004 13:35:14 +0000
Subject: readding XFree86's cvs IDs

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 3f69401..99e6323 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index 1782939..db6f6e6 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From 6115f13c599aea728376960d890d6cc9388a3c4a Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Wed, 3 Mar 2004 12:10:54 +0000
Subject: Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 99e6323..3420ae4 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index db6f6e6..a80eb8e 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From ef8371400847bef2287569ac71788a9826a9b729 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Sun, 14 Mar 2004 08:31:36 +0000
Subject: Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST
 2004

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 3420ae4..99e6323 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index a80eb8e..db6f6e6 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From 0748aa1ae39c980ddb1187ecdfc2207facf2e389 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 18:43:06 +0000
Subject: Merging XORG-CURRENT into trunk

---
 xf86vmode.h | 2 +-
 xf86vmstr.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 99e6323..3420ae4 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.31 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
diff --git a/xf86vmstr.h b/xf86vmstr.h
index db6f6e6..a80eb8e 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.28 2002/12/22 00:46:50 dawes Exp $ */
+/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From 5ed94797c194b427855f5df9e1c2ae64638af180 Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 6 May 2005 01:46:32 +0000
Subject: Initial build system files for proto module.

---
 Makefile.am          |  9 +++++++++
 autogen.sh           | 12 ++++++++++++
 configure.ac         |  6 ++++++
 xf86vidmodeext.pc.in |  9 +++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 Makefile.am
 create mode 100755 autogen.sh
 create mode 100644 configure.ac
 create mode 100644 xf86vidmodeext.pc.in

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..b2045f6
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,9 @@
+xf86vidmodedir = $(includedir)/X11/extensions
+xf86vidmode_HEADERS = \
+	xf86vmode.h \
+	xf86vmstr.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xf86vidmodeext.pc
+
+EXTRA_DIST = autogen.sh xf86vidmodeext.pc.in
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/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/configure.ac b/configure.ac
new file mode 100644
index 0000000..d20b2ef
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,6 @@
+AC_PREREQ([2.57])
+AC_INIT([XF86VidModeExt], [7.0], [xorg@lists.freedesktop.org])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+AC_OUTPUT([Makefile
+           xf86vidmodeext.pc])
diff --git a/xf86vidmodeext.pc.in b/xf86vidmodeext.pc.in
new file mode 100644
index 0000000..c67019c
--- /dev/null
+++ b/xf86vidmodeext.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XF86VidModeExt
+Description: XF86VidMode extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
-- 
cgit v1.2.3


From b33eb4f56ee5c9e0b05fd6928c799e422a689790 Mon Sep 17 00:00:00 2001
From: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon, 9 May 2005 18:20:07 +0000
Subject: Change all the protonames from <extension>Ext to <extension>Proto.

---
 Makefile.am            | 4 ++--
 configure.ac           | 4 ++--
 xf86vidmodeext.pc.in   | 9 ---------
 xf86vidmodeproto.pc.in | 9 +++++++++
 4 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 xf86vidmodeext.pc.in
 create mode 100644 xf86vidmodeproto.pc.in

diff --git a/Makefile.am b/Makefile.am
index b2045f6..7159854 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,6 @@ xf86vidmode_HEADERS = \
 	xf86vmstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xf86vidmodeext.pc
+pkgconfig_DATA = xf86vidmodeproto.pc
 
-EXTRA_DIST = autogen.sh xf86vidmodeext.pc.in
+EXTRA_DIST = autogen.sh xf86vidmodeproto.pc.in
diff --git a/configure.ac b/configure.ac
index d20b2ef..9026da6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeExt], [7.0], [xorg@lists.freedesktop.org])
+AC_INIT([XF86VidModeProto], [7.0], [xorg@lists.freedesktop.org])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
  
 AC_OUTPUT([Makefile
-           xf86vidmodeext.pc])
+           xf86vidmodeproto.pc])
diff --git a/xf86vidmodeext.pc.in b/xf86vidmodeext.pc.in
deleted file mode 100644
index c67019c..0000000
--- a/xf86vidmodeext.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
- 
-Name: XF86VidModeExt
-Description: XF86VidMode extension headers
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}
diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in
new file mode 100644
index 0000000..afbb702
--- /dev/null
+++ b/xf86vidmodeproto.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XF86VidModeProto
+Description: XF86VidMode extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
-- 
cgit v1.2.3


From b8c1be8e8a5737ff433ddff3a71fa7c25d3be14f Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@speakeasy.net>
Date: Wed, 18 May 2005 08:05:14 +0000
Subject: Add COPYING file for XF86VidMode.

---
 COPYING | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 COPYING

diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..bc845c0
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,25 @@
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
-- 
cgit v1.2.3


From 3f0d5315ce34c2e289b4c45fe336982e2d19611e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Thu, 19 May 2005 00:10:20 +0000
Subject: Require automake 1.7 in AM_INIT_AUTOMAKE

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9026da6..f38c45e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [7.0], [xorg@lists.freedesktop.org])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2])
  
 AC_OUTPUT([Makefile
            xf86vidmodeproto.pc])
-- 
cgit v1.2.3


From ff7d9c3e3d9f3090c70ee315379184cec840bab9 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Thu, 19 May 2005 00:22:41 +0000
Subject: revert last change, didn't do right thing at all, sorry for the noise

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f38c45e..9026da6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [7.0], [xorg@lists.freedesktop.org])
-AM_INIT_AUTOMAKE([1.7], [foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
  
 AC_OUTPUT([Makefile
            xf86vidmodeproto.pc])
-- 
cgit v1.2.3


From 5a98fd8bf1673989e2137f3c77b5308d06c9cfb2 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Sat, 21 May 2005 04:57:26 +0000
Subject: Set version to 2.2.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9026da6..7f01a80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [7.0], [xorg@lists.freedesktop.org])
+AC_INIT([XF86VidModeProto], [2.2], [xorg@lists.freedesktop.org])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
  
 AC_OUTPUT([Makefile
-- 
cgit v1.2.3


From 01842f2f1c3b1e9fd1c3d87a05f9c17a7958efcb Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 29 Jul 2005 21:22:57 +0000
Subject: Various changes preparing packages for RC0: - Verify and update
 package version numbers as needed - Implement versioning scheme - Change bug
 address to point to bugzilla bug entry form - Disable loadable i18n in libX11
 by default (use --enable-loadable-i18n to     reenable it) - Fix makedepend
 to use pkgconfig and pass distcheck - Update build script to build macros
 first - Update modular Xorg version

---
 configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7f01a80..2a33ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [2.2], [xorg@lists.freedesktop.org])
+AC_INIT([XF86VidModeProto], [2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
+
+XORG_RELEASE_VERSION
+
 AC_OUTPUT([Makefile
            xf86vidmodeproto.pc])
-- 
cgit v1.2.3


From 3fed39c66767d7749e0100d0e5a7ff8d30d5ba89 Mon Sep 17 00:00:00 2001
From: Eric Anholt <anholt@freebsd.org>
Date: Tue, 2 Aug 2005 19:19:41 +0000
Subject: Add basic .cvsignore files for proto modules.

---
 .cvsignore | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .cvsignore

diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..3a8a412
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,10 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+xf86vidmodeproto.pc
\ No newline at end of file
-- 
cgit v1.2.3


From b640ed8f4aae8665ece27bbb88929271e5d23bfb Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Wed, 19 Oct 2005 02:48:16 +0000
Subject: Update package version number for RC1 release.

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2a33ffe..7edaee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86VidModeProto], [2.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
-- 
cgit v1.2.3


From 6f31aeb365cf7458a32c41a7d8330e3a7200639d Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Thu, 15 Dec 2005 00:24:40 +0000
Subject: Update package version number for final X11R7 release candidate.

---
 ChangeLog    | 4 ++++
 configure.ac | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..c722b51
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* configure.ac:
+	Update package version number for final X11R7 release candidate.
diff --git a/configure.ac b/configure.ac
index 7edaee1..945dcc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [2.2.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86VidModeProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION
-- 
cgit v1.2.3


From f162f887d750eb55e8b2bf69d67ef93cf9d01214 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri, 14 Jul 2006 18:56:51 -0700
Subject: renamed: .cvsignore -> .gitignore

---
 .cvsignore | 10 ----------
 .gitignore | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 .cvsignore
 create mode 100644 .gitignore

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 3a8a412..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.log
-config.status
-configure
-install-sh
-missing
-xf86vidmodeproto.pc
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3a8a412
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+install-sh
+missing
+xf86vidmodeproto.pc
\ No newline at end of file
-- 
cgit v1.2.3


From cdf94f93116528a9b9acf520bf22d9075b0f3e50 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Mon, 3 Sep 2007 05:54:32 -0400
Subject: Add *~ to .gitignore to skip patch/emacs droppings

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3a8a412..f0fa3d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ config.status
 configure
 install-sh
 missing
-xf86vidmodeproto.pc
\ No newline at end of file
+xf86vidmodeproto.pc*~
-- 
cgit v1.2.3


From a163fd8950df350205503b53cd202775b2e402d5 Mon Sep 17 00:00:00 2001
From: James Cloos <cloos@jhcloos.com>
Date: Thu, 6 Dec 2007 16:39:13 -0500
Subject: Replace static ChangeLog with dist-hook to generate from git log

---
 ChangeLog   |  4 ----
 Makefile.am | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index 7159854..4265ed2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86vidmodeproto.pc
 
 EXTRA_DIST = autogen.sh xf86vidmodeproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
-- 
cgit v1.2.3


From 7efd16a110ea4e8a7deab405fba7e1f5ceb4add2 Mon Sep 17 00:00:00 2001
From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue, 27 Jan 2009 20:06:28 -0200
Subject: Janitor: Correct make distcheck and dont distribute autogen.sh

---
 .gitignore   | 5 +++++
 Makefile.am  | 4 ++--
 configure.ac | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index f0fa3d3..9a983bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,9 @@ config.status
 configure
 install-sh
 missing
+xf86vidmodeproto.pc
+*~
 xf86vidmodeproto.pc*~
+xf86vidmodeproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 4265ed2..2211100 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ xf86vidmode_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86vidmodeproto.pc
 
-EXTRA_DIST = autogen.sh xf86vidmodeproto.pc.in
+EXTRA_DIST = xf86vidmodeproto.pc.in
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
@@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 945dcc4..d5dab6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [2.2.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
            xf86vidmodeproto.pc])
-- 
cgit v1.2.3


From 6c6cedfb11acd4152df2cdd284d4d982bb08860f Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 26 Aug 2009 12:07:57 +1000
Subject: Remove RCS tags

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xf86vmode.h | 2 --
 xf86vmstr.h | 2 --
 2 files changed, 4 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index 3420ae4..c143d83 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86vmode.h,v 3.30 2001/05/07 20:09:50 mvojkovi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
@@ -28,7 +27,6 @@ or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
 */
-/* $Xorg: xf86vmode.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/xf86vmstr.h b/xf86vmstr.h
index a80eb8e..8e772e7 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/include/extensions/xf86vmstr.h,v 3.27 2001/08/01 00:44:36 tsi Exp $ */
 /*
 
 Copyright 1995  Kaleb S. KEITHLEY
@@ -28,7 +27,6 @@ or other dealings in this Software without prior written authorization
 from Kaleb S. KEITHLEY
 
 */
-/* $Xorg: xf86vmstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $ */
 
 /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
 
-- 
cgit v1.2.3


From 0f02b0aea4fd864ceaa2bea6f09bbea2d8e9cfbf Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 26 Aug 2009 15:31:51 +1000
Subject: Move xf86vmstr.h to xf86vmproto.h for consistency with other modules.

A stub xf86vmstr.h is provided to avoid clients breaking.
---
 Makefile.am   |   1 +
 xf86vmproto.h | 560 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 xf86vmstr.h   | 563 +---------------------------------------------------------
 3 files changed, 564 insertions(+), 560 deletions(-)
 create mode 100644 xf86vmproto.h

diff --git a/Makefile.am b/Makefile.am
index 2211100..4655a54 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 xf86vidmodedir = $(includedir)/X11/extensions
 xf86vidmode_HEADERS = \
 	xf86vmode.h \
+	xf86vmproto.h \
 	xf86vmstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/xf86vmproto.h b/xf86vmproto.h
new file mode 100644
index 0000000..0022d8f
--- /dev/null
+++ b/xf86vmproto.h
@@ -0,0 +1,560 @@
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VIDMODEPROTO_H_
+#define _XF86VIDMODEPROTO_H_
+
+#include <X11/extensions/xf86vmode.h>
+
+#define XF86VIDMODENAME "XFree86-VidModeExtension"
+
+#define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
+#define XF86VIDMODE_MINOR_VERSION	2
+/*
+ * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
+ * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
+ *                    client.
+ * major version 2 == uses new protocol version in XFree86 4.0.
+ */
+
+typedef struct _XF86VidModeQueryVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
+    CARD16	length B16;
+} xXF86VidModeQueryVersionReq;
+#define sz_xXF86VidModeQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of XF86VidMode */
+    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeQueryVersionReply;
+#define sz_xXF86VidModeQueryVersionReply	32
+
+typedef struct _XF86VidModeGetModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+} xXF86VidModeGetModeLineReq,
+  xXF86VidModeGetAllModeLinesReq,
+  xXF86VidModeGetMonitorReq,
+  xXF86VidModeGetViewPortReq,
+  xXF86VidModeGetDotClocksReq,
+  xXF86VidModeGetPermissionsReq;
+#define sz_xXF86VidModeGetModeLineReq		8
+#define sz_xXF86VidModeGetAllModeLinesReq	8
+#define sz_xXF86VidModeGetMonitorReq		8
+#define sz_xXF86VidModeGetViewPortReq		8
+#define sz_xXF86VidModeGetDotClocksReq		8
+#define sz_xXF86VidModeGetPermissionsReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad2 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeGetModeLineReply;
+#define sz_xXF86VidModeGetModeLineReply	52
+
+/* 0.x version */
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeGetModeLineReply;
+#define sz_xXF86OldVidModeGetModeLineReply	36
+
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD32	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeModeInfo;
+
+/* 0.x version */
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModeInfo;
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	modecount B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetAllModeLinesReply;
+#define sz_xXF86VidModeGetAllModeLinesReply	32
+
+typedef struct _XF86VidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_hskew B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD16	pad2 B16;
+    CARD32	after_flags B32;
+    CARD32	reserved4 B32;
+    CARD32	reserved5 B32;
+    CARD32	reserved6 B32;
+} xXF86VidModeAddModeLineReq;
+#define sz_xXF86VidModeAddModeLineReq	92
+
+/* 0.x version */
+typedef struct _XF86OldVidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD32	after_flags B32;
+} xXF86OldVidModeAddModeLineReq;
+#define sz_xXF86OldVidModeAddModeLineReq	60
+
+typedef struct _XF86VidModeModModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeModModeLineReq;
+#define sz_xXF86VidModeModModeLineReq	48
+
+/* 0.x version */
+typedef struct _XF86OldVidModeModModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModModeLineReq;
+#define sz_xXF86OldVidModeModModeLineReq	32
+
+typedef struct _XF86VidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeDeleteModeLineReq,
+  xXF86VidModeValidateModeLineReq,
+  xXF86VidModeSwitchToModeReq;
+#define sz_xXF86VidModeDeleteModeLineReq	52
+#define sz_xXF86VidModeValidateModeLineReq	52
+#define sz_xXF86VidModeSwitchToModeReq		52
+
+/* 0.x version */
+typedef struct _XF86OldVidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeDeleteModeLineReq,
+  xXF86OldVidModeValidateModeLineReq,
+  xXF86OldVidModeSwitchToModeReq;
+#define sz_xXF86OldVidModeDeleteModeLineReq	36
+#define sz_xXF86OldVidModeValidateModeLineReq	36
+#define sz_xXF86OldVidModeSwitchToModeReq	36
+
+typedef struct _XF86VidModeSwitchMode {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	zoom B16;
+} xXF86VidModeSwitchModeReq;
+#define sz_xXF86VidModeSwitchModeReq	8
+
+typedef struct _XF86VidModeLockModeSwitch {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	lock B16;
+} xXF86VidModeLockModeSwitchReq;
+#define sz_xXF86VidModeLockModeSwitchReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeValidateModeLineReply;
+#define sz_xXF86VidModeValidateModeLineReply	32
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	vendorLength;
+    CARD8	modelLength;
+    CARD8	nhsync;
+    CARD8	nvsync;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetMonitorReply;
+#define sz_xXF86VidModeGetMonitorReply	32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	x B32;
+    CARD32	y B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86VidModeGetViewPortReply;
+#define sz_xXF86VidModeGetViewPortReply	32
+
+typedef struct _XF86VidModeSetViewPort {
+    CARD8	reqType;		/* always VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32      x B32;
+    CARD32	y B32;
+} xXF86VidModeSetViewPortReq;
+#define sz_xXF86VidModeSetViewPortReq	16
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	flags B32;
+    CARD32	clocks B32;
+    CARD32	maxclocks B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xXF86VidModeGetDotClocksReply;
+#define sz_xXF86VidModeGetDotClocksReply	32
+
+typedef struct _XF86VidModeSetClientVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXF86VidModeSetClientVersionReq;
+#define sz_xXF86VidModeSetClientVersionReq	8
+
+typedef struct _XF86VidModeGetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetGammaReq;
+#define sz_xXF86VidModeGetGammaReq		32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeGetGammaReply;
+#define sz_xXF86VidModeGetGammaReply		32
+
+typedef struct _XF86VidModeSetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeSetGammaReq;
+#define sz_xXF86VidModeSetGammaReq		32
+
+
+typedef struct _XF86VidModeSetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeSetGammaRampReq;
+#define sz_xXF86VidModeSetGammaRampReq             8 
+
+typedef struct _XF86VidModeGetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeGetGammaRampReq;
+#define sz_xXF86VidModeGetGammaRampReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampReply;
+#define sz_xXF86VidModeGetGammaRampReply            32
+
+typedef struct _XF86VidModeGetGammaRampSize {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86VidModeGetGammaRampSizeReq;
+#define sz_xXF86VidModeGetGammaRampSizeReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampSizeReply;
+#define sz_xXF86VidModeGetGammaRampSizeReply            32
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      permissions B32;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetPermissionsReply;
+#define sz_xXF86VidModeGetPermissionsReply            32
+
+
+#endif /* _XF86VIDMODEPROTO_H_ */
+
diff --git a/xf86vmstr.h b/xf86vmstr.h
index 8e772e7..f521335 100644
--- a/xf86vmstr.h
+++ b/xf86vmstr.h
@@ -1,560 +1,3 @@
-/*
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VIDMODESTR_H_
-#define _XF86VIDMODESTR_H_
-
-#include <X11/extensions/xf86vmode.h>
-
-#define XF86VIDMODENAME "XFree86-VidModeExtension"
-
-#define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
-#define XF86VIDMODE_MINOR_VERSION	2
-/*
- * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
- * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
- *                    client.
- * major version 2 == uses new protocol version in XFree86 4.0.
- */
-
-typedef struct _XF86VidModeQueryVersion {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
-    CARD16	length B16;
-} xXF86VidModeQueryVersionReq;
-#define sz_xXF86VidModeQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of XF86VidMode */
-    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeQueryVersionReply;
-#define sz_xXF86VidModeQueryVersionReply	32
-
-typedef struct _XF86VidModeGetModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-} xXF86VidModeGetModeLineReq,
-  xXF86VidModeGetAllModeLinesReq,
-  xXF86VidModeGetMonitorReq,
-  xXF86VidModeGetViewPortReq,
-  xXF86VidModeGetDotClocksReq,
-  xXF86VidModeGetPermissionsReq;
-#define sz_xXF86VidModeGetModeLineReq		8
-#define sz_xXF86VidModeGetAllModeLinesReq	8
-#define sz_xXF86VidModeGetMonitorReq		8
-#define sz_xXF86VidModeGetViewPortReq		8
-#define sz_xXF86VidModeGetDotClocksReq		8
-#define sz_xXF86VidModeGetPermissionsReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeGetModeLineReply;
-#define sz_xXF86VidModeGetModeLineReply	52
-
-/* 0.x version */
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeGetModeLineReply;
-#define sz_xXF86OldVidModeGetModeLineReply	36
-
-typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD32	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeModeInfo;
-
-/* 0.x version */
-typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeModeInfo;
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	modecount B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetAllModeLinesReply;
-#define sz_xXF86VidModeGetAllModeLinesReply	32
-
-typedef struct _XF86VidModeAddModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_hskew B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	after_flags B32;
-    CARD32	reserved4 B32;
-    CARD32	reserved5 B32;
-    CARD32	reserved6 B32;
-} xXF86VidModeAddModeLineReq;
-#define sz_xXF86VidModeAddModeLineReq	92
-
-/* 0.x version */
-typedef struct _XF86OldVidModeAddModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD32	after_flags B32;
-} xXF86OldVidModeAddModeLineReq;
-#define sz_xXF86OldVidModeAddModeLineReq	60
-
-typedef struct _XF86VidModeModModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeModModeLineReq;
-#define sz_xXF86VidModeModModeLineReq	48
-
-/* 0.x version */
-typedef struct _XF86OldVidModeModModeLine {
-    CARD8	reqType;		/* always XF86OldVidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeModModeLineReq;
-#define sz_xXF86OldVidModeModModeLineReq	32
-
-typedef struct _XF86VidModeValidateModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeDeleteModeLineReq,
-  xXF86VidModeValidateModeLineReq,
-  xXF86VidModeSwitchToModeReq;
-#define sz_xXF86VidModeDeleteModeLineReq	52
-#define sz_xXF86VidModeValidateModeLineReq	52
-#define sz_xXF86VidModeSwitchToModeReq		52
-
-/* 0.x version */
-typedef struct _XF86OldVidModeValidateModeLine {
-    CARD8	reqType;		/* always XF86OldVidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeDeleteModeLineReq,
-  xXF86OldVidModeValidateModeLineReq,
-  xXF86OldVidModeSwitchToModeReq;
-#define sz_xXF86OldVidModeDeleteModeLineReq	36
-#define sz_xXF86OldVidModeValidateModeLineReq	36
-#define sz_xXF86OldVidModeSwitchToModeReq	36
-
-typedef struct _XF86VidModeSwitchMode {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	zoom B16;
-} xXF86VidModeSwitchModeReq;
-#define sz_xXF86VidModeSwitchModeReq	8
-
-typedef struct _XF86VidModeLockModeSwitch {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	lock B16;
-} xXF86VidModeLockModeSwitchReq;
-#define sz_xXF86VidModeLockModeSwitchReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	status B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeValidateModeLineReply;
-#define sz_xXF86VidModeValidateModeLineReply	32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	vendorLength;
-    CARD8	modelLength;
-    CARD8	nhsync;
-    CARD8	nvsync;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetMonitorReply;
-#define sz_xXF86VidModeGetMonitorReply	32
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	x B32;
-    CARD32	y B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86VidModeGetViewPortReply;
-#define sz_xXF86VidModeGetViewPortReply	32
-
-typedef struct _XF86VidModeSetViewPort {
-    CARD8	reqType;		/* always VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32      x B32;
-    CARD32	y B32;
-} xXF86VidModeSetViewPortReq;
-#define sz_xXF86VidModeSetViewPortReq	16
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	flags B32;
-    CARD32	clocks B32;
-    CARD32	maxclocks B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xXF86VidModeGetDotClocksReply;
-#define sz_xXF86VidModeGetDotClocksReply	32
-
-typedef struct _XF86VidModeSetClientVersion {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
-} xXF86VidModeSetClientVersionReq;
-#define sz_xXF86VidModeSetClientVersionReq	8
-
-typedef struct _XF86VidModeGetGamma {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetGammaReq;
-#define sz_xXF86VidModeGetGammaReq		32
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xXF86VidModeGetGammaReply;
-#define sz_xXF86VidModeGetGammaReply		32
-
-typedef struct _XF86VidModeSetGamma {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xXF86VidModeSetGammaReq;
-#define sz_xXF86VidModeSetGammaReq		32
-
-
-typedef struct _XF86VidModeSetGammaRamp {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
-} xXF86VidModeSetGammaRampReq;
-#define sz_xXF86VidModeSetGammaRampReq             8 
-
-typedef struct _XF86VidModeGetGammaRamp {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
-} xXF86VidModeGetGammaRampReq;
-#define sz_xXF86VidModeGetGammaRampReq             8
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetGammaRampReply;
-#define sz_xXF86VidModeGetGammaRampReply            32
-
-typedef struct _XF86VidModeGetGammaRampSize {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
-} xXF86VidModeGetGammaRampSizeReq;
-#define sz_xXF86VidModeGetGammaRampSizeReq             8
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetGammaRampSizeReply;
-#define sz_xXF86VidModeGetGammaRampSizeReply            32
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      permissions B32;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetPermissionsReply;
-#define sz_xXF86VidModeGetPermissionsReply            32
-
-
-#endif /* _XF86VIDMODESTR_H_ */
-
+#warning "xf86vmstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86vmproto.h> for the protocol defines."
+#include <X11/extensions/xf86vmproto.h>
-- 
cgit v1.2.3


From d80e22cbe804ce4d21082bd13484b03ffe05ef4a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 26 Aug 2009 15:40:04 +1000
Subject: Move request opcodes to xf86vmproto.h

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 xf86vmode.h   | 22 ----------------------
 xf86vmproto.h | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/xf86vmode.h b/xf86vmode.h
index c143d83..05ae1c9 100644
--- a/xf86vmode.h
+++ b/xf86vmode.h
@@ -36,28 +36,6 @@ from Kaleb S. KEITHLEY
 #include <X11/Xfuncproto.h>
 #include <X11/Xmd.h>
 
-#define X_XF86VidModeQueryVersion	0
-#define X_XF86VidModeGetModeLine	1
-#define X_XF86VidModeModModeLine	2
-#define X_XF86VidModeSwitchMode		3
-#define X_XF86VidModeGetMonitor		4
-#define X_XF86VidModeLockModeSwitch	5
-#define X_XF86VidModeGetAllModeLines	6
-#define X_XF86VidModeAddModeLine	7
-#define X_XF86VidModeDeleteModeLine	8
-#define X_XF86VidModeValidateModeLine	9
-#define X_XF86VidModeSwitchToMode	10
-#define X_XF86VidModeGetViewPort	11
-#define X_XF86VidModeSetViewPort	12
-/* new for version 2.x of this extension */
-#define X_XF86VidModeGetDotClocks	13
-#define X_XF86VidModeSetClientVersion	14
-#define X_XF86VidModeSetGamma		15
-#define X_XF86VidModeGetGamma		16
-#define X_XF86VidModeGetGammaRamp	17
-#define X_XF86VidModeSetGammaRamp	18
-#define X_XF86VidModeGetGammaRampSize	19
-#define X_XF86VidModeGetPermissions	20
 
 #define CLKFLAG_PROGRAMABLE		1
 
diff --git a/xf86vmproto.h b/xf86vmproto.h
index 0022d8f..3c90820 100644
--- a/xf86vmproto.h
+++ b/xf86vmproto.h
@@ -39,6 +39,29 @@ from Kaleb S. KEITHLEY
 
 #define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
 #define XF86VIDMODE_MINOR_VERSION	2
+
+#define X_XF86VidModeQueryVersion	0
+#define X_XF86VidModeGetModeLine	1
+#define X_XF86VidModeModModeLine	2
+#define X_XF86VidModeSwitchMode		3
+#define X_XF86VidModeGetMonitor		4
+#define X_XF86VidModeLockModeSwitch	5
+#define X_XF86VidModeGetAllModeLines	6
+#define X_XF86VidModeAddModeLine	7
+#define X_XF86VidModeDeleteModeLine	8
+#define X_XF86VidModeValidateModeLine	9
+#define X_XF86VidModeSwitchToMode	10
+#define X_XF86VidModeGetViewPort	11
+#define X_XF86VidModeSetViewPort	12
+/* new for version 2.x of this extension */
+#define X_XF86VidModeGetDotClocks	13
+#define X_XF86VidModeSetClientVersion	14
+#define X_XF86VidModeSetGamma		15
+#define X_XF86VidModeGetGamma		16
+#define X_XF86VidModeGetGammaRamp	17
+#define X_XF86VidModeSetGammaRamp	18
+#define X_XF86VidModeGetGammaRampSize	19
+#define X_XF86VidModeGetPermissions	20
 /*
  * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
  * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
-- 
cgit v1.2.3


From 50fe2de4abe06bcf9e38e7dcd5005538e0ba3ce1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 26 Aug 2009 15:42:05 +1000
Subject: Remove xf86vmode.h Xlib parts, rename to xf86vm.h

The xlib header moved to libXxf86vm.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 Makefile.am   |   2 +-
 xf86vm.h      |  65 +++++++++++++
 xf86vmode.h   | 298 ----------------------------------------------------------
 xf86vmproto.h |   2 +-
 4 files changed, 67 insertions(+), 300 deletions(-)
 create mode 100644 xf86vm.h
 delete mode 100644 xf86vmode.h

diff --git a/Makefile.am b/Makefile.am
index 4655a54..292e753 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 xf86vidmodedir = $(includedir)/X11/extensions
 xf86vidmode_HEADERS = \
-	xf86vmode.h \
+	xf86vm.h \
 	xf86vmproto.h \
 	xf86vmstr.h
 
diff --git a/xf86vm.h b/xf86vm.h
new file mode 100644
index 0000000..ddf4dac
--- /dev/null
+++ b/xf86vm.h
@@ -0,0 +1,65 @@
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VM_H_
+#define _XF86VM_H_
+
+#include <X11/Xmd.h>
+
+
+#define CLKFLAG_PROGRAMABLE		1
+
+#ifdef XF86VIDMODE_EVENTS
+#define XF86VidModeNotify		0
+#define XF86VidModeNumberEvents		(XF86VidModeNotify + 1)
+
+#define XF86VidModeNotifyMask		0x00000001
+
+#define XF86VidModeNonEvent		0
+#define XF86VidModeModeChange		1
+#else
+#define XF86VidModeNumberEvents		0
+#endif
+
+#define XF86VidModeBadClock		0
+#define XF86VidModeBadHTimings		1
+#define XF86VidModeBadVTimings		2
+#define XF86VidModeModeUnsuitable	3
+#define XF86VidModeExtensionDisabled	4
+#define XF86VidModeClientNotLocal	5
+#define XF86VidModeZoomLocked		6
+#define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
+
+#define XF86VM_READ_PERMISSION	1
+#define XF86VM_WRITE_PERMISSION	2
+
+#endif
diff --git a/xf86vmode.h b/xf86vmode.h
deleted file mode 100644
index 05ae1c9..0000000
--- a/xf86vmode.h
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VIDMODE_H_
-#define _XF86VIDMODE_H_
-
-#include <X11/Xfuncproto.h>
-#include <X11/Xmd.h>
-
-
-#define CLKFLAG_PROGRAMABLE		1
-
-#ifdef XF86VIDMODE_EVENTS
-#define XF86VidModeNotify		0
-#define XF86VidModeNumberEvents		(XF86VidModeNotify + 1)
-
-#define XF86VidModeNotifyMask		0x00000001
-
-#define XF86VidModeNonEvent		0
-#define XF86VidModeModeChange		1
-#else
-#define XF86VidModeNumberEvents		0
-#endif
-
-#define XF86VidModeBadClock		0
-#define XF86VidModeBadHTimings		1
-#define XF86VidModeBadVTimings		2
-#define XF86VidModeModeUnsuitable	3
-#define XF86VidModeExtensionDisabled	4
-#define XF86VidModeClientNotLocal	5
-#define XF86VidModeZoomLocked		6
-#define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
-
-#define XF86VM_READ_PERMISSION	1
-#define XF86VM_WRITE_PERMISSION	2
-
-#ifndef _XF86VIDMODE_SERVER_
-
-typedef struct {
-    unsigned short	hdisplay;
-    unsigned short	hsyncstart;
-    unsigned short	hsyncend;
-    unsigned short	htotal;
-    unsigned short	hskew;
-    unsigned short	vdisplay;
-    unsigned short	vsyncstart;
-    unsigned short	vsyncend;
-    unsigned short	vtotal;
-    unsigned int	flags;
-    int			privsize;
-#if defined(__cplusplus) || defined(c_plusplus)
-    /* private is a C++ reserved word */
-    INT32		*c_private;
-#else
-    INT32		*private;
-#endif
-} XF86VidModeModeLine;
-
-typedef struct {
-    unsigned int	dotclock;
-    unsigned short	hdisplay;
-    unsigned short	hsyncstart;
-    unsigned short	hsyncend;
-    unsigned short	htotal;
-    unsigned short	hskew;
-    unsigned short	vdisplay;
-    unsigned short	vsyncstart;
-    unsigned short	vsyncend;
-    unsigned short	vtotal;
-    unsigned int	flags;
-    int			privsize;
-#if defined(__cplusplus) || defined(c_plusplus)
-    /* private is a C++ reserved word */
-    INT32		*c_private;
-#else
-    INT32		*private;
-#endif
-} XF86VidModeModeInfo;
-
-typedef struct {
-    float		hi;
-    float		lo;
-} XF86VidModeSyncRange;
-
-typedef struct {
-    char*			vendor;
-    char*			model;
-    float			EMPTY;
-    unsigned char		nhsync;
-    XF86VidModeSyncRange*	hsync;
-    unsigned char		nvsync;
-    XF86VidModeSyncRange*	vsync;
-} XF86VidModeMonitor;
-    
-typedef struct {
-    int type;			/* of event */
-    unsigned long serial;	/* # of last request processed by server */
-    Bool send_event;		/* true if this came from a SendEvent req */
-    Display *display;		/* Display the event was read from */
-    Window root;		/* root window of event screen */
-    int state;			/* What happened */
-    int kind;			/* What happened */
-    Bool forced;		/* extents of new region */
-    Time time;			/* event timestamp */
-} XF86VidModeNotifyEvent;
-
-typedef struct {
-    float red;			/* Red Gamma value */
-    float green;		/* Green Gamma value */
-    float blue;			/* Blue Gamma value */
-} XF86VidModeGamma;
-
-
-#define XF86VidModeSelectNextMode(disp, scr) \
-	XF86VidModeSwitchMode(disp, scr, 1)
-#define XF86VidModeSelectPrevMode(disp, scr) \
-	XF86VidModeSwitchMode(disp, scr, -1)
-
-_XFUNCPROTOBEGIN
-
-Bool XF86VidModeQueryVersion(
-    Display*		/* dpy */,
-    int*		/* majorVersion */,
-    int*		/* minorVersion */
-);
-
-Bool XF86VidModeQueryExtension(
-    Display*		/* dpy */,
-    int*		/* event_base */,
-    int*		/* error_base */
-);
-
-Bool XF86VidModeSetClientVersion(
-    Display*		/* dpy */
-);
-
-Bool XF86VidModeGetModeLine(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int*			/* dotclock */,
-    XF86VidModeModeLine*	/* modeline */
-);
-
-Bool XF86VidModeGetAllModeLines(
-    Display*			/* dpy */,
-    int				/* screen */,
-    int*			/* modecount */,
-    XF86VidModeModeInfo***	/* modelinesPtr */
-);
-
-Bool XF86VidModeAddModeLine(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeModeInfo*	/* new modeline */,
-    XF86VidModeModeInfo*	/* after modeline */
-);
-
-Bool XF86VidModeDeleteModeLine(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeModeInfo*	/* modeline */
-);
-
-Bool XF86VidModeModModeLine(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeModeLine*	/* modeline */
-);
-
-Status XF86VidModeValidateModeLine(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeModeInfo*	/* modeline */
-);
-
-Bool XF86VidModeSwitchMode(
-    Display*		/* dpy */,
-    int			/* screen */,
-    int			/* zoom */
-);
-
-Bool XF86VidModeSwitchToMode(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeModeInfo*	/* modeline */
-);
-
-Bool XF86VidModeLockModeSwitch(
-    Display*		/* dpy */,
-    int			/* screen */,
-    int			/* lock */
-);
-
-Bool XF86VidModeGetMonitor(
-    Display*		/* dpy */,
-    int			/* screen */,
-    XF86VidModeMonitor*	/* monitor */
-);
-
-Bool XF86VidModeGetViewPort(
-    Display*		/* dpy */,
-    int			/* screen */,
-    int*		/* x return */,
-    int*		/* y return */
-);
-
-Bool XF86VidModeSetViewPort(
-    Display*		/* dpy */,
-    int			/* screen */,
-    int			/* x */,
-    int			/* y */
-);
-
-Bool XF86VidModeGetDotClocks(
-    Display*		/* dpy */,
-    int			/* screen */,
-    int*		/* flags return */,
-    int*		/* number of clocks return */,
-    int*		/* max dot clock return */,
-    int**		/* clocks return */
-);
-
-Bool XF86VidModeGetGamma(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeGamma*		/* Gamma */
-);
-
-Bool XF86VidModeSetGamma(
-    Display*			/* dpy */,
-    int				/* screen */,
-    XF86VidModeGamma*		/* Gamma */
-);
-
-Bool XF86VidModeSetGammaRamp(
-    Display*                    /* dpy */,
-    int                         /* screen */,
-    int				/* size */, 
-    unsigned short*             /* red array */,
-    unsigned short*             /* green array */,
-    unsigned short*             /* blue array */
-);
-
-Bool XF86VidModeGetGammaRamp(
-    Display*                    /* dpy */,
-    int                         /* screen */,
-    int                         /* size */,
-    unsigned short*             /* red array */,
-    unsigned short*             /* green array */,
-    unsigned short*             /* blue array */
-);
-
-Bool XF86VidModeGetGammaRampSize(
-    Display*                    /* dpy */,
-    int                         /* screen */,
-    int*                        /* size */
-);
-
-Bool XF86VidModeGetPermissions(
-    Display*                    /* dpy */,
-    int                         /* screen */,
-    int*			/* permissions */
-);
-
-_XFUNCPROTOEND
-
-#endif
-
-#endif
diff --git a/xf86vmproto.h b/xf86vmproto.h
index 3c90820..0d3955c 100644
--- a/xf86vmproto.h
+++ b/xf86vmproto.h
@@ -33,7 +33,7 @@ from Kaleb S. KEITHLEY
 #ifndef _XF86VIDMODEPROTO_H_
 #define _XF86VIDMODEPROTO_H_
 
-#include <X11/extensions/xf86vmode.h>
+#include <X11/extensions/xf86vm.h>
 
 #define XF86VIDMODENAME "XFree86-VidModeExtension"
 
-- 
cgit v1.2.3


From 5df1367567475ed17d693dd94aa802e867b26008 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 27 Aug 2009 11:09:25 +1000
Subject: xf86vidmodeproto 2.2.99.1

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d5dab6c..b3c4ec3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86VidModeProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_CHANGELOG
-- 
cgit v1.2.3


From 5d9c8eb371dc1cb6d27fab98c942868518db73c0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 1 Oct 2009 19:55:12 +1000
Subject: Require macros 1.3 for XORG_DEFAULT_OPTIONS

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index b3c4ec3..d0bf30b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [2.2.99.1], [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
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            xf86vidmodeproto.pc])
-- 
cgit v1.2.3


From fdbcfa8a73bf1e38c98d4d41e30ab2a06072be46 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 1 Oct 2009 20:12:03 +1000
Subject: xf86vidmodeproto 2.3

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d0bf30b..c401194 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([XF86VidModeProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
-- 
cgit v1.2.3


From cbbf83b8d8a7fde9e5ea8879516ad02ab3e863c3 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sat, 14 Nov 2009 18:26:47 -0500
Subject: .gitignore: use common defaults with custom section # 24239

Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
---
 .gitignore | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 71 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9a983bf..1b8dced 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,78 @@
-Makefile
-Makefile.in
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
 aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
 config.log
+config-ml.in
+config.py
 config.status
+config.status.lineno
+config.sub
 configure
+configure.scan
+depcomp
+.deps/
+INSTALL
 install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
 missing
-xf86vidmodeproto.pc
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
 *~
-xf86vidmodeproto.pc*~
-xf86vidmodeproto-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xf86vidmodeproto 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
-- 
cgit v1.2.3


From c499ad258eab12e6f9615dfc518bbbfa05bfbf67 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 15 Nov 2009 13:55:25 -0500
Subject: configure.ac: AM_MAINTAINER_MODE missing #24238

This turns off maintainer mode build rules in tarballs.
Works in conjunction with autogen.sh --enable-maintainer-mode
---
 configure.ac | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configure.ac b/configure.ac
index c401194..ae5c127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
 AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
 m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-- 
cgit v1.2.3


From 34a870ad95126eb8198e2fef59cbe729ed30cf5b Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 15 Nov 2009 18:11:36 -0500
Subject: configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242

This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ae5c127..2ae853b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,9 +4,9 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
 XORG_MACROS_VERSION(1.3)
-
 XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
-- 
cgit v1.2.3


From 4aacd1bf5ccdb37d062c4415672788686c56c91f Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 15 Nov 2009 18:31:29 -0500
Subject: Makefile.am: INSTALL file is missing or incorrect #24206

The standard GNU file on building/installing  tarball is copied
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
Add INSTALL target
---
 Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 292e753..714f20d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,12 @@ EXTRA_DIST = xf86vidmodeproto.pc.in
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
 
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
 
 ChangeLog:
 	$(CHANGELOG_CMD)
 
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
-- 
cgit v1.2.3


From 3f1d0e80b5fe5d7b252c4c16b2cb86070c9bb46e Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 15 Nov 2009 19:45:27 -0500
Subject: Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432

ChangeLog filename is known to Automake and requires no further
coding in the makefile.
---
 Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 714f20d..5cc0cec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,6 @@ pkgconfig_DATA = xf86vidmodeproto.pc
 
 EXTRA_DIST = xf86vidmodeproto.pc.in
 
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
-- 
cgit v1.2.3


From d3171dac99636eff33e58c0152b6489925fc429f Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Mon, 16 Nov 2009 11:13:30 -0500
Subject: README: file created or updated #24206

Contains a set of URLs to freedesktop.org.
---
 README | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..fd53bef
--- /dev/null
+++ b/README
@@ -0,0 +1,29 @@
+			XFree86 Video Mode Extension
+
+This extension defines a protocol for dynamically configuring modelines and gamma.
+
+Extension name: XFree86-VidModeExtension
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/proto/xf86vidmodeproto
+
+        http://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
-- 
cgit v1.2.3


From 7745d7c722ec3b576abb541e7b2cf599e5c07f15 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 22 Nov 2009 19:24:48 -0500
Subject: Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES

Now that the INSTALL file is generated.
Allows running make maintainer-clean.
---
 Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 5cc0cec..3467f60 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,8 @@ pkgconfig_DATA = xf86vidmodeproto.pc
 
 EXTRA_DIST = xf86vidmodeproto.pc.in
 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
 .PHONY: ChangeLog INSTALL
 
 INSTALL:
-- 
cgit v1.2.3


From f3fe0f07a3071e11c23166a75fa8698f6cfeaa37 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 28 Mar 2010 19:00:31 -0400
Subject: config: remove the pkgconfig pc.in file from EXTRA_DIST

Automake always includes it in the tarball.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 3467f60..3ef126a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,6 @@ xf86vidmode_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86vidmodeproto.pc
 
-EXTRA_DIST = xf86vidmodeproto.pc.in
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
-- 
cgit v1.2.3


From 4b349a8c1512f660f5dc4fa94b65bab8c7c2f840 Mon Sep 17 00:00:00 2001
From: Gaetan Nadon <memsize@videotron.ca>
Date: Sun, 28 Mar 2010 19:25:52 -0400
Subject: config: update AC_PREREQ statement to 2.60

Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.

ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 2ae853b..f1c65e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
 AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
-- 
cgit v1.2.3


From ed7696f81aa30ccd1c2a5e3d0ac87c3ef52e1fd8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 6 Apr 2010 14:18:25 -0700
Subject: Move xf86vidmodeproto files to their sub-directory

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 .gitignore                              |  78 -----
 COPYING                                 |  25 --
 Makefile.am                             |  21 --
 README                                  |  29 --
 autogen.sh                              |  12 -
 configure.ac                            |  13 -
 xf86vidmodeproto.pc.in                  |   9 -
 xf86vidmodeproto/.gitignore             |  78 +++++
 xf86vidmodeproto/COPYING                |  25 ++
 xf86vidmodeproto/Makefile.am            |  21 ++
 xf86vidmodeproto/README                 |  29 ++
 xf86vidmodeproto/autogen.sh             |  12 +
 xf86vidmodeproto/configure.ac           |  13 +
 xf86vidmodeproto/xf86vidmodeproto.pc.in |   9 +
 xf86vidmodeproto/xf86vm.h               |  65 ++++
 xf86vidmodeproto/xf86vmproto.h          | 583 ++++++++++++++++++++++++++++++++
 xf86vidmodeproto/xf86vmstr.h            |   3 +
 xf86vm.h                                |  65 ----
 xf86vmproto.h                           | 583 --------------------------------
 xf86vmstr.h                             |   3 -
 20 files changed, 838 insertions(+), 838 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 COPYING
 delete mode 100644 Makefile.am
 delete mode 100644 README
 delete mode 100755 autogen.sh
 delete mode 100644 configure.ac
 delete mode 100644 xf86vidmodeproto.pc.in
 create mode 100644 xf86vidmodeproto/.gitignore
 create mode 100644 xf86vidmodeproto/COPYING
 create mode 100644 xf86vidmodeproto/Makefile.am
 create mode 100644 xf86vidmodeproto/README
 create mode 100755 xf86vidmodeproto/autogen.sh
 create mode 100644 xf86vidmodeproto/configure.ac
 create mode 100644 xf86vidmodeproto/xf86vidmodeproto.pc.in
 create mode 100644 xf86vidmodeproto/xf86vm.h
 create mode 100644 xf86vidmodeproto/xf86vmproto.h
 create mode 100644 xf86vidmodeproto/xf86vmstr.h
 delete mode 100644 xf86vm.h
 delete mode 100644 xf86vmproto.h
 delete mode 100644 xf86vmstr.h

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1b8dced..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-#		X.Org module default exclusion patterns
-#		The next section if for module specific patterns
-#
-#	Do not edit the following section
-# 	GNU Build System (Autotools)
-aclocal.m4
-autom4te.cache/
-autoscan.log
-ChangeLog
-compile
-config.guess
-config.h
-config.h.in
-config.log
-config-ml.in
-config.py
-config.status
-config.status.lineno
-config.sub
-configure
-configure.scan
-depcomp
-.deps/
-INSTALL
-install-sh
-.libs/
-libtool
-libtool.m4
-ltmain.sh
-lt~obsolete.m4
-ltoptions.m4
-ltsugar.m4
-ltversion.m4
-Makefile
-Makefile.in
-mdate-sh
-missing
-mkinstalldirs
-*.pc
-py-compile
-stamp-h?
-symlink-tree
-texinfo.tex
-ylwrap
-
-#	Do not edit the following section
-# 	Edit Compile Debug Document Distribute
-*~
-*.[0-9]
-*.[0-9]x
-*.bak
-*.bin
-core
-*.dll
-*.exe
-*-ISO*.bdf
-*-JIS*.bdf
-*-KOI8*.bdf
-*.kld
-*.ko
-*.ko.cmd
-*.lai
-*.l[oa]
-*.[oa]
-*.obj
-*.patch
-*.so
-*.pcf.gz
-*.pdb
-*.tar.bz2
-*.tar.gz
-#
-#		Add & Override patterns for xf86vidmodeproto 
-#
-#		Edit the following section as needed
-# For example, !report.pc overrides *.pc. See 'man gitignore'
-# 
diff --git a/COPYING b/COPYING
deleted file mode 100644
index bc845c0..0000000
--- a/COPYING
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 3ef126a..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-xf86vidmodedir = $(includedir)/X11/extensions
-xf86vidmode_HEADERS = \
-	xf86vm.h \
-	xf86vmproto.h \
-	xf86vmstr.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = xf86vidmodeproto.pc
-
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
-	$(INSTALL_CMD)
-
-ChangeLog:
-	$(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
diff --git a/README b/README
deleted file mode 100644
index fd53bef..0000000
--- a/README
+++ /dev/null
@@ -1,29 +0,0 @@
-			XFree86 Video Mode Extension
-
-This extension defines a protocol for dynamically configuring modelines and gamma.
-
-Extension name: XFree86-VidModeExtension
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/proto/xf86vidmodeproto
-
-        http://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto
-
-For patch submission instructions, see:
-
-	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 904cd67..0000000
--- a/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /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/configure.ac b/configure.ac
deleted file mode 100644
index f1c65e6..0000000
--- a/configure.ac
+++ /dev/null
@@ -1,13 +0,0 @@
-AC_PREREQ([2.60])
-AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
-
-AC_OUTPUT([Makefile
-           xf86vidmodeproto.pc])
diff --git a/xf86vidmodeproto.pc.in b/xf86vidmodeproto.pc.in
deleted file mode 100644
index afbb702..0000000
--- a/xf86vidmodeproto.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
- 
-Name: XF86VidModeProto
-Description: XF86VidMode extension headers
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}
diff --git a/xf86vidmodeproto/.gitignore b/xf86vidmodeproto/.gitignore
new file mode 100644
index 0000000..1b8dced
--- /dev/null
+++ b/xf86vidmodeproto/.gitignore
@@ -0,0 +1,78 @@
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
+aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
+missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xf86vidmodeproto 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
diff --git a/xf86vidmodeproto/COPYING b/xf86vidmodeproto/COPYING
new file mode 100644
index 0000000..bc845c0
--- /dev/null
+++ b/xf86vidmodeproto/COPYING
@@ -0,0 +1,25 @@
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
diff --git a/xf86vidmodeproto/Makefile.am b/xf86vidmodeproto/Makefile.am
new file mode 100644
index 0000000..3ef126a
--- /dev/null
+++ b/xf86vidmodeproto/Makefile.am
@@ -0,0 +1,21 @@
+xf86vidmodedir = $(includedir)/X11/extensions
+xf86vidmode_HEADERS = \
+	xf86vm.h \
+	xf86vmproto.h \
+	xf86vmstr.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xf86vidmodeproto.pc
+
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
diff --git a/xf86vidmodeproto/README b/xf86vidmodeproto/README
new file mode 100644
index 0000000..fd53bef
--- /dev/null
+++ b/xf86vidmodeproto/README
@@ -0,0 +1,29 @@
+			XFree86 Video Mode Extension
+
+This extension defines a protocol for dynamically configuring modelines and gamma.
+
+Extension name: XFree86-VidModeExtension
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/proto/xf86vidmodeproto
+
+        http://cgit.freedesktop.org/xorg/proto/xf86vidmodeproto
+
+For patch submission instructions, see:
+
+	http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
+
diff --git a/xf86vidmodeproto/autogen.sh b/xf86vidmodeproto/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/xf86vidmodeproto/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/xf86vidmodeproto/configure.ac b/xf86vidmodeproto/configure.ac
new file mode 100644
index 0000000..f1c65e6
--- /dev/null
+++ b/xf86vidmodeproto/configure.ac
@@ -0,0 +1,13 @@
+AC_PREREQ([2.60])
+AC_INIT([XF86VidModeProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+XORG_DEFAULT_OPTIONS
+
+AC_OUTPUT([Makefile
+           xf86vidmodeproto.pc])
diff --git a/xf86vidmodeproto/xf86vidmodeproto.pc.in b/xf86vidmodeproto/xf86vidmodeproto.pc.in
new file mode 100644
index 0000000..afbb702
--- /dev/null
+++ b/xf86vidmodeproto/xf86vidmodeproto.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: XF86VidModeProto
+Description: XF86VidMode extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}
diff --git a/xf86vidmodeproto/xf86vm.h b/xf86vidmodeproto/xf86vm.h
new file mode 100644
index 0000000..ddf4dac
--- /dev/null
+++ b/xf86vidmodeproto/xf86vm.h
@@ -0,0 +1,65 @@
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VM_H_
+#define _XF86VM_H_
+
+#include <X11/Xmd.h>
+
+
+#define CLKFLAG_PROGRAMABLE		1
+
+#ifdef XF86VIDMODE_EVENTS
+#define XF86VidModeNotify		0
+#define XF86VidModeNumberEvents		(XF86VidModeNotify + 1)
+
+#define XF86VidModeNotifyMask		0x00000001
+
+#define XF86VidModeNonEvent		0
+#define XF86VidModeModeChange		1
+#else
+#define XF86VidModeNumberEvents		0
+#endif
+
+#define XF86VidModeBadClock		0
+#define XF86VidModeBadHTimings		1
+#define XF86VidModeBadVTimings		2
+#define XF86VidModeModeUnsuitable	3
+#define XF86VidModeExtensionDisabled	4
+#define XF86VidModeClientNotLocal	5
+#define XF86VidModeZoomLocked		6
+#define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
+
+#define XF86VM_READ_PERMISSION	1
+#define XF86VM_WRITE_PERMISSION	2
+
+#endif
diff --git a/xf86vidmodeproto/xf86vmproto.h b/xf86vidmodeproto/xf86vmproto.h
new file mode 100644
index 0000000..0d3955c
--- /dev/null
+++ b/xf86vidmodeproto/xf86vmproto.h
@@ -0,0 +1,583 @@
+/*
+
+Copyright 1995  Kaleb S. KEITHLEY
+
+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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+shall not be used in advertising or otherwise to promote the sale, use 
+or other dealings in this Software without prior written authorization
+from Kaleb S. KEITHLEY
+
+*/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XF86VIDMODEPROTO_H_
+#define _XF86VIDMODEPROTO_H_
+
+#include <X11/extensions/xf86vm.h>
+
+#define XF86VIDMODENAME "XFree86-VidModeExtension"
+
+#define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
+#define XF86VIDMODE_MINOR_VERSION	2
+
+#define X_XF86VidModeQueryVersion	0
+#define X_XF86VidModeGetModeLine	1
+#define X_XF86VidModeModModeLine	2
+#define X_XF86VidModeSwitchMode		3
+#define X_XF86VidModeGetMonitor		4
+#define X_XF86VidModeLockModeSwitch	5
+#define X_XF86VidModeGetAllModeLines	6
+#define X_XF86VidModeAddModeLine	7
+#define X_XF86VidModeDeleteModeLine	8
+#define X_XF86VidModeValidateModeLine	9
+#define X_XF86VidModeSwitchToMode	10
+#define X_XF86VidModeGetViewPort	11
+#define X_XF86VidModeSetViewPort	12
+/* new for version 2.x of this extension */
+#define X_XF86VidModeGetDotClocks	13
+#define X_XF86VidModeSetClientVersion	14
+#define X_XF86VidModeSetGamma		15
+#define X_XF86VidModeGetGamma		16
+#define X_XF86VidModeGetGammaRamp	17
+#define X_XF86VidModeSetGammaRamp	18
+#define X_XF86VidModeGetGammaRampSize	19
+#define X_XF86VidModeGetPermissions	20
+/*
+ * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
+ * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
+ *                    client.
+ * major version 2 == uses new protocol version in XFree86 4.0.
+ */
+
+typedef struct _XF86VidModeQueryVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
+    CARD16	length B16;
+} xXF86VidModeQueryVersionReq;
+#define sz_xXF86VidModeQueryVersionReq	4
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD16	majorVersion B16;	/* major version of XF86VidMode */
+    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeQueryVersionReply;
+#define sz_xXF86VidModeQueryVersionReply	32
+
+typedef struct _XF86VidModeGetModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+} xXF86VidModeGetModeLineReq,
+  xXF86VidModeGetAllModeLinesReq,
+  xXF86VidModeGetMonitorReq,
+  xXF86VidModeGetViewPortReq,
+  xXF86VidModeGetDotClocksReq,
+  xXF86VidModeGetPermissionsReq;
+#define sz_xXF86VidModeGetModeLineReq		8
+#define sz_xXF86VidModeGetAllModeLinesReq	8
+#define sz_xXF86VidModeGetMonitorReq		8
+#define sz_xXF86VidModeGetViewPortReq		8
+#define sz_xXF86VidModeGetDotClocksReq		8
+#define sz_xXF86VidModeGetPermissionsReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad2 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeGetModeLineReply;
+#define sz_xXF86VidModeGetModeLineReply	52
+
+/* 0.x version */
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeGetModeLineReply;
+#define sz_xXF86OldVidModeGetModeLineReply	36
+
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD32	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeModeInfo;
+
+/* 0.x version */
+typedef struct {
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModeInfo;
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	modecount B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetAllModeLinesReply;
+#define sz_xXF86VidModeGetAllModeLinesReply	32
+
+typedef struct _XF86VidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_hskew B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD16	pad2 B16;
+    CARD32	after_flags B32;
+    CARD32	reserved4 B32;
+    CARD32	reserved5 B32;
+    CARD32	reserved6 B32;
+} xXF86VidModeAddModeLineReq;
+#define sz_xXF86VidModeAddModeLineReq	92
+
+/* 0.x version */
+typedef struct _XF86OldVidModeAddModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+    CARD32	after_dotclock B32;
+    CARD16	after_hdisplay B16;
+    CARD16	after_hsyncstart B16;
+    CARD16	after_hsyncend B16;
+    CARD16	after_htotal B16;
+    CARD16	after_vdisplay B16;
+    CARD16	after_vsyncstart B16;
+    CARD16	after_vsyncend B16;
+    CARD16	after_vtotal B16;
+    CARD32	after_flags B32;
+} xXF86OldVidModeAddModeLineReq;
+#define sz_xXF86OldVidModeAddModeLineReq	60
+
+typedef struct _XF86VidModeModModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeModModeLineReq;
+#define sz_xXF86VidModeModModeLineReq	48
+
+/* 0.x version */
+typedef struct _XF86OldVidModeModModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeModModeLineReq;
+#define sz_xXF86OldVidModeModModeLineReq	32
+
+typedef struct _XF86VidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	hskew B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD16	pad1 B16;
+    CARD32	flags B32;
+    CARD32	reserved1 B32;
+    CARD32	reserved2 B32;
+    CARD32	reserved3 B32;
+    CARD32	privsize B32;
+} xXF86VidModeDeleteModeLineReq,
+  xXF86VidModeValidateModeLineReq,
+  xXF86VidModeSwitchToModeReq;
+#define sz_xXF86VidModeDeleteModeLineReq	52
+#define sz_xXF86VidModeValidateModeLineReq	52
+#define sz_xXF86VidModeSwitchToModeReq		52
+
+/* 0.x version */
+typedef struct _XF86OldVidModeValidateModeLine {
+    CARD8	reqType;		/* always XF86OldVidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD32	screen B32;		/* could be CARD16 but need the pad */
+    CARD32	dotclock B32;
+    CARD16	hdisplay B16;
+    CARD16	hsyncstart B16;
+    CARD16	hsyncend B16;
+    CARD16	htotal B16;
+    CARD16	vdisplay B16;
+    CARD16	vsyncstart B16;
+    CARD16	vsyncend B16;
+    CARD16	vtotal B16;
+    CARD32	flags B32;
+    CARD32	privsize B32;
+} xXF86OldVidModeDeleteModeLineReq,
+  xXF86OldVidModeValidateModeLineReq,
+  xXF86OldVidModeSwitchToModeReq;
+#define sz_xXF86OldVidModeDeleteModeLineReq	36
+#define sz_xXF86OldVidModeValidateModeLineReq	36
+#define sz_xXF86OldVidModeSwitchToModeReq	36
+
+typedef struct _XF86VidModeSwitchMode {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	zoom B16;
+} xXF86VidModeSwitchModeReq;
+#define sz_xXF86VidModeSwitchModeReq	8
+
+typedef struct _XF86VidModeLockModeSwitch {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	lock B16;
+} xXF86VidModeLockModeSwitchReq;
+#define sz_xXF86VidModeLockModeSwitchReq	8
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	status B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeValidateModeLineReply;
+#define sz_xXF86VidModeValidateModeLineReply	32
+
+typedef struct {
+    BYTE	type;			/* X_Reply */
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD8	vendorLength;
+    CARD8	modelLength;
+    CARD8	nhsync;
+    CARD8	nvsync;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetMonitorReply;
+#define sz_xXF86VidModeGetMonitorReply	32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	x B32;
+    CARD32	y B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+} xXF86VidModeGetViewPortReply;
+#define sz_xXF86VidModeGetViewPortReply	32
+
+typedef struct _XF86VidModeSetViewPort {
+    CARD8	reqType;		/* always VidModeReqCode */
+    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32      x B32;
+    CARD32	y B32;
+} xXF86VidModeSetViewPortReq;
+#define sz_xXF86VidModeSetViewPortReq	16
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad1;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	flags B32;
+    CARD32	clocks B32;
+    CARD32	maxclocks B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+} xXF86VidModeGetDotClocksReply;
+#define sz_xXF86VidModeGetDotClocksReply	32
+
+typedef struct _XF86VidModeSetClientVersion {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	major B16;
+    CARD16	minor B16;
+} xXF86VidModeSetClientVersionReq;
+#define sz_xXF86VidModeSetClientVersionReq	8
+
+typedef struct _XF86VidModeGetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+    CARD32	pad4 B32;
+    CARD32	pad5 B32;
+    CARD32	pad6 B32;
+} xXF86VidModeGetGammaReq;
+#define sz_xXF86VidModeGetGammaReq		32
+
+typedef struct {
+    BYTE	type;
+    BOOL	pad;
+    CARD16	sequenceNumber B16;
+    CARD32	length B32;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeGetGammaReply;
+#define sz_xXF86VidModeGetGammaReply		32
+
+typedef struct _XF86VidModeSetGamma {
+    CARD8	reqType;		/* always XF86VidModeReqCode */
+    CARD8	xf86vidmodeReqType;
+    CARD16	length B16;
+    CARD16	screen B16;
+    CARD16	pad B16;
+    CARD32	red B32;
+    CARD32	green B32;
+    CARD32	blue B32;
+    CARD32	pad1 B32;
+    CARD32	pad2 B32;
+    CARD32	pad3 B32;
+} xXF86VidModeSetGammaReq;
+#define sz_xXF86VidModeSetGammaReq		32
+
+
+typedef struct _XF86VidModeSetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeSetGammaRampReq;
+#define sz_xXF86VidModeSetGammaRampReq             8 
+
+typedef struct _XF86VidModeGetGammaRamp {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      size B16;
+} xXF86VidModeGetGammaRampReq;
+#define sz_xXF86VidModeGetGammaRampReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampReply;
+#define sz_xXF86VidModeGetGammaRampReply            32
+
+typedef struct _XF86VidModeGetGammaRampSize {
+    CARD8       reqType;                /* always XF86VidModeReqCode */
+    CARD8       xf86vidmodeReqType;
+    CARD16      length B16;
+    CARD16      screen B16;
+    CARD16      pad B16;
+} xXF86VidModeGetGammaRampSizeReq;
+#define sz_xXF86VidModeGetGammaRampSizeReq             8
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD16      size B16;
+    CARD16      pad0 B16;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetGammaRampSizeReply;
+#define sz_xXF86VidModeGetGammaRampSizeReply            32
+
+typedef struct {
+    BYTE        type;
+    BOOL        pad;
+    CARD16      sequenceNumber B16;
+    CARD32      length B32;
+    CARD32      permissions B32;
+    CARD32      pad1 B32;
+    CARD32      pad2 B32;
+    CARD32      pad3 B32;
+    CARD32      pad4 B32;
+    CARD32      pad5 B32;
+} xXF86VidModeGetPermissionsReply;
+#define sz_xXF86VidModeGetPermissionsReply            32
+
+
+#endif /* _XF86VIDMODEPROTO_H_ */
+
diff --git a/xf86vidmodeproto/xf86vmstr.h b/xf86vidmodeproto/xf86vmstr.h
new file mode 100644
index 0000000..f521335
--- /dev/null
+++ b/xf86vidmodeproto/xf86vmstr.h
@@ -0,0 +1,3 @@
+#warning "xf86vmstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/xf86vmproto.h> for the protocol defines."
+#include <X11/extensions/xf86vmproto.h>
diff --git a/xf86vm.h b/xf86vm.h
deleted file mode 100644
index ddf4dac..0000000
--- a/xf86vm.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VM_H_
-#define _XF86VM_H_
-
-#include <X11/Xmd.h>
-
-
-#define CLKFLAG_PROGRAMABLE		1
-
-#ifdef XF86VIDMODE_EVENTS
-#define XF86VidModeNotify		0
-#define XF86VidModeNumberEvents		(XF86VidModeNotify + 1)
-
-#define XF86VidModeNotifyMask		0x00000001
-
-#define XF86VidModeNonEvent		0
-#define XF86VidModeModeChange		1
-#else
-#define XF86VidModeNumberEvents		0
-#endif
-
-#define XF86VidModeBadClock		0
-#define XF86VidModeBadHTimings		1
-#define XF86VidModeBadVTimings		2
-#define XF86VidModeModeUnsuitable	3
-#define XF86VidModeExtensionDisabled	4
-#define XF86VidModeClientNotLocal	5
-#define XF86VidModeZoomLocked		6
-#define XF86VidModeNumberErrors		(XF86VidModeZoomLocked + 1)
-
-#define XF86VM_READ_PERMISSION	1
-#define XF86VM_WRITE_PERMISSION	2
-
-#endif
diff --git a/xf86vmproto.h b/xf86vmproto.h
deleted file mode 100644
index 0d3955c..0000000
--- a/xf86vmproto.h
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
-
-Copyright 1995  Kaleb S. KEITHLEY
-
-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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
-shall not be used in advertising or otherwise to promote the sale, use 
-or other dealings in this Software without prior written authorization
-from Kaleb S. KEITHLEY
-
-*/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
-
-#ifndef _XF86VIDMODEPROTO_H_
-#define _XF86VIDMODEPROTO_H_
-
-#include <X11/extensions/xf86vm.h>
-
-#define XF86VIDMODENAME "XFree86-VidModeExtension"
-
-#define XF86VIDMODE_MAJOR_VERSION	2	/* current version numbers */
-#define XF86VIDMODE_MINOR_VERSION	2
-
-#define X_XF86VidModeQueryVersion	0
-#define X_XF86VidModeGetModeLine	1
-#define X_XF86VidModeModModeLine	2
-#define X_XF86VidModeSwitchMode		3
-#define X_XF86VidModeGetMonitor		4
-#define X_XF86VidModeLockModeSwitch	5
-#define X_XF86VidModeGetAllModeLines	6
-#define X_XF86VidModeAddModeLine	7
-#define X_XF86VidModeDeleteModeLine	8
-#define X_XF86VidModeValidateModeLine	9
-#define X_XF86VidModeSwitchToMode	10
-#define X_XF86VidModeGetViewPort	11
-#define X_XF86VidModeSetViewPort	12
-/* new for version 2.x of this extension */
-#define X_XF86VidModeGetDotClocks	13
-#define X_XF86VidModeSetClientVersion	14
-#define X_XF86VidModeSetGamma		15
-#define X_XF86VidModeGetGamma		16
-#define X_XF86VidModeGetGammaRamp	17
-#define X_XF86VidModeSetGammaRamp	18
-#define X_XF86VidModeGetGammaRampSize	19
-#define X_XF86VidModeGetPermissions	20
-/*
- * major version 0 == uses parameter-to-wire functions in XFree86 libXxf86vm.
- * major version 1 == uses parameter-to-wire functions hard-coded in xvidtune
- *                    client.
- * major version 2 == uses new protocol version in XFree86 4.0.
- */
-
-typedef struct _XF86VidModeQueryVersion {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeQueryVersion */
-    CARD16	length B16;
-} xXF86VidModeQueryVersionReq;
-#define sz_xXF86VidModeQueryVersionReq	4
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD16	majorVersion B16;	/* major version of XF86VidMode */
-    CARD16	minorVersion B16;	/* minor version of XF86VidMode */
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeQueryVersionReply;
-#define sz_xXF86VidModeQueryVersionReply	32
-
-typedef struct _XF86VidModeGetModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-} xXF86VidModeGetModeLineReq,
-  xXF86VidModeGetAllModeLinesReq,
-  xXF86VidModeGetMonitorReq,
-  xXF86VidModeGetViewPortReq,
-  xXF86VidModeGetDotClocksReq,
-  xXF86VidModeGetPermissionsReq;
-#define sz_xXF86VidModeGetModeLineReq		8
-#define sz_xXF86VidModeGetAllModeLinesReq	8
-#define sz_xXF86VidModeGetMonitorReq		8
-#define sz_xXF86VidModeGetViewPortReq		8
-#define sz_xXF86VidModeGetDotClocksReq		8
-#define sz_xXF86VidModeGetPermissionsReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeGetModeLineReply;
-#define sz_xXF86VidModeGetModeLineReply	52
-
-/* 0.x version */
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeGetModeLineReply;
-#define sz_xXF86OldVidModeGetModeLineReply	36
-
-typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD32	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeModeInfo;
-
-/* 0.x version */
-typedef struct {
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeModeInfo;
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	modecount B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetAllModeLinesReply;
-#define sz_xXF86VidModeGetAllModeLinesReply	32
-
-typedef struct _XF86VidModeAddModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_hskew B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD16	pad2 B16;
-    CARD32	after_flags B32;
-    CARD32	reserved4 B32;
-    CARD32	reserved5 B32;
-    CARD32	reserved6 B32;
-} xXF86VidModeAddModeLineReq;
-#define sz_xXF86VidModeAddModeLineReq	92
-
-/* 0.x version */
-typedef struct _XF86OldVidModeAddModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeAddMode */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-    CARD32	after_dotclock B32;
-    CARD16	after_hdisplay B16;
-    CARD16	after_hsyncstart B16;
-    CARD16	after_hsyncend B16;
-    CARD16	after_htotal B16;
-    CARD16	after_vdisplay B16;
-    CARD16	after_vsyncstart B16;
-    CARD16	after_vsyncend B16;
-    CARD16	after_vtotal B16;
-    CARD32	after_flags B32;
-} xXF86OldVidModeAddModeLineReq;
-#define sz_xXF86OldVidModeAddModeLineReq	60
-
-typedef struct _XF86VidModeModModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeModModeLineReq;
-#define sz_xXF86VidModeModModeLineReq	48
-
-/* 0.x version */
-typedef struct _XF86OldVidModeModModeLine {
-    CARD8	reqType;		/* always XF86OldVidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86OldVidModeModModeLine */
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeModModeLineReq;
-#define sz_xXF86OldVidModeModModeLineReq	32
-
-typedef struct _XF86VidModeValidateModeLine {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	hskew B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD16	pad1 B16;
-    CARD32	flags B32;
-    CARD32	reserved1 B32;
-    CARD32	reserved2 B32;
-    CARD32	reserved3 B32;
-    CARD32	privsize B32;
-} xXF86VidModeDeleteModeLineReq,
-  xXF86VidModeValidateModeLineReq,
-  xXF86VidModeSwitchToModeReq;
-#define sz_xXF86VidModeDeleteModeLineReq	52
-#define sz_xXF86VidModeValidateModeLineReq	52
-#define sz_xXF86VidModeSwitchToModeReq		52
-
-/* 0.x version */
-typedef struct _XF86OldVidModeValidateModeLine {
-    CARD8	reqType;		/* always XF86OldVidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD32	screen B32;		/* could be CARD16 but need the pad */
-    CARD32	dotclock B32;
-    CARD16	hdisplay B16;
-    CARD16	hsyncstart B16;
-    CARD16	hsyncend B16;
-    CARD16	htotal B16;
-    CARD16	vdisplay B16;
-    CARD16	vsyncstart B16;
-    CARD16	vsyncend B16;
-    CARD16	vtotal B16;
-    CARD32	flags B32;
-    CARD32	privsize B32;
-} xXF86OldVidModeDeleteModeLineReq,
-  xXF86OldVidModeValidateModeLineReq,
-  xXF86OldVidModeSwitchToModeReq;
-#define sz_xXF86OldVidModeDeleteModeLineReq	36
-#define sz_xXF86OldVidModeValidateModeLineReq	36
-#define sz_xXF86OldVidModeSwitchToModeReq	36
-
-typedef struct _XF86VidModeSwitchMode {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSwitchMode */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	zoom B16;
-} xXF86VidModeSwitchModeReq;
-#define sz_xXF86VidModeSwitchModeReq	8
-
-typedef struct _XF86VidModeLockModeSwitch {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeLockModeSwitch */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	lock B16;
-} xXF86VidModeLockModeSwitchReq;
-#define sz_xXF86VidModeLockModeSwitchReq	8
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	status B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeValidateModeLineReply;
-#define sz_xXF86VidModeValidateModeLineReply	32
-
-typedef struct {
-    BYTE	type;			/* X_Reply */
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD8	vendorLength;
-    CARD8	modelLength;
-    CARD8	nhsync;
-    CARD8	nvsync;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetMonitorReply;
-#define sz_xXF86VidModeGetMonitorReply	32
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	x B32;
-    CARD32	y B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-} xXF86VidModeGetViewPortReply;
-#define sz_xXF86VidModeGetViewPortReply	32
-
-typedef struct _XF86VidModeSetViewPort {
-    CARD8	reqType;		/* always VidModeReqCode */
-    CARD8	xf86vidmodeReqType;	/* always X_XF86VidModeSetViewPort */
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32      x B32;
-    CARD32	y B32;
-} xXF86VidModeSetViewPortReq;
-#define sz_xXF86VidModeSetViewPortReq	16
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad1;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	flags B32;
-    CARD32	clocks B32;
-    CARD32	maxclocks B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-} xXF86VidModeGetDotClocksReply;
-#define sz_xXF86VidModeGetDotClocksReply	32
-
-typedef struct _XF86VidModeSetClientVersion {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	major B16;
-    CARD16	minor B16;
-} xXF86VidModeSetClientVersionReq;
-#define sz_xXF86VidModeSetClientVersionReq	8
-
-typedef struct _XF86VidModeGetGamma {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-    CARD32	pad4 B32;
-    CARD32	pad5 B32;
-    CARD32	pad6 B32;
-} xXF86VidModeGetGammaReq;
-#define sz_xXF86VidModeGetGammaReq		32
-
-typedef struct {
-    BYTE	type;
-    BOOL	pad;
-    CARD16	sequenceNumber B16;
-    CARD32	length B32;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xXF86VidModeGetGammaReply;
-#define sz_xXF86VidModeGetGammaReply		32
-
-typedef struct _XF86VidModeSetGamma {
-    CARD8	reqType;		/* always XF86VidModeReqCode */
-    CARD8	xf86vidmodeReqType;
-    CARD16	length B16;
-    CARD16	screen B16;
-    CARD16	pad B16;
-    CARD32	red B32;
-    CARD32	green B32;
-    CARD32	blue B32;
-    CARD32	pad1 B32;
-    CARD32	pad2 B32;
-    CARD32	pad3 B32;
-} xXF86VidModeSetGammaReq;
-#define sz_xXF86VidModeSetGammaReq		32
-
-
-typedef struct _XF86VidModeSetGammaRamp {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
-} xXF86VidModeSetGammaRampReq;
-#define sz_xXF86VidModeSetGammaRampReq             8 
-
-typedef struct _XF86VidModeGetGammaRamp {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      size B16;
-} xXF86VidModeGetGammaRampReq;
-#define sz_xXF86VidModeGetGammaRampReq             8
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetGammaRampReply;
-#define sz_xXF86VidModeGetGammaRampReply            32
-
-typedef struct _XF86VidModeGetGammaRampSize {
-    CARD8       reqType;                /* always XF86VidModeReqCode */
-    CARD8       xf86vidmodeReqType;
-    CARD16      length B16;
-    CARD16      screen B16;
-    CARD16      pad B16;
-} xXF86VidModeGetGammaRampSizeReq;
-#define sz_xXF86VidModeGetGammaRampSizeReq             8
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD16      size B16;
-    CARD16      pad0 B16;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetGammaRampSizeReply;
-#define sz_xXF86VidModeGetGammaRampSizeReply            32
-
-typedef struct {
-    BYTE        type;
-    BOOL        pad;
-    CARD16      sequenceNumber B16;
-    CARD32      length B32;
-    CARD32      permissions B32;
-    CARD32      pad1 B32;
-    CARD32      pad2 B32;
-    CARD32      pad3 B32;
-    CARD32      pad4 B32;
-    CARD32      pad5 B32;
-} xXF86VidModeGetPermissionsReply;
-#define sz_xXF86VidModeGetPermissionsReply            32
-
-
-#endif /* _XF86VIDMODEPROTO_H_ */
-
diff --git a/xf86vmstr.h b/xf86vmstr.h
deleted file mode 100644
index f521335..0000000
--- a/xf86vmstr.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#warning "xf86vmstr.h is obsolete and may be removed in the future."
-#warning "include <X11/extensions/xf86vmproto.h> for the protocol defines."
-#include <X11/extensions/xf86vmproto.h>
-- 
cgit v1.2.3