[PATCH 06/18] Xag: remove Xag.h library header, split into Xagconst.h

Peter Hutterer peter.hutterer at who-t.net
Wed Jun 24 22:26:30 PDT 2009


---
 Makefile.am |    2 +-
 Xag.h       |  114 -----------------------------------------------------------
 Xagconst.h  |   54 ++++++++++++++++++++++++++++
 Xagstr.h    |   18 ++++------
 4 files changed, 62 insertions(+), 126 deletions(-)
 delete mode 100644 Xag.h
 create mode 100644 Xagconst.h

diff --git a/Makefile.am b/Makefile.am
index d6a627a..c486043 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,7 @@ xext_HEADERS = \
 	shmstr.h \
 	sync.h \
 	syncstr.h \
-	Xag.h \
+	Xagconst.h \
 	Xagstr.h \
 	Xcup.h \
 	Xcupstr.h \
diff --git a/Xag.h b/Xag.h
deleted file mode 100644
index 815f2b9..0000000
--- a/Xag.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
-/*
-Copyright 1996, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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 THE OPEN GROUP 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 The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-*/
-/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-#ifndef _XAG_H_
-#define _XAG_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_XagQueryVersion		0
-#define X_XagCreate			1
-#define X_XagDestroy			2
-#define X_XagGetAttr			3
-#define X_XagQuery			4
-#define X_XagCreateAssoc		5
-#define X_XagDestroyAssoc		6
-
-#define XagBadAppGroup			0
-#define XagNumberErrors			(XagBadAppGroup + 1)
-
-#define XagNsingleScreen		7
-#define XagNdefaultRoot			1
-#define XagNrootVisual			2
-#define XagNdefaultColormap		3
-#define XagNblackPixel			4
-#define XagNwhitePixel			5
-#define XagNappGroupLeader		6
-
-#ifndef _XAG_SERVER_
-
-#include <stdarg.h>
-
-_XFUNCPROTOBEGIN
-
-typedef XID XAppGroup;
-
-Bool XagQueryVersion(
-    Display*			/* dpy */,
-    int*			/* major_version */,
-    int*			/* minor_version */
-);
-
-Status XagCreateEmbeddedApplicationGroup(
-    Display*			/* dpy */,
-    VisualID			/* root_visual */,
-    Colormap			/* default_colormap */,
-    unsigned long		/* black_pixel */,
-    unsigned long		/* white_pixel */,
-    XAppGroup*			/* app_group_return */
-);
-
-Status XagCreateNonembeddedApplicationGroup(
-    Display*			/* dpy */,
-    XAppGroup*			/* app_group_return */
-);
-
-Status XagDestroyApplicationGroup(
-    Display*			/* dpy */,
-    XAppGroup			/* app_group */
-);
-
-Status XagGetApplicationGroupAttributes(
-    Display*			/* dpy */,
-    XAppGroup			/* app_group */,
-    ...
-);
-
-Status XagQueryApplicationGroup(
-    Display*			/* dpy */,
-    XID				/* resource_base */,
-    XAppGroup*			/* app_group_ret */
-);
-
-Status XagCreateAssociation(
-    Display*			/* dpy */,
-    Window*			/* window_ret */,
-    void*			/* system_window */
-);
-
-Status XagDestroyAssociation(
-    Display*			/* dpy */,
-    Window			/* window */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XAG_SERVER_ */
-
-#endif /* _XAG_H_ */
-
diff --git a/Xagconst.h b/Xagconst.h
new file mode 100644
index 0000000..6266251
--- /dev/null
+++ b/Xagconst.h
@@ -0,0 +1,54 @@
+/* $XFree86: xc/include/extensions/Xag.h,v 1.5 2001/12/17 20:52:24 dawes Exp $ */
+/*
+Copyright 1996, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 THE OPEN GROUP 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 The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+*/
+/* $Xorg: Xag.h,v 1.5 2001/02/09 02:03:24 xorgcvs Exp $ */
+
+#ifndef _XAGCONST_H_
+#define _XAGCONST_H_
+
+#define XAGNAME "XC-APPGROUP"
+
+#define XAG_MAJOR_VERSION	1	/* current version numbers */
+#define XAG_MINOR_VERSION	0
+
+#define XagWindowTypeX11	0
+#define XagWindowTypeMacintosh	1
+#define XagWindowTypeWin32	2
+#define XagWindowTypeWin16	3
+
+#define XagBadAppGroup			0
+#define XagNumberErrors			(XagBadAppGroup + 1)
+
+#define XagNsingleScreen		7
+#define XagNdefaultRoot			1
+#define XagNrootVisual			2
+#define XagNdefaultColormap		3
+#define XagNblackPixel			4
+#define XagNwhitePixel			5
+#define XagNappGroupLeader		6
+
+#endif /* _XAGCONST_H_ */
+
diff --git a/Xagstr.h b/Xagstr.h
index ffb5527..805e1df 100644
--- a/Xagstr.h
+++ b/Xagstr.h
@@ -29,20 +29,16 @@ from The Open Group.
 #ifndef _XAGSTR_H_ /* { */
 #define _XAGSTR_H_
 
-#include <X11/extensions/Xag.h>
+#define X_XagQueryVersion		0
+#define X_XagCreate			1
+#define X_XagDestroy			2
+#define X_XagGetAttr			3
+#define X_XagQuery			4
+#define X_XagCreateAssoc		5
+#define X_XagDestroyAssoc		6
 
 #define XAppGroup CARD32
 
-#define XAGNAME "XC-APPGROUP"
-
-#define XAG_MAJOR_VERSION	1	/* current version numbers */
-#define XAG_MINOR_VERSION	0
-
-#define XagWindowTypeX11	0
-#define XagWindowTypeMacintosh	1
-#define XagWindowTypeWin32	2
-#define XagWindowTypeWin16	3
-
 /*
 * Redefine some basic types used by structures defined herein.  This allows
 * both the library and server to view communicated data as 32-bit entities,
-- 
1.6.3.rc1.2.g0164.dirty



More information about the xorg-devel mailing list