libdmx: Changes to 'upstream-unstable'
.gitignore | 6 +
ChangeLog | 75 -----------------
Makefile.am | 12 ++
README | 25 +++++
configure.ac | 12 +-
include/X11/extensions/dmxext.h | 162 +++++++++++++++++++++++++++++++++++++
man/DMX.man | 38 ++++----
man/DMXAddInput.man | 6 -
man/DMXAddScreen.man | 14 +--
man/DMXChangeDesktopAttributes.man | 4
man/DMXChangeScreensAttributes.man | 10 +-
man/DMXForceWindowCreation.man | 4
man/DMXGetDesktopAttributes.man | 4
man/DMXGetInputAttributes.man | 24 ++---
man/DMXGetInputCount.man | 10 +-
man/DMXGetScreenAttributes.man | 8 -
man/DMXGetScreenCount.man | 8 -
man/DMXGetWindowAttributes.man | 18 ++--
man/DMXQueryExtension.man | 6 -
man/DMXQueryVersion.man | 6 -
man/DMXRemoveInput.man | 4
man/DMXRemoveScreen.man | 6 -
man/DMXSync.man | 4
src/Makefile.am | 10 ++
24 files changed, 307 insertions(+), 169 deletions(-)
New commits:
commit a3ff756a3a478162a6f96b9fbf54c9f1a487af38
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 11:54:43 2009 +1000
libdmx 1.1.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ad84424..df66449 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libdmx, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
+AC_INIT(libdmx, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 9d7cb1321dd44081f52a80419c32bbbbb155757f
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 5 11:54:09 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 51a8f7e..ad84424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,15 +27,15 @@ AC_INIT(libdmx, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xo
AM_INIT_AUTOMAKE([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(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
@@ -44,9 +44,6 @@ AC_SUBST(DMX_CFLAGS)
AC_SUBST(DMX_LIBS)
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
commit 1cb350964c416963523aca0234dc24563ef29d1b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Aug 28 10:07:10 2009 +1000
libdmx 1.0.99.1
diff --git a/configure.ac b/configure.ac
index bf52727..51a8f7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libdmx, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
+AC_INIT(libdmx, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libdmx)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 72929c5cb3b78d3b83a2f40e3662104194b70cd6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 16:07:54 2009 +1000
Move dmxext.h from dmxproto to here.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 7f943b6..bf52727 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ AC_PROG_LIBTOOL
XORG_CWARNFLAGS
# Check for dependencies
-PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto)
+PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS"
AC_SUBST(DMX_CFLAGS)
AC_SUBST(DMX_LIBS)
diff --git a/include/X11/extensions/dmxext.h b/include/X11/extensions/dmxext.h
new file mode 100644
index 0000000..492aabf
--- /dev/null
+++ b/include/X11/extensions/dmxext.h
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
+ *
+ * All Rights Reserved.
+ *
+ * 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 on 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 (including the
+ * next paragraph) 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
+ * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+/*
+ * Authors:
+ * Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This file describes the interface to the client-side libdmx.a
+ * library. All DMX-aware client-side applications should include this
+ * file. */
+
+#ifndef _DMXEXT_H_
+#define _DMXEXT_H_
+
+#include <X11/extensions/dmx.h>
+
+/** Client-library screen information structure, returned by
+ * #DMXGetScreenAttributes. */
+typedef struct {
+ char *displayName;
+ int logicalScreen;
+
+ unsigned int screenWindowWidth; /* displayName's coordinate system */
+ unsigned int screenWindowHeight; /* displayName's coordinate system */
+ int screenWindowXoffset; /* displayName's coordinate system */
+ int screenWindowYoffset; /* displayName's coordinate system */
+
+ unsigned int rootWindowWidth; /* screenWindow's coordinate system */
+ unsigned int rootWindowHeight; /* screenWindow's coordinate system */
+ int rootWindowXoffset; /* screenWindow's coordinate system */
+ int rootWindowYoffset; /* screenWindow's coordinate system */
+
+ int rootWindowXorigin; /* global coordinate system */
+ int rootWindowYorigin; /* global coordinate system */
+} DMXScreenAttributes;
+
+/** Client-library window information structure, returned by
+ * #DMXGetWindowAttributes. */
+typedef struct {
+ int screen;
+ Window window;
+ XRectangle pos, vis;
+} DMXWindowAttributes;
+
+/** Client-library desktop information structure, returned by
+ * #DMXGetDesktopAttributes. */
+typedef struct {
+ unsigned int width; /* global coordinate system */
+ unsigned int height; /* global coordinate system */
+ int shiftX; /* global coordinate system */
+ int shiftY; /* global coordinate system */
+} DMXDesktopAttributes;
+
+/** Enumeration for the #inputType field in the #DMXInputAttributes
+ * structure. */
+typedef enum {
+ DMXLocalInputType,
+ DMXConsoleInputType,
+ DMXBackendInputType
+} DMXInputEnum;
+
+/** Client-library input information structure, returned by
+ * #DMXGetInputAttributes. */
+typedef struct {
+ DMXInputEnum inputType;
+ int physicalScreen;
+ int physicalId;
+ Bool isCore;
+ Bool sendsCore;
+ const char *name;
+ Bool detached;
+} DMXInputAttributes;
+
+_XFUNCPROTOBEGIN
+
+extern Bool DMXQueryExtension(Display *dpy,
+ int *event_basep, int *error_basep);
+extern Bool DMXQueryVersion(Display *dpy, int *major_version,
+ int *minor_version, int *patch_version);
+extern Bool DMXSync(Display *dpy);
+extern Bool DMXForceWindowCreation(Display *dpy, Window window);
+
+
+extern Bool DMXGetScreenCount(Display *dpy, int *screen_count);
+extern Bool DMXGetScreenAttributes(Display *dpy,
+ int screen,
+ DMXScreenAttributes *attr);
+extern int DMXChangeScreensAttributes(Display *dpy,
+ int screen_count,
+ int *screens,
+ int mask_count,
+ unsigned int *masks,
+ DMXScreenAttributes *attr, /* vector */
+ int *error_screen);
+
+extern Bool DMXAddScreen(Display *dpy,
+ const char *displayName,
+ unsigned int mask,
+ DMXScreenAttributes *attr,
+ int *screen);
+extern Bool DMXRemoveScreen(Display *dpy, int screen);
+
+/* Call DMXGetScreenWindowCount and allocate info to that size. Pass
+ * the size in available_count. This call can generate a large amount
+ * of wire traffic and should not be used called with available_count=0
+ * just to determine the screen_count value -- use DMXGetScreenCount
+ * instead. NOTE: Also see DMX protocol specification (DMXSpec.txt) for
+ * usage of DMXSync to flush pending commands. */
+extern Bool DMXGetWindowAttributes(Display *dpy, Window window,
+ int *screen_count, int available_count,
+ DMXWindowAttributes *attr);
+
+extern Bool DMXGetDesktopAttributes(Display *dpy, DMXDesktopAttributes *attr);
+extern int DMXChangeDesktopAttributes(Display *dpy,
+ unsigned int mask,
+ DMXDesktopAttributes *attr);
+
+extern Bool DMXGetInputCount(Display *dpy, int *input_count);
+extern Bool DMXGetInputAttributes(Display *dpy, int id,
+ DMXInputAttributes *attr);
+
+extern Bool DMXAddInput(Display *dpy,
+ unsigned int mask,
+ DMXInputAttributes *attr,
+ int *id);
+extern Bool DMXRemoveInput(Display *dpy, int id);
+
+/* These are helper functions that call DMXAddInput. */
+extern Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore,
+ int *newId);
+extern Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
+ int *newId);
+
+_XFUNCPROTOEND
+#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f8f548..434c56f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,4 +7,12 @@ libdmx_la_LIBADD = $(DMX_LIBS)
libdmx_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-AM_CFLAGS = $(DMX_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11 \
+ -I$(top_srcdir)/include/X11/extensions \
+ $(DMX_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS)
+
+libdmxincludedir = $(includedir)/X11/extensions
+libdmxinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dmxext.h
+
commit c46bf972f2f0658e0fe473e978c1a7153b68d0e9
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
index e69de29..3b99e7f 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libdmx - X Window System DMX (Distributed Multihead X) extension library
+
+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/libdmx
+
+ http://cgit.freedesktop.org/xorg/lib/libdmx
+
+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 ca08b93d5829a03e464fb27d96292c37825aa5ea
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 28 16:11:37 2009 -0200
Janitor: correct make distcheck.
diff --git a/.gitignore b/.gitignore
index b5b5e52..06615a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,8 @@ missing
mkinstalldirs
stamp-h1
*~
+*.o
+DMX*.3
+libdmx-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 43b136e..f75d1be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmx.pc
-EXTRA_DIST = dmx.pc.in autogen.sh
+EXTRA_DIST = dmx.pc.in
EXTRA_DIST += ChangeLog
@@ -33,6 +33,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 374b500..7f943b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,21 +27,26 @@ AC_INIT(libdmx, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([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(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto dmxproto)
-
+DMX_CFLAGS="$CWARNFLAGS $DMX_CFLAGS"
AC_SUBST(DMX_CFLAGS)
AC_SUBST(DMX_LIBS)
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
commit 628281b17467fc8237d9d9e2443cb9e88d8e07c5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun May 11 14:18:34 2008 +0200
Use __libmansuffix__ instead of hardcoding 3X in the dmx manpages
diff --git a/man/DMX.man b/man/DMX.man
index 41cae1a..8b7f004 100644
--- a/man/DMX.man
+++ b/man/DMX.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMX 3X __vendorversion__
+.TH DMX __libmansuffix__ __vendorversion__
.SH NAME
DMX \- X Window System DMX (Distributed Multihead X) extension
.SH DESCRIPTION
@@ -36,43 +36,43 @@ and modified via this protocol.
.SH "SUMMARY OF LIBRARY FUNCTIONS"
The following is a summary of DMX library functions:
.sp
-DMXQueryExtension(3X) \- determine if DMX is available
+DMXQueryExtension(__libmansuffix__) \- determine if DMX is available
.sp
-DMXQueryVersion(3X) \- determine DMX extension version
+DMXQueryVersion(__libmansuffix__) \- determine DMX extension version
.sp
-DMXSync(3X) \- flush protocol requests between
+DMXSync(__libmansuffix__) \- flush protocol requests between
.BR Xdmx (1)
and back-end X servers
.sp
-DMXForceWindowCreation(3X) \- force immediate back-end window creation
+DMXForceWindowCreation(__libmansuffix__) \- force immediate back-end window creation
.sp
-DMXGetScreenCount(3X) \- determine number of back-end screens
+DMXGetScreenCount(__libmansuffix__) \- determine number of back-end screens
.sp
-DMXGetScreenAttributes(3X) \- determine back-end screen attributes
+DMXGetScreenAttributes(__libmansuffix__) \- determine back-end screen attributes
.sp
-DMXChangeScreensAttributes(3X) \- change back-end screen attributes
+DMXChangeScreensAttributes(__libmansuffix__) \- change back-end screen attributes
.sp
-DMXAddScreen(3X) \- attach a new back-end screen
+DMXAddScreen(__libmansuffix__) \- attach a new back-end screen
.sp
-DMXRemoveScreen(3X) \- detach a back-end screen
+DMXRemoveScreen(__libmansuffix__) \- detach a back-end screen
.sp
-DMXGetWindowAttributes(3X) \- determine back-end window attributes
+DMXGetWindowAttributes(__libmansuffix__) \- determine back-end window attributes
.sp
-DMXGetDesktopAttributes(3X) \- determine global bounding box
+DMXGetDesktopAttributes(__libmansuffix__) \- determine global bounding box
.sp
-DMXChangeDesktopAttributes(3X) \- change global bounding box
+DMXChangeDesktopAttributes(__libmansuffix__) \- change global bounding box
.sp
-DMXGetInputCount(3X) \- determine number of input devices
+DMXGetInputCount(__libmansuffix__) \- determine number of input devices
.sp
-DMXGetInputAttributes(3X) \- determine input device attributes
+DMXGetInputAttributes(__libmansuffix__) \- determine input device attributes
.sp
-DMXAddInput(3X) \- attach a new backend or console input
+DMXAddInput(__libmansuffix__) \- attach a new backend or console input
.sp
-DMXRemoveInput(3X) \- detach an input
+DMXRemoveInput(__libmansuffix__) \- detach an input
.sp
-DMXAddBackendInput(3X) \- attach a new back-end input
+DMXAddBackendInput(__libmansuffix__) \- attach a new back-end input
.sp
-DMXAddConsoleInput(3X) \- attach a new console input
+DMXAddConsoleInput(__libmansuffix__) \- attach a new console input
.PP
Each of these functions is described in its own man page.
.SH "SEE ALSO"
diff --git a/man/DMXAddInput.man b/man/DMXAddInput.man
index c3e9ced..ade70d3 100644
--- a/man/DMXAddInput.man
+++ b/man/DMXAddInput.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXAddInput 3X __vendorversion__
+.TH DMXAddInput __libmansuffix__ __vendorversion__
.SH NAME
DMXAddInput, DMXAddBackendInput, DMXAddConsoleInput \- attach a new input
.SH SYNOPSIS
@@ -104,7 +104,7 @@ is
the new device will be added as a true core device.
.PP
If a device was removed with
-.BR DMXRemoveInput (3X)
+.BR DMXRemoveInput (__libmansuffix__)
an attempt will be made to reconnect the previous devices
.RI ( sendsCore
is ignored in this case).
@@ -159,4 +159,4 @@ Local devices cannot be attached or detached.
Attributes that are not specified will default to 0. This may lead to
unintended results.
.SH "SEE ALSO"
-.BR DMXRemoveInput "(3X), " DMX "(3X), " Xdmx (1)
+.BR DMXRemoveInput "(__libmansuffix__), " DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXAddScreen.man b/man/DMXAddScreen.man
index 3878577..186c87f 100644
--- a/man/DMXAddScreen.man
+++ b/man/DMXAddScreen.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXAddScreen 3X __vendorversion__
+.TH DMXAddScreen __libmansuffix__ __vendorversion__
.SH NAME
DMXAddScreen \- attach a new back-end screen
.SH SYNOPSIS
@@ -57,9 +57,9 @@ screen number for the attached screen.
The information stored in
.I mask " and " attr
is identical to that used by the
-.BR DMXChangeScreenAttributes (3X)
+.BR DMXChangeScreenAttributes (__libmansuffix__)
and
-.BR DMXGetScreenAttribues (3X)
+.BR DMXGetScreenAttribues (__libmansuffix__)
functions.
.SH "RETURN VALUE"
.B DMXAddScreen()
@@ -94,11 +94,11 @@ Attributes that are not specified will default to 0. This may lead to
unintended results.
.PP
Unlike other functions in the
-.BR DMX (3X)
+.BR DMX (__libmansuffix__)
API, this function uses
.I screen
for both input and output.
.SH "SEE ALSO"
-.BR DMXRemoveScreen "(3X), "
-.BR DMXChangeScreenAttributes "(3X), " DMXGetScreenAttributes "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXRemoveScreen "(__libmansuffix__), "
+.BR DMXChangeScreenAttributes "(__libmansuffix__), " DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXChangeDesktopAttributes.man b/man/DMXChangeDesktopAttributes.man
index cde4ae9..ea8645c 100644
--- a/man/DMXChangeDesktopAttributes.man
+++ b/man/DMXChangeDesktopAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXChangeDesktopAttributes 3X __vendorversion__
+.TH DMXChangeDesktopAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXChangeDesktopAttributes \- change global bounding box
.SH SYNOPSIS
@@ -99,4 +99,4 @@ library interface), and
.B BadValue
(if any values are out of range).
.SH "SEE ALSO"
-.BR DMXGetDesktopAttributes "(3X), " DMX "(3X), " Xdmx (1)
+.BR DMXGetDesktopAttributes "(__libmansuffix__), " DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXChangeScreensAttributes.man b/man/DMXChangeScreensAttributes.man
index 59ba8eb..05500da 100644
--- a/man/DMXChangeScreensAttributes.man
+++ b/man/DMXChangeScreensAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXChangeScreensAttributes 3X __vendorversion__
+.TH DMXChangeScreensAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXChangeScreensAttributes \- change back-end screen attributes
.SH SYNOPSIS
@@ -56,7 +56,7 @@ structure is included in
An explanation of the
.I DMXScreenAttributes
structure is given in
-.BR DMXGetScreenAttributes (3X).
+.BR DMXGetScreenAttributes (__libmansuffix__).
.PP
The values that are used to compute each value in
.I masks
@@ -118,6 +118,6 @@ are not valid), and
.B BadAlloc
errors.
.SH "SEE ALSO"
-.BR DMXGetScreenCount "(3X), "
-.BR DMXGetScreenAttributes "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetScreenCount "(__libmansuffix__), "
+.BR DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXForceWindowCreation.man b/man/DMXForceWindowCreation.man
index 6c256a0..30ee9a5 100644
--- a/man/DMXForceWindowCreation.man
+++ b/man/DMXForceWindowCreation.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXForceWindowCreation 3X __vendorversion__
+.TH DMXForceWindowCreation __libmansuffix__ __vendorversion__
.SH NAME
DMXForceWindowCreation \- force immediate back-end window creation
.SH SYNOPSIS
@@ -48,4 +48,4 @@ can generate
.B BadWindow
errors.
.SH "SEE ALSO"
-.BR DMX "(3X), " Xdmx (1)
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetDesktopAttributes.man b/man/DMXGetDesktopAttributes.man
index a45b307..aeab6f9 100644
--- a/man/DMXGetDesktopAttributes.man
+++ b/man/DMXGetDesktopAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXDesktopAttributes 3X __vendorversion__
+.TH DMXDesktopAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXGetDesktopAttributes \- determine global bounding box
.SH SYNOPSIS
@@ -64,4 +64,4 @@ returns
.B True
unless there is a protocol error.
.SH "SEE ALSO"
-.BR DMXChangeDesktopAttributes "(3X), " DMX "(3X), " Xdmx (1)
+.BR DMXChangeDesktopAttributes "(__libmansuffix__), " DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index a88fad5..0ee7906 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXGetInputAttributes 3X __vendorversion__
+.TH DMXGetInputAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXGetInputAttributes \- determine input device attributes
.SH SYNOPSIS
@@ -40,14 +40,14 @@ returns information about the input device specified with
.IR id .
This information cannot be
obtained from the
-.BR XListInputDeivices (3X)
+.BR XListInputDeivices (__libmansuffix__)
call.
.I id
is the same as that used by the
-.BR XListInputDevices (3X)
+.BR XListInputDevices (__libmansuffix__)
call, and must be in
the range 0 to one less than the value returned by
-.BR DMXGetInputCount(3X) ,
+.BR DMXGetInputCount(__libmansuffix__) ,
inclusive.
.PP
The
@@ -86,14 +86,14 @@ displayed.
For back-end devices,
.I physicalScreen
will identify the back-end display and can be used as an argument to
-.BR DMXGetScreenAttributes (3X)
+.BR DMXGetScreenAttributes (__libmansuffix__)
to obtain more information;
.I physicalId
will be the XInput device id on the back-end X server; and
.I name
will be invalid (since it does not provide any additional information
that cannot be obtained with
-.BR DMXGetScreenAttributes (3X)).
+.BR DMXGetScreenAttributes (__libmansuffix__)).
.PP
If
.I isCore
@@ -114,7 +114,7 @@ If
.I detached
is True, then this device has been detached and is no longer producing
input events. The device may be reattached using
-.BR DMXAddInput (3X).
+.BR DMXAddInput (__libmansuffix__).
.SH "RETURN VALUE"
.B DMXGetInputAttributes()
returns
@@ -128,8 +128,8 @@ can generate
.I id
is out of range).
.SH "SEE ALSO"
-.BR DMXGetInputCount "(3X), "
-.BR XListInputDevices "(3X), "
-.BR DMXGetScreenAttributes "(3X), "
-.BR DMXAddInput "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetInputCount "(__libmansuffix__), "
+.BR XListInputDevices "(__libmansuffix__), "
+.BR DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMXAddInput "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetInputCount.man b/man/DMXGetInputCount.man
index 8660288..a994e3f 100644
--- a/man/DMXGetInputCount.man
+++ b/man/DMXGetInputCount.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXGetInputCount 3X __vendorversion__
+.TH DMXGetInputCount __libmansuffix__ __vendorversion__
.SH NAME
DMXGetInputCount \- determine number of input devices
.SH SYNOPSIS
@@ -40,7 +40,7 @@ returns the number of input devices connected to the
server in
.IR input_count .
This number is the same as that returned by
-.BR XListInputDevices (3X),
+.BR XListInputDevices (__libmansuffix__),
but is available even when the XInput extension is not supported.
.SH "RETURN VALUE"
.B DMXGetInputCount()
@@ -48,6 +48,6 @@ returns
.B True
unless there is a protocol error.
.SH "SEE ALSO"
-.BR DMXGetInputAttributes "(3X), "
-.BR XListInputDevices "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetInputAttributes "(__libmansuffix__), "
+.BR XListInputDevices "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetScreenAttributes.man b/man/DMXGetScreenAttributes.man
index ebb6b0d..826b701 100644
--- a/man/DMXGetScreenAttributes.man
+++ b/man/DMXGetScreenAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXGetScreenAttributes 3X __vendorversion__
+.TH DMXGetScreenAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXGetScreenAttributes \- determine back-end screen attributes
.SH SYNOPSIS
@@ -107,6 +107,6 @@ can generate
.B BadValue
errors.
.SH "SEE ALSO"
-.BR DMXGetScreenCount "(3X), "
-.BR DMXChangeScreenAttributes "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetScreenCount "(__libmansuffix__), "
+.BR DMXChangeScreenAttributes "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetScreenCount.man b/man/DMXGetScreenCount.man
index 421f2e3..62ae29c 100644
--- a/man/DMXGetScreenCount.man
+++ b/man/DMXGetScreenCount.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXGetScreenCount 3X __vendorversion__
+.TH DMXGetScreenCount __libmansuffix__ __vendorversion__
.SH NAME
DMXGetScreenCount \- determine number of back-end screens
.SH SYNOPSIS
@@ -63,6 +63,6 @@ composite back-end screens that the
.BR Xdmx (1)
server is using.
.SH "SEE ALSO"
-.BR DMXGetScreenAttribtues "(3X), "
-.BR DMXChangeScreenAttributes "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetScreenAttribtues "(__libmansuffix__), "
+.BR DMXChangeScreenAttributes "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetWindowAttributes.man b/man/DMXGetWindowAttributes.man
index 034e3ed..46dc963 100644
--- a/man/DMXGetWindowAttributes.man
+++ b/man/DMXGetWindowAttributes.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXGetWindowAttributes 3X __vendorversion__
+.TH DMXGetWindowAttributes __libmansuffix__ __vendorversion__
.SH NAME
DMXGetWindowAttributes \- determine back-end window attributes
.SH SYNOPSIS
@@ -89,7 +89,7 @@ in window-relative coordinates -- all zeros if the window is not visible
on the backend).
.PP
To obtain more information about the physical screen use the
-.BR DMXGetScreenAttributes (3X)
+.BR DMXGetScreenAttributes (__libmansuffix__)
call.
.PP
Note that DMX allows multiple back-end windows to overlap in their
@@ -135,20 +135,20 @@ errors.
.SH NOTES
Because this call transports a great deal of information over the wire,
please call
-.BR DMXGetScreenCount (3X)
+.BR DMXGetScreenCount (__libmansuffix__)
first, and make sure
.I attr
is sufficiently large.
.PP
On a particular back-end server, it is possible that the associated
window has not yet been mapped because the
-.BR XMapWindow (3X)
+.BR XMapWindow (__libmansuffix__)
call that will eventually map the window had been buffered by Xlib's
normal buffering system. To avoid this race condition, please call
-.BR DMXSync (3X)
+.BR DMXSync (__libmansuffix__)
before communicating directly with the back-end X server.
.SH "SEE ALSO"
-.BR DMXGetScreenCount "(3X), "
-.BR DMXSync "(3X), "
-.BR DMXGetScreenAttributes "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXGetScreenCount "(__libmansuffix__), "
+.BR DMXSync "(__libmansuffix__), "
+.BR DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXQueryExtension.man b/man/DMXQueryExtension.man
index 87f31f8..edcf179 100644
--- a/man/DMXQueryExtension.man
+++ b/man/DMXQueryExtension.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXQueryExtension 3X __vendorversion__
+.TH DMXQueryExtension __libmansuffix__ __vendorversion__
.SH NAME
DMXQueryExtension \- determine if DMX is available
.SH SYNOPSIS
@@ -51,5 +51,5 @@ will be returned. Otherwise,
.B False
will be returned.
.SH "SEE ALSO"
-.BR DMXQueryVersion "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXQueryVersion "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXQueryVersion.man b/man/DMXQueryVersion.man
index 6da9222..d0328b7 100644
--- a/man/DMXQueryVersion.man
+++ b/man/DMXQueryVersion.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXQueryVersion 3X __vendorversion__
+.TH DMXQueryVersion __libmansuffix__ __vendorversion__
.SH NAME
DMXQueryVersion \- determine DMX extension version
.SH SYNOPSIS
@@ -76,5 +76,5 @@ recommend that any software that uses the DMX protocol extension to
support only versions 2.2 and above (although they should detect earlier
versions and either reduce functionality or fail gracefully).
.SH "SEE ALSO"
-.BR DMXQueryExtension "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXQueryExtension "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXRemoveInput.man b/man/DMXRemoveInput.man
index e380223..5b0d863 100644
--- a/man/DMXRemoveInput.man
+++ b/man/DMXRemoveInput.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXRemoveInput 3X __vendorversion__
+.TH DMXRemoveInput __libmansuffix__ __vendorversion__
.SH NAME
DMXRemoveInput \- detach an input
.SH SYNOPSIS
@@ -56,4 +56,4 @@ is not valid) and
.B BadAccess
(if the input has already been detached).
.SH "SEE ALSO"
-.BR DMXAddInput "(3X), " DMX "(3X), " Xdmx (1)
+.BR DMXAddInput "(__libmansuffix__), " DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXRemoveScreen.man b/man/DMXRemoveScreen.man
index fff3be9..e224885 100644
--- a/man/DMXRemoveScreen.man
+++ b/man/DMXRemoveScreen.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXRemoveScreen 3X __vendorversion__
+.TH DMXRemoveScreen __libmansuffix__ __vendorversion__
.SH NAME
DMXRemoveScreen \- detach a back-end screen
.SH SYNOPSIS
@@ -56,5 +56,5 @@ is out of range, or if the back-end screen specified by
.I screen
has already been detached.
.SH "SEE ALSO"
-.BR DMXAddScreen "(3X), "
-.BR DMX "(3X), " Xdmx (1)
+.BR DMXAddScreen "(__libmansuffix__), "
+.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXSync.man b/man/DMXSync.man
index e0ab6e7..f172a9e 100644
--- a/man/DMXSync.man
+++ b/man/DMXSync.man
@@ -23,7 +23,7 @@
.\" 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.
-.TH DMXSync 3X __vendorversion__
+.TH DMXSync __libmansuffix__ __vendorversion__
.SH NAME
DMXSync \- flush protocol requests between Xdmx and back-end X servers
.SH SYNOPSIS
@@ -47,4 +47,4 @@ returns
.BR True
unless there is a protocol error.
.SH "SEE ALSO"
-.BR DMX "(3X), " Xdmx (1)
+.BR DMX "(__libmansuffix__), " Xdmx (1)
commit cfd82b1ff1033dbb3d83fd71e8b1af5535108245
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:48 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 9d42a8f..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,75 +0,0 @@
-2006-04-26 Adam Jackson <ajax@freedesktop.org>
-
- * configure.ac:
- Bump to 1.0.2
-
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
-
- * src/dmx.c:
- Coverity #928: Don't dereference screen if it's null.
-
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
Reply to: