[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

libxxf86vm: Changes to 'upstream-unstable'



 .gitignore                         |   12 +
 Makefile.am                        |    6 
 README                             |   25 +++
 configure.ac                       |   10 -
 include/X11/extensions/xf86vmode.h |  298 +++++++++++++++++++++++++++++++++++++
 man/.gitignore                     |    3 
 src/.gitignore                     |    9 -
 src/Makefile.am                    |    5 
 src/XF86VMode.c                    |   88 ++--------
 9 files changed, 372 insertions(+), 84 deletions(-)

New commits:
commit b4d998a026f03aa2fea74a909f3edea4e4aed5a1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Oct 2 09:43:30 2009 +1000

    libXxf86vm 1.1.0
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index c8373af..738e03a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86vm, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 8f518e80716915cfb8234a18836ad95121a7d6db
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Oct 2 08:58:19 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 002159b..c8373af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,23 +4,20 @@ AC_INIT(libXxf86vm, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?produc
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require xorg-macros: XORG_CWARNFLAGS, 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)
+# 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)
 AM_CONFIG_HEADER(src/config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
 
 XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile

commit 3951e96ddfefa5f3007895002528e713618a60ab
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Aug 27 11:18:38 2009 +1000

    libXxf86vm 1.0.99.1
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index cca1b09..002159b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.57])
 
-AC_INIT(libXxf86vm, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
+AC_INIT(libXxf86vm, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86vm)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 7c7ab2076420a883e827509da0e8a0989a786000
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Thu Aug 27 11:17:45 2009 +1000

    Include xf86vmproto instead of xf86vmstr.h
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index de6cb83..83512ca 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -33,7 +33,7 @@ from Kaleb S. KEITHLEY.
 #define NEED_EVENTS
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
-#include <X11/extensions/xf86vmstr.h>
+#include <X11/extensions/xf86vmproto.h>
 #include <X11/extensions/xf86vmode.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>

commit b49fcb355eb1469352eb25ba3dbcf2863cfe5642
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Wed Aug 26 16:09:15 2009 +1000

    Move the xf86vmode.h header from the proto package to here.
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 2259530..cca1b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_PROG_LIBTOOL
 XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
+PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext [xf86vidmodeproto >= 2.2.99.1])
 
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
diff --git a/include/X11/extensions/xf86vmode.h b/include/X11/extensions/xf86vmode.h
new file mode 100644
index 0000000..136ce9c
--- /dev/null
+++ b/include/X11/extensions/xf86vmode.h
@@ -0,0 +1,298 @@
+/*
+
+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>
+#include <X11/extensions/xf86vm.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/src/Makefile.am b/src/Makefile.am
index 3487d5c..8ae10ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,3 +5,8 @@ libXxf86vm_la_SOURCES = XF86VMode.c
 AM_CFLAGS = $(XXF86VM_CFLAGS) $(MALLOC_ZERO_CFLAGS)
 libXxf86vm_la_LIBADD = $(XXF86VM_LIBS)
 libXxf86vm_la_LDFLAGS = -version-number 1:0:0
+
+INCLUDES = -I$(top_srcdir)/include
+
+libXxf86vmincludedir = $(includedir)/X11/extensions
+libXxf86vminclude_HEADERS = $(top_srcdir)/include/X11/extensions/xf86vmode.h
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 7b33ff0..de6cb83 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -34,6 +34,7 @@ from Kaleb S. KEITHLEY.
 #define NEED_REPLIES
 #include <X11/Xlibint.h>
 #include <X11/extensions/xf86vmstr.h>
+#include <X11/extensions/xf86vmode.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 

commit f2a1073b3027c508e01beca9ca34bbc6c90f5e6b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date:   Mon Feb 2 20:34:37 2009 -0800

    Add README with pointers to mailing list, bugzilla & git repos
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>

diff --git a/README b/README
new file mode 100644
index 0000000..a8cfc17
--- /dev/null
+++ b/README
@@ -0,0 +1,25 @@
+libXxf86vm - Extension library for the XFree86-VidMode X extension
+
+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/lib/libXxf86vm
+
+        http://cgit.freedesktop.org/xorg/lib/libXxf86vm
+
+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
+

commit e316211692ab7c882be6e89f5c6311160882375f
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date:   Mon Feb 2 14:43:19 2009 -0200

    Janitor: ansification, make distcheck, compiler warnings, .gitignore.

diff --git a/.gitignore b/.gitignore
index e66b17c..bff2b2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,11 @@
+.deps
+.libs
 aclocal.m4
 autom4te.cache
 compile
 config.guess
+config.h
+config.h.in
 config.log
 config.status
 config.sub
@@ -14,5 +18,13 @@ Makefile
 Makefile.in
 missing
 mkinstalldirs
+stamp-h1
 xxf86vm.pc
 *~
+*.3
+*.o
+*.la
+*.lo
+libXxf86vm-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index bfe2cdb..bf8f1e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,12 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xxf86vm.pc
 
-EXTRA_DIST = xxf86vm.pc.in autogen.sh
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = xxf86vm.pc.in 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)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 47b8c10..2259530 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,11 +4,15 @@ AC_INIT(libXxf86vm, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=x
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
+# Require xorg-macros: XORG_CWARNFLAGS, 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)
 AM_CONFIG_HEADER(src/config.h)
 
 # Check for progs
 AC_PROG_CC
 AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
 
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
@@ -16,6 +20,7 @@ PKG_CHECK_MODULES(XXF86VM, xproto x11 xextproto xext xf86vidmodeproto)
 XORG_CHECK_MALLOC_ZERO
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
 	   src/Makefile
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 5e33e26..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-config.h
-config.h.in
-.deps
-.libs
-libXxf86vm.la
-*.lo
-Makefile
-Makefile.in
-stamp-h1
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index 3a7de6b..7b33ff0 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -88,9 +88,7 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, xf86vidmode_info)
  *****************************************************************************/
 
 Bool
-XF86VidModeQueryExtension (dpy, event_basep, error_basep)
-    Display *dpy;
-    int *event_basep, *error_basep;
+XF86VidModeQueryExtension(Display *dpy, int *event_basep, int *error_basep)
 {
     XExtDisplayInfo *info = find_display (dpy);
 
@@ -104,10 +102,7 @@ XF86VidModeQueryExtension (dpy, event_basep, error_basep)
 }
 
 Bool
-XF86VidModeQueryVersion(dpy, majorVersion, minorVersion)
-    Display* dpy;
-    int* majorVersion; 
-    int* minorVersion;
+XF86VidModeQueryVersion(Display* dpy, int* majorVersion, int* minorVersion)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeQueryVersionReply rep;
@@ -201,11 +196,8 @@ XF86VidModeGetGamma(Display *dpy, int screen, XF86VidModeGamma *Gamma)
 }
 
 Bool
-XF86VidModeGetModeLine(dpy, screen, dotclock, modeline)
-    Display* dpy;
-    int screen;
-    int* dotclock; 
-    XF86VidModeModeLine* modeline;
+XF86VidModeGetModeLine(Display* dpy, int screen, int* dotclock,
+		       XF86VidModeModeLine* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetModeLineReply rep;
@@ -278,11 +270,8 @@ XF86VidModeGetModeLine(dpy, screen, dotclock, modeline)
 }
 
 Bool
-XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr)
-    Display* dpy;
-    int screen;
-    int* modecount; 
-    XF86VidModeModeInfo ***modelinesPtr;
+XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
+			   XF86VidModeModeInfo ***modelinesPtr)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetAllModeLinesReply rep;
@@ -440,11 +429,9 @@ XF86VidModeGetAllModeLines(dpy, screen, modecount, modelinesPtr)
 #endif
 
 Bool
-XF86VidModeAddModeLine (dpy, screen, newmodeline, aftermodeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* newmodeline;
-    XF86VidModeModeInfo* aftermodeline;
+XF86VidModeAddModeLine(Display *dpy, int screen,
+		       XF86VidModeModeInfo* newmodeline,
+		       XF86VidModeModeInfo* aftermodeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeAddModeLineReq *req;
@@ -553,10 +540,8 @@ XF86VidModeAddModeLine (dpy, screen, newmodeline, aftermodeline)
 }
 
 Bool
-XF86VidModeDeleteModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeDeleteModeLine(Display *dpy, int screen,
+			  XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeDeleteModeLineReq *req;
@@ -617,10 +602,7 @@ XF86VidModeDeleteModeLine (dpy, screen, modeline)
 }
 
 Bool
-XF86VidModeModModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeLine* modeline;
+XF86VidModeModModeLine(Display *dpy, int screen, XF86VidModeModeLine* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeModModeLineReq *req;
@@ -679,10 +661,8 @@ XF86VidModeModModeLine (dpy, screen, modeline)
 }
 
 Status
-XF86VidModeValidateModeLine (dpy, screen, modeline)
-    Display *dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeValidateModeLine(Display *dpy, int screen,
+			    XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeValidateModeLineReq *req;
@@ -750,10 +730,7 @@ XF86VidModeValidateModeLine (dpy, screen, modeline)
 }
 
 Bool
-XF86VidModeSwitchMode(dpy, screen, zoom)
-    Display* dpy;
-    int screen;
-    int zoom;
+XF86VidModeSwitchMode(Display* dpy, int screen, int zoom)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSwitchModeReq *req;
@@ -772,10 +749,7 @@ XF86VidModeSwitchMode(dpy, screen, zoom)
 }
     
 Bool
-XF86VidModeSwitchToMode(dpy, screen, modeline)
-    Display* dpy;
-    int screen;
-    XF86VidModeModeInfo* modeline;
+XF86VidModeSwitchToMode(Display* dpy, int screen, XF86VidModeModeInfo* modeline)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSwitchToModeReq *req;
@@ -861,10 +835,7 @@ XF86VidModeSwitchToMode(dpy, screen, modeline)
 }
     
 Bool
-XF86VidModeLockModeSwitch(dpy, screen, lock)
-    Display* dpy;
-    int screen;
-    int lock;
+XF86VidModeLockModeSwitch(Display* dpy, int screen, int lock)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeLockModeSwitchReq *req;
@@ -883,10 +854,7 @@ XF86VidModeLockModeSwitch(dpy, screen, lock)
 }
     
 Bool
-XF86VidModeGetMonitor(dpy, screen, monitor)
-    Display* dpy;
-    int screen;
-    XF86VidModeMonitor* monitor;
+XF86VidModeGetMonitor(Display* dpy, int screen, XF86VidModeMonitor* monitor)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetMonitorReply rep;
@@ -972,10 +940,7 @@ XF86VidModeGetMonitor(dpy, screen, monitor)
 }
 
 Bool
-XF86VidModeGetViewPort(dpy, screen, x, y)
-    Display* dpy;
-    int screen;
-    int *x, *y;
+XF86VidModeGetViewPort(Display* dpy, int screen, int *x, int *y)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetViewPortReply rep;
@@ -1025,10 +990,7 @@ XF86VidModeGetViewPort(dpy, screen, x, y)
 }
 
 Bool
-XF86VidModeSetViewPort(dpy, screen, x, y)
-    Display* dpy;
-    int screen;
-    int x, y;
+XF86VidModeSetViewPort(Display* dpy, int screen, int x, int y)
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeSetViewPortReq *req;
@@ -1049,11 +1011,8 @@ XF86VidModeSetViewPort(dpy, screen, x, y)
 }
 
 Bool
-XF86VidModeGetDotClocks(dpy, screen,
-	    flagsPtr, numclocksPtr, maxclocksPtr, clocksPtr)
-    Display* dpy;
-    int screen;
-    int *flagsPtr, *numclocksPtr, *maxclocksPtr, *clocksPtr[]; 
+XF86VidModeGetDotClocks(Display* dpy, int screen, int *flagsPtr,
+			int *numclocksPtr, int *maxclocksPtr, int *clocksPtr[])
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86VidModeGetDotClocksReply rep;


Reply to: