x11proto-xf86vidmode: Changes to 'debian-unstable'
.gitignore | 1
ChangeLog | 193 +++++++++++++++++-
Makefile.am | 15 +
configure.ac | 8
debian/changelog | 13 +
debian/control | 3
xf86vm.h | 65 ++++++
xf86vmode.h | 322 ------------------------------
xf86vmproto.h | 583 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
xf86vmstr.h | 565 -----------------------------------------------------
10 files changed, 873 insertions(+), 895 deletions(-)
New commits:
commit ec0f7065fcc6acbbffb1202676837ed744e09f32
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Nov 21 11:38:27 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 957aa35..a9d0a6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+commit fdbcfa8a73bf1e38c98d4d41e30ab2a06072be46
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 1 20:12:03 2009 +1000
+
+ xf86vidmodeproto 2.3
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5d9c8eb371dc1cb6d27fab98c942868518db73c0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Oct 1 19:55:12 2009 +1000
+
+ Require macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 5df1367567475ed17d693dd94aa802e867b26008
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 11:09:25 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 89f3a31..c945cec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-xf86vidmode (2.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 21 Nov 2009 11:37:45 +0200
+
x11proto-xf86vidmode (2.2.99.1-1) experimental; urgency=low
* Bump debhelper compat level to 5.
commit fdbcfa8a73bf1e38c98d4d41e30ab2a06072be46
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 20:12:03 2009 +1000
xf86vidmodeproto 2.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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
commit 5d9c8eb371dc1cb6d27fab98c942868518db73c0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 19:55:12 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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])
commit d65c2b4b880f1aca25d62afad1dd22914f1e4fc0
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Sep 29 11:49:49 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 9b3fe59..89f3a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xf86vidmode (2.2.99.1-1) UNRELEASED; urgency=low
+x11proto-xf86vidmode (2.2.99.1-1) experimental; urgency=low
* Bump debhelper compat level to 5.
* Run autoreconf at build time.
@@ -10,7 +10,7 @@ x11proto-xf86vidmode (2.2.99.1-1) UNRELEASED; urgency=low
+ Xlib header moved to libXxf86vm
* Break old libxxf86vm-dev
- -- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 20:34:21 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 29 Sep 2009 11:49:35 +0200
x11proto-xf86vidmode (2.2.2-5) unstable; urgency=low
commit 4751587e8a8fa69706f47cc086b5cb2c758f8469
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 20:48:35 2009 +0200
Bump xutils-dev build-dep for new util-macros
diff --git a/debian/control b/debian/control
index a79336b..23ba2a6 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.
Build-Depends:
debhelper (>= 5.0.0),
automake,
- xutils-dev
+ xutils-dev (>= 1:7.4+4)
Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-xf86vidmode
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86vidmode.git
commit c96e25d67b85207e8c6c6d472359ee53460db7fd
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 20:48:11 2009 +0200
Break old libxxf86vm-dev
diff --git a/debian/changelog b/debian/changelog
index f42c674..9b3fe59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ x11proto-xf86vidmode (2.2.99.1-1) UNRELEASED; urgency=low
* Bump Standards-Version to 3.8.3.
* New upstream release.
+ Xlib header moved to libXxf86vm
+ * Break old libxxf86vm-dev
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 20:34:21 +0200
diff --git a/debian/control b/debian/control
index 484e614..a79336b 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-xf86vidmode.git
Package: x11proto-xf86vidmode-dev
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libxxf86vm-dev (<< 1:1.0.99.1)
Description: X11 Video Mode extension wire protocol
This package provides development headers describing the wire protocol
for the XFree86-VidMode extension, which provides access to detailed
commit 62beca70e9046ddec2fe15db8545d2c18d013441
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 13 20:43:24 2009 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..957aa35
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,175 @@
+commit 5df1367567475ed17d693dd94aa802e867b26008
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Aug 27 11:09:25 2009 +1000
+
+ xf86vidmodeproto 2.2.99.1
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 50fe2de4abe06bcf9e38e7dcd5005538e0ba3ce1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 26 15:42:05 2009 +1000
+
+ 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>
+
+commit d80e22cbe804ce4d21082bd13484b03ffe05ef4a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 26 15:40:04 2009 +1000
+
+ Move request opcodes to xf86vmproto.h
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0f02b0aea4fd864ceaa2bea6f09bbea2d8e9cfbf
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 26 15:31:51 2009 +1000
+
+ Move xf86vmstr.h to xf86vmproto.h for consistency with other modules.
+
+ A stub xf86vmstr.h is provided to avoid clients breaking.
+
+commit 6c6cedfb11acd4152df2cdd284d4d982bb08860f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Aug 26 12:07:57 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 7efd16a110ea4e8a7deab405fba7e1f5ceb4add2
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit a163fd8950df350205503b53cd202775b2e402d5
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Dec 6 16:39:13 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit cdf94f93116528a9b9acf520bf22d9075b0f3e50
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:54:32 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit f162f887d750eb55e8b2bf69d67ef93cf9d01214
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jul 14 18:56:51 2006 -0700
+
+ renamed: .cvsignore -> .gitignore
+
+commit 6f31aeb365cf7458a32c41a7d8330e3a7200639d
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:40 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit b640ed8f4aae8665ece27bbb88929271e5d23bfb
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:16 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 3fed39c66767d7749e0100d0e5a7ff8d30d5ba89
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Tue Aug 2 19:19:41 2005 +0000
+
+ Add basic .cvsignore files for proto modules.
+
+commit 01842f2f1c3b1e9fd1c3d87a05f9c17a7958efcb
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:57 2005 +0000
+
+ 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
+
+commit 5a98fd8bf1673989e2137f3c77b5308d06c9cfb2
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat May 21 04:57:26 2005 +0000
+
+ Set version to 2.2.
+
+commit ff7d9c3e3d9f3090c70ee315379184cec840bab9
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:22:41 2005 +0000
+
+ revert last change, didn't do right thing at all, sorry for the noise
+
+commit 3f0d5315ce34c2e289b4c45fe336982e2d19611e
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Thu May 19 00:10:20 2005 +0000
+
+ Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit b8c1be8e8a5737ff433ddff3a71fa7c25d3be14f
+Author: Josh Triplett <josh@speakeasy.net>
+Date: Wed May 18 08:05:14 2005 +0000
+
+ Add COPYING file for XF86VidMode.
+
+commit b33eb4f56ee5c9e0b05fd6928c799e422a689790
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Mon May 9 18:20:07 2005 +0000
+
+ Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 5ed94797c194b427855f5df9e1c2ae64638af180
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri May 6 01:46:32 2005 +0000
+
+ Initial build system files for proto module.
+
+commit 0748aa1ae39c980ddb1187ecdfc2207facf2e389
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 18:43:06 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit ef8371400847bef2287569ac71788a9826a9b729
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:31:36 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 6115f13c599aea728376960d890d6cc9388a3c4a
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:10:54 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit e40543bec997d79ff38179b53e29a3b81cddd243
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:35:14 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit d5a66212db8227a44377cd7bd970c4e2fc45105f
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:22:28 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 754f6a23806c0eb9878f35410b4ce37d69b2f4f8
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:43 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit ae24ecf53488a3806ca5fff2cee21c03204f9f96
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 15:54:35 2003 +0000
+
+ R6.6 is the Xorg base-line
diff --git a/debian/changelog b/debian/changelog
index df35d66..f42c674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-xf86vidmode (2.2.2-6) UNRELEASED; urgency=low
+x11proto-xf86vidmode (2.2.99.1-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 5.
* Run autoreconf at build time.
@@ -6,6 +6,8 @@ x11proto-xf86vidmode (2.2.2-6) UNRELEASED; urgency=low
and libxxf86vidmode-dev. This was only needed for upgrades from sarge.
* Parse space-separated DEB_BUILD_OPTIONS, handle parallel=N.
* Bump Standards-Version to 3.8.3.
+ * New upstream release.
+ + Xlib header moved to libXxf86vm
-- Julien Cristau <jcristau@debian.org> Sun, 13 Sep 2009 20:34:21 +0200
commit 5df1367567475ed17d693dd94aa802e867b26008
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 11:09:25 2009 +1000
xf86vidmodeproto 2.2.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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
commit 50fe2de4abe06bcf9e38e7dcd5005538e0ba3ce1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 26 15:42:05 2009 +1000
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>
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"
commit d80e22cbe804ce4d21082bd13484b03ffe05ef4a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 26 15:40:04 2009 +1000
Move request opcodes to xf86vmproto.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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
commit 0f02b0aea4fd864ceaa2bea6f09bbea2d8e9cfbf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 26 15:31:51 2009 +1000
Move xf86vmstr.h to xf86vmproto.h for consistency with other modules.
A stub xf86vmstr.h is provided to avoid clients breaking.
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;
Reply to: