[PATCH 08/18] Xdbe: remove Xdbe.h library header, split into Xdbeconst.h
Peter Hutterer
peter.hutterer at who-t.net
Wed Jun 24 22:26:32 PDT 2009
---
Makefile.am | 2 +-
Xdbe.h | 136 -----------------------------------------------------------
Xdbeconst.h | 59 +++++++++++++++++++++++++
Xdbeproto.h | 54 -----------------------
4 files changed, 60 insertions(+), 191 deletions(-)
delete mode 100644 Xdbe.h
create mode 100644 Xdbeconst.h
diff --git a/Makefile.am b/Makefile.am
index 17d94a0..c181f0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@ xext_HEADERS = \
Xagstr.h \
Xcupconst.h \
Xcupstr.h \
- Xdbe.h \
+ Xdbeconst.h \
Xdbeproto.h \
XEVIconst.h \
XEVIstr.h \
diff --git a/Xdbe.h b/Xdbe.h
deleted file mode 100644
index f9205a2..0000000
--- a/Xdbe.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/******************************************************************************
- *
- * Copyright (c) 1994, 1995 Hewlett-Packard Company
- *
- * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
- * Company 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 Hewlett-Packard Company.
- *
- * Header file for Xlib-related DBE
- *
- *****************************************************************************/
-/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */
-
-#ifndef XDBE_H
-#define XDBE_H
-
-
-/* INCLUDES */
-
-#include <X11/Xfuncproto.h>
-#include <X11/extensions/Xdbeproto.h>
-
-
-/* DEFINES */
-
-/* Errors */
-#define XdbeBadBuffer 0
-
-
-/* TYPEDEFS */
-
-typedef Drawable XdbeBackBuffer;
-
-typedef unsigned char XdbeSwapAction;
-
-typedef struct
-{
- Window swap_window; /* window for which to swap buffers */
- XdbeSwapAction swap_action; /* swap action to use for swap_window */
-}
-XdbeSwapInfo;
-
-typedef struct
-{
- Window window; /* window that buffer belongs to */
-}
-XdbeBackBufferAttributes;
-
-typedef struct
-{
- int type;
- Display *display; /* display the event was read from */
- XdbeBackBuffer buffer; /* resource id */
- unsigned long serial; /* serial number of failed request */
- unsigned char error_code; /* error base + XdbeBadBuffer */
- unsigned char request_code; /* major opcode of failed request */
- unsigned char minor_code; /* minor opcode of failed request */
-}
-XdbeBufferError;
-
-/* _XFUNCPROTOBEGIN and _XFUNCPROTOEND are defined as noops
- * (for non-C++ builds) in X11/Xfuncproto.h.
- */
-_XFUNCPROTOBEGIN
-
-extern Status XdbeQueryExtension(
- Display* /* dpy */,
- int* /* major_version_return */,
- int* /* minor_version_return */
-);
-
-extern XdbeBackBuffer XdbeAllocateBackBufferName(
- Display* /* dpy */,
- Window /* window */,
- XdbeSwapAction /* swap_action */
-);
-
-extern Status XdbeDeallocateBackBufferName(
- Display* /* dpy */,
- XdbeBackBuffer /* buffer */
-);
-
-extern Status XdbeSwapBuffers(
- Display* /* dpy */,
- XdbeSwapInfo* /* swap_info */,
- int /* num_windows */
-);
-
-extern Status XdbeBeginIdiom(
- Display* /* dpy */
-);
-
-extern Status XdbeEndIdiom(
- Display* /* dpy */
-);
-
-extern XdbeScreenVisualInfo *XdbeGetVisualInfo(
- Display* /* dpy */,
- Drawable* /* screen_specifiers */,
- int* /* num_screens */
-);
-
-extern void XdbeFreeVisualInfo(
- XdbeScreenVisualInfo* /* visual_info */
-);
-
-extern XdbeBackBufferAttributes *XdbeGetBackBufferAttributes(
- Display* /* dpy */,
- XdbeBackBuffer /* buffer */
-);
-
-_XFUNCPROTOEND
-
-#endif /* XDBE_H */
-
diff --git a/Xdbeconst.h b/Xdbeconst.h
new file mode 100644
index 0000000..77139fe
--- /dev/null
+++ b/Xdbeconst.h
@@ -0,0 +1,59 @@
+/* $Xorg: Xdbe.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
+/******************************************************************************
+ *
+ * Copyright (c) 1994, 1995 Hewlett-Packard Company
+ *
+ * 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 HEWLETT-PACKARD COMPANY 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 Hewlett-Packard
+ * Company 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 Hewlett-Packard Company.
+ *
+ * Header file for Xlib-related DBE
+ *
+ *****************************************************************************/
+/* $XFree86: xc/include/extensions/Xdbe.h,v 3.2 2001/08/01 00:44:35 tsi Exp $ */
+
+#ifndef XDBECONST_H
+#define XDBECONST_H
+
+/* Values for swap_action field of XdbeSwapInfo structure */
+#define XdbeUndefined 0
+#define XdbeBackground 1
+#define XdbeUntouched 2
+#define XdbeCopied 3
+
+/* Errors */
+#define XdbeBadBuffer 0
+
+#define DBE_PROTOCOL_NAME "DOUBLE-BUFFER"
+
+/* Current version numbers */
+#define DBE_MAJOR_VERSION 1
+#define DBE_MINOR_VERSION 0
+
+/* Used when adding extension; also used in Xdbe macros */
+#define DbeNumberEvents 0
+#define DbeBadBuffer 0
+#define DbeNumberErrors (DbeBadBuffer + 1)
+
+#endif /* XDBECONST_H */
+
diff --git a/Xdbeproto.h b/Xdbeproto.h
index 8a8c555..77db06a 100644
--- a/Xdbeproto.h
+++ b/Xdbeproto.h
@@ -31,34 +31,9 @@
*
*****************************************************************************/
-
#ifndef XDBE_PROTO_H
#define XDBE_PROTO_H
-/* INCLUDES */
-
-
-/* DEFINES */
-
-/* Values for swap_action field of XdbeSwapInfo structure */
-#define XdbeUndefined 0
-#define XdbeBackground 1
-#define XdbeUntouched 2
-#define XdbeCopied 3
-
-#ifdef NEED_DBE_PROTOCOL
-
-#define DBE_PROTOCOL_NAME "DOUBLE-BUFFER"
-
-/* Current version numbers */
-#define DBE_MAJOR_VERSION 1
-#define DBE_MINOR_VERSION 0
-
-/* Used when adding extension; also used in Xdbe macros */
-#define DbeNumberEvents 0
-#define DbeBadBuffer 0
-#define DbeNumberErrors (DbeBadBuffer + 1)
-
/* Request values used in (S)ProcDbeDispatch() */
#define X_DbeGetVersion 0
#define X_DbeAllocateBackBufferName 1
@@ -72,37 +47,10 @@
typedef CARD8 xDbeSwapAction;
typedef CARD32 xDbeBackBuffer;
-#endif /* NEED_DBE_PROTOCOL */
-
-
/* TYPEDEFS */
-/* Client data types */
-
-/* XdbeVisualInfo and XdbeScreenVisualInfo are defined in this file,
- * "Xdbeproto.h", rather than "Xdbe.h" because the server uses these data
- * types.
- */
-
-typedef struct
-{
- VisualID visual; /* one visual ID that supports double-buffering */
- int depth; /* depth of visual in bits */
- int perflevel; /* performance level of visual */
-}
-XdbeVisualInfo;
-
-typedef struct
-{
- int count; /* number of items in visual_depth */
- XdbeVisualInfo *visinfo; /* list of visuals & depths for scrn */
-}
-XdbeScreenVisualInfo;
-
/* Protocol data types */
-#ifdef NEED_DBE_PROTOCOL
-
typedef struct
{
CARD32 window B32; /* window */
@@ -271,7 +219,5 @@ typedef struct
} xDbeGetBackBufferAttributesReply;
#define sz_xDbeGetBackBufferAttributesReply 32
-#endif /* NEED_DBE_PROTOCOL */
-
#endif /* XDBE_PROTO_H */
--
1.6.3.rc1.2.g0164.dirty
More information about the xorg-devel
mailing list