summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-08-26 15:40:04 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-26 15:40:04 +1000
commitd80e22cbe804ce4d21082bd13484b03ffe05ef4a (patch)
treead85341253ad65c671cd15906dbf270fe3c9816a
parent0f02b0aea4fd864ceaa2bea6f09bbea2d8e9cfbf (diff)
downloadxorg-proto-xf86vidmodeproto-d80e22cbe804ce4d21082bd13484b03ffe05ef4a.tar.gz
Move request opcodes to xf86vmproto.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xf86vmode.h22
-rw-r--r--xf86vmproto.h23
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