x11proto-dmx: Changes to 'upstream-unstable'
.gitignore | 4 +
ChangeLog | 4 -
Makefile.am | 14 +++-
configure.ac | 8 +-
dmx.h | 68 +++++++++++++++++++++
dmxext.h | 190 -----------------------------------------------------------
dmxproto.h | 1
7 files changed, 90 insertions(+), 199 deletions(-)
New commits:
commit a71c838e1130be28e1639a606b0a7cb56f44a3a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 19:34:15 2009 +1000
dmxproto 2.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ef02832..ab28ba3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([DMXProto], [2.2.99.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DMXProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit cfcd1d8985a8a1049ee2e9f9b80e835d33a23419
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Oct 1 19:31:04 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 f3cc8ac..ef02832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([DMXProto], [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
dmxproto.pc])
commit 7d2c367d67e236a93f7f73ca661caa3e167833c9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 16:08:21 2009 +1000
dmxproto 2.2.99.1
diff --git a/configure.ac b/configure.ac
index 6655c8f..f3cc8ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([DMXProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DMXProto], [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 593829475d400b5ae02fe772a38c1a5667dd1fb3
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 16:01:46 2009 +1000
Remove Xlib parts from dmxext.h, rename to dmx.h
diff --git a/Makefile.am b/Makefile.am
index 11c931d..69db128 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
dmxdir = $(includedir)/X11/extensions
dmx_HEADERS = \
- dmxext.h \
+ dmx.h \
dmxproto.h
pkgconfigdir = $(libdir)/pkgconfig
diff --git a/dmx.h b/dmx.h
new file mode 100644
index 0000000..8cbd4d3
--- /dev/null
+++ b/dmx.h
@@ -0,0 +1,68 @@
+/*
+ * 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 _DMX_H_
+#define _DMX_H_
+
+/* These values must be larger than LastExtensionError.
+ The values in dmxext.h and dmxproto.h *MUST* match. */
+#define DmxBadXinerama 1001
+#define DmxBadValue 1002
+#define DmxBadReply 1003
+
+#define DMXScreenWindowWidth (1L<<0)
+#define DMXScreenWindowHeight (1L<<1)
+#define DMXScreenWindowXoffset (1L<<2)
+#define DMXScreenWindowYoffset (1L<<3)
+#define DMXRootWindowWidth (1L<<4)
+#define DMXRootWindowHeight (1L<<5)
+#define DMXRootWindowXoffset (1L<<6)
+#define DMXRootWindowYoffset (1L<<7)
+#define DMXRootWindowXorigin (1L<<8)
+#define DMXRootWindowYorigin (1L<<9)
+
+#define DMXDesktopWidth (1L<<0)
+#define DMXDesktopHeight (1L<<1)
+#define DMXDesktopShiftX (1L<<2)
+#define DMXDesktopShiftY (1L<<3)
+
+#define DMXInputType (1L<<0)
+#define DMXInputPhysicalScreen (1L<<1)
+#define DMXInputSendsCore (1L<<2)
+
+#endif
diff --git a/dmxext.h b/dmxext.h
deleted file mode 100644
index 5b19b18..0000000
--- a/dmxext.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * 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_
-
-/* These values must be larger than LastExtensionError.
- The values in dmxext.h and dmxproto.h *MUST* match. */
-#define DmxBadXinerama 1001
-#define DmxBadValue 1002
-#define DmxBadReply 1003
-
-#define DMXScreenWindowWidth (1L<<0)
-#define DMXScreenWindowHeight (1L<<1)
-#define DMXScreenWindowXoffset (1L<<2)
-#define DMXScreenWindowYoffset (1L<<3)
-#define DMXRootWindowWidth (1L<<4)
-#define DMXRootWindowHeight (1L<<5)
-#define DMXRootWindowXoffset (1L<<6)
-#define DMXRootWindowYoffset (1L<<7)
-#define DMXRootWindowXorigin (1L<<8)
-#define DMXRootWindowYorigin (1L<<9)
-
-#define DMXDesktopWidth (1L<<0)
-#define DMXDesktopHeight (1L<<1)
-#define DMXDesktopShiftX (1L<<2)
-#define DMXDesktopShiftY (1L<<3)
-
-#define DMXInputType (1L<<0)
-#define DMXInputPhysicalScreen (1L<<1)
-#define DMXInputSendsCore (1L<<2)
-
-#ifndef _DMX_SERVER_
-
-/** 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
-#endif
commit c7dc24d7cdad70235bd2dadd9e7be03ecd4ae62a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 15:45:10 2009 +1000
Remove RCS tags.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/dmxext.h b/dmxext.h
index c554232..5b19b18 100644
--- a/dmxext.h
+++ b/dmxext.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
diff --git a/dmxproto.h b/dmxproto.h
index b6b11f4..4bb160e 100644
--- a/dmxproto.h
+++ b/dmxproto.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/*
* Copyright 2002-2004 Red Hat Inc., Durham, North Carolina.
*
commit 98cc93cce22fb9b796dd78fba3df3724d48637e3
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
diff --git a/.gitignore b/.gitignore
index d847cbf..69581fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,6 @@ install-sh
missing
dmxproto.pc
*~
+dmxproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index b2bbeed..11c931d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ dmx_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmxproto.pc
-EXTRA_DIST = autogen.sh dmxproto.pc.in
+EXTRA_DIST = dmxproto.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 75f168a..6655c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
AC_INIT([DMXProto], [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
dmxproto.pc])
commit af9bdeb642e218500a682311f046b5a27db737e2
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:57 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
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 7ec363d..b2bbeed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,3 +7,13 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = dmxproto.pc
EXTRA_DIST = autogen.sh dmxproto.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
commit 63fa6c1e1a859dcf0d3849b8d6b361563ef52af1
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:01 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index 77a2ca9..d847cbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
install-sh
missing
dmxproto.pc
+*~
Reply to: