libxext: Changes to 'upstream-unstable'
AUTHORS | 6 -
COPYING | 16 +--
configure.ac | 6 -
docbook.am | 116 +++++++++++++++-------------
include/X11/extensions/XLbx.h | 4
include/X11/extensions/Xdbe.h | 10 +-
include/X11/extensions/Xge.h | 2
include/X11/extensions/dpms.h | 10 +-
include/X11/extensions/extutil.h | 6 -
include/X11/extensions/sync.h | 16 +--
include/X11/extensions/xtestext1.h | 4
man/DBE.man | 118 ++++++++++++++--------------
man/DPMSCapable.man | 18 ++--
man/DPMSDisable.man | 16 +--
man/DPMSEnable.man | 32 +++----
man/DPMSForceLevel.man | 22 ++---
man/DPMSGetTimeouts.man | 36 ++++----
man/DPMSGetVersion.man | 22 ++---
man/DPMSInfo.man | 24 ++---
man/DPMSQueryExtension.man | 40 ++++-----
man/DPMSSetTimeouts.man | 80 +++++++++----------
man/XShape.man | 136 ++++++++++++++++-----------------
man/XShm.man | 30 +++----
man/XcupGetReservedColormapEntries.man | 22 ++---
man/XcupQueryVersion.man | 18 ++--
man/XcupStoreColors.man | 22 ++---
man/XdbeAllocateBackBufferName.man | 38 ++++-----
man/XdbeBeginIdiom.man | 30 +++----
man/XdbeDeallocateBackBufferName.man | 30 +++----
man/XdbeEndIdiom.man | 30 +++----
man/XdbeFreeVisualInfo.man | 30 +++----
man/XdbeGetBackBufferAttributes.man | 34 ++++----
man/XdbeGetVisualInfo.man | 36 ++++----
man/XdbeQueryExtension.man | 32 +++----
man/XdbeSwapBuffers.man | 30 +++----
man/Xevi.man | 56 ++++++-------
man/Xmbuf.man | 72 ++++++++---------
specs/Makefile.am | 2
specs/dbelib.xml | 109 ++++++++++++++------------
specs/dpmslib.xml | 38 ++++-----
specs/shapelib.xml | 67 +++++++++-------
specs/synclib.xml | 110 ++++++++++++++------------
specs/xtest1.xml | 32 +++++++
src/DPMS.c | 18 ++--
src/MITMisc.c | 4
src/Makefile.am | 2
src/XAppgroup.c | 16 +--
src/XEVI.c | 2
src/XLbx.c | 8 -
src/XMultibuf.c | 56 ++++++-------
src/XSecurity.c | 4
src/XShape.c | 8 -
src/XShm.c | 6 -
src/XSync.c | 6 -
src/XTestExt1.c | 36 ++++----
src/Xcup.c | 10 +-
src/Xdbe.c | 28 +++---
src/Xge.c | 2
src/extutil.c | 24 ++---
src/globals.c | 2
60 files changed, 953 insertions(+), 887 deletions(-)
New commits:
commit e9c1e346c90e697d5d8f0e756ef8b6e3ed339e29
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 19:54:50 2012 -0800
libXext 1.3.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index dd9788a..7f81504 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXext], [1.3.0],
+AC_INIT([libXext], [1.3.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit c0c2a0c7819c425f3df0992b6873a15c8ec27e01
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 28 16:19:27 2011 -0700
Add const attributes to fix gcc -Wwrite-strings warnings
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/include/X11/extensions/extutil.h b/include/X11/extensions/extutil.h
index 7f05aff..29404d5 100644
--- a/include/X11/extensions/extutil.h
+++ b/include/X11/extensions/extutil.h
@@ -123,7 +123,7 @@ extern void XextDestroyExtension(
extern XExtDisplayInfo *XextAddDisplay(
XExtensionInfo* /* extinfo */,
Display* /* dpy */,
- char* /* ext_name */,
+ _Xconst char* /* ext_name */,
XExtensionHooks* /* hooks */,
int /* nevents */,
XPointer /* data */
diff --git a/src/DPMS.c b/src/DPMS.c
index 07818a0..a4f0595 100644
--- a/src/DPMS.c
+++ b/src/DPMS.c
@@ -42,7 +42,7 @@ Equipment Corporation.
static XExtensionInfo _dpms_info_data;
static XExtensionInfo *dpms_info = &_dpms_info_data;
-static char *dpms_extension_name = DPMSExtensionName;
+static const char *dpms_extension_name = DPMSExtensionName;
#define DPMSCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, dpms_extension_name, val)
diff --git a/src/MITMisc.c b/src/MITMisc.c
index bc452db..b8c21b6 100644
--- a/src/MITMisc.c
+++ b/src/MITMisc.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _mit_info_data;
static XExtensionInfo *mit_info = &_mit_info_data;
-static /* const */ char *mit_extension_name = MITMISCNAME;
+static const char *mit_extension_name = MITMISCNAME;
#define MITCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, mit_extension_name, val)
diff --git a/src/XAppgroup.c b/src/XAppgroup.c
index 16650b6..b5642f3 100644
--- a/src/XAppgroup.c
+++ b/src/XAppgroup.c
@@ -52,7 +52,7 @@ struct xagstuff {
static XExtensionInfo _xag_info_data;
static XExtensionInfo *xag_info = &_xag_info_data;
-static char *xag_extension_name = XAGNAME;
+static const char *xag_extension_name = XAGNAME;
#define XagCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xag_extension_name, val)
diff --git a/src/XEVI.c b/src/XEVI.c
index a30daac..eb09daa 100644
--- a/src/XEVI.c
+++ b/src/XEVI.c
@@ -31,7 +31,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <X11/extensions/extutil.h>
#include <X11/Xutil.h>
static XExtensionInfo *xevi_info;/* needs to move to globals.c */
-static /* const */ char *xevi_extension_name = EVINAME;
+static const char *xevi_extension_name = EVINAME;
#define XeviCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, xevi_extension_name, val)
/*****************************************************************************
diff --git a/src/XLbx.c b/src/XLbx.c
index b3ba1b2..fda00ea 100644
--- a/src/XLbx.c
+++ b/src/XLbx.c
@@ -33,7 +33,7 @@
static XExtensionInfo _lbx_info_data;
static XExtensionInfo *lbx_info = &_lbx_info_data;
-static /* const */ char *lbx_extension_name = LBXNAME;
+static const char *lbx_extension_name = LBXNAME;
#define LbxCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, lbx_extension_name, val)
@@ -55,7 +55,7 @@ static /* const */ XExtensionHooks lbx_extension_hooks = {
error_string, /* error_string */
};
-static /* const */ char *lbx_error_list[] = {
+static const char *lbx_error_list[] = {
"BadLbxClient", /* BadLbxClient */
};
diff --git a/src/XMultibuf.c b/src/XMultibuf.c
index fb995f8..7a746ba 100644
--- a/src/XMultibuf.c
+++ b/src/XMultibuf.c
@@ -37,7 +37,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _multibuf_info_data;
static XExtensionInfo *multibuf_info = &_multibuf_info_data;
-static /* const */ char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME;
+static const char *multibuf_extension_name = MULTIBUFFER_PROTOCOL_NAME;
#define MbufCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, multibuf_extension_name, val)
@@ -72,7 +72,7 @@ static /* const */ XExtensionHooks multibuf_extension_hooks = {
error_string, /* error_string */
};
-static /* const */ char *multibuf_error_list[] = {
+static const char *multibuf_error_list[] = {
"BadBuffer", /* MultibufferBadBuffer */
};
diff --git a/src/XSecurity.c b/src/XSecurity.c
index b2aa98c..f8c7da1 100644
--- a/src/XSecurity.c
+++ b/src/XSecurity.c
@@ -36,7 +36,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _Security_info_data;
static XExtensionInfo *Security_info = &_Security_info_data;
-static char *Security_extension_name = SECURITY_EXTENSION_NAME;
+static const char *Security_extension_name = SECURITY_EXTENSION_NAME;
#define SecurityCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, Security_extension_name, val)
@@ -76,7 +76,7 @@ static XExtensionHooks Security_extension_hooks = {
error_string /* error_string */
};
-static char *security_error_list[] = {
+static const char *security_error_list[] = {
"BadAuthorization",
"BadAuthorizationProtocol"
};
diff --git a/src/XShape.c b/src/XShape.c
index 1e3a77f..6e8fbae 100644
--- a/src/XShape.c
+++ b/src/XShape.c
@@ -38,7 +38,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _shape_info_data;
static XExtensionInfo *shape_info = &_shape_info_data;
-static /* const */ char *shape_extension_name = SHAPENAME;
+static const char *shape_extension_name = SHAPENAME;
#define ShapeCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, shape_extension_name, val)
diff --git a/src/XShm.c b/src/XShm.c
index e3f8fa0..f82455c 100644
--- a/src/XShm.c
+++ b/src/XShm.c
@@ -40,7 +40,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _shm_info_data;
static XExtensionInfo *shm_info = &_shm_info_data;
-static /* const */ char *shm_extension_name = SHMNAME;
+static const char *shm_extension_name = SHMNAME;
#define ShmCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, shm_extension_name, val)
@@ -70,7 +70,7 @@ static /* const */ XExtensionHooks shm_extension_hooks = {
error_string, /* error_string */
};
-static /* const */ char *shm_error_list[] = {
+static const char *shm_error_list[] = {
"BadShmSeg", /* BadShmSeg */
};
diff --git a/src/XSync.c b/src/XSync.c
index 0e19922..df7c435 100644
--- a/src/XSync.c
+++ b/src/XSync.c
@@ -62,7 +62,7 @@ PERFORMANCE OF THIS SOFTWARE.
static XExtensionInfo _sync_info_data;
static XExtensionInfo *sync_info = &_sync_info_data;
-static char *sync_extension_name = SYNC_NAME;
+static const char *sync_extension_name = SYNC_NAME;
#define SyncCheckExtension(dpy,i,val) \
XextCheckExtension(dpy, i, sync_extension_name, val)
@@ -89,7 +89,7 @@ static XExtensionHooks sync_extension_hooks = {
error_string, /* error_string */
};
-static char *sync_error_list[] = {
+static const char *sync_error_list[] = {
"BadCounter",
"BadAlarm",
"BadFence",
diff --git a/src/Xcup.c b/src/Xcup.c
index ad78699..bb9e90f 100644
--- a/src/Xcup.c
+++ b/src/Xcup.c
@@ -39,7 +39,7 @@ in this Software without prior written authorization from The Open Group.
static XExtensionInfo _xcup_info_data;
static XExtensionInfo *xcup_info = &_xcup_info_data;
-static char *xcup_extension_name = XCUPNAME;
+static const char *xcup_extension_name = XCUPNAME;
/*****************************************************************************
* *
diff --git a/src/Xdbe.c b/src/Xdbe.c
index 1b9e2da..4b5fa18 100644
--- a/src/Xdbe.c
+++ b/src/Xdbe.c
@@ -42,7 +42,7 @@
static XExtensionInfo _dbe_info_data;
static XExtensionInfo *dbe_info = &_dbe_info_data;
-static char *dbe_extension_name = DBE_PROTOCOL_NAME;
+static const char *dbe_extension_name = DBE_PROTOCOL_NAME;
#define DbeCheckExtension(dpy,i,val) \
XextCheckExtension (dpy, i, dbe_extension_name, val)
@@ -86,7 +86,7 @@ static XExtensionHooks dbe_extension_hooks = {
error_string, /* error_string */
};
-static char *dbe_error_list[] = {
+static const char *dbe_error_list[] = {
"BadBuffer", /* DbeBadBuffer */
};
diff --git a/src/Xge.c b/src/Xge.c
index d28a4f0..74e4802 100644
--- a/src/Xge.c
+++ b/src/Xge.c
@@ -76,7 +76,7 @@ static Bool _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info);
/* main extension information data */
static XExtensionInfo *xge_info;
-static char xge_extension_name[] = GE_NAME;
+static const char xge_extension_name[] = GE_NAME;
static XExtensionHooks xge_extension_hooks = {
NULL, /* create_gc */
NULL, /* copy_gc */
diff --git a/src/extutil.c b/src/extutil.c
index 361a327..93cab73 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -96,7 +96,7 @@ void XextDestroyExtension (XExtensionInfo *info)
XExtDisplayInfo *XextAddDisplay (
XExtensionInfo *extinfo,
Display *dpy,
- char *ext_name,
+ _Xconst char *ext_name,
XExtensionHooks *hooks,
int nevents,
XPointer data)
commit a8f18777099ca5d61929bc37e4741457b6671e59
Author: Matt Dew <marcoz@osource.org>
Date: Fri Oct 7 23:25:45 2011 -0600
more Cleanup of IDs and links in doc
diff --git a/specs/dpmslib.xml b/specs/dpmslib.xml
index 60565b5..ba5682e 100644
--- a/specs/dpmslib.xml
+++ b/specs/dpmslib.xml
@@ -85,7 +85,7 @@ These are mapped onto the X DPMS Extension like this:
<title>DPMS Functions</title>
-<funcsynopsis id='dpmsqueryextention'>
+<funcsynopsis id='DPMSQueryExtention'>
<funcprototype>
<funcdef>Bool <function>DPMSQueryExtention</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -120,7 +120,7 @@ return value is FALSE, and the values of
<emphasis remap='I'>error_base</emphasis> are undefined.
</para>
-<funcsynopsis id='dpmsgetversion'>
+<funcsynopsis id='DPMSGetVersion'>
<funcprototype>
<funcdef>Status <function>DPMSGetVersion</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -156,7 +156,7 @@ incompatible changes, and the minor version will be incremented for small,
upwardly compatible changes.
</para>
-<funcsynopsis id='dpmscapable'>
+<funcsynopsis id='DPMSCapable'>
<funcprototype>
<funcdef>Bool <function>DPMSCapable</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -179,7 +179,7 @@ is capable of DPMS on one head, and incapable on another, the truth value of
this function is defined by the X server implementation.
</para>
-<funcsynopsis id='dpmssettimeouts'>
+<funcsynopsis id='DPMSSetTimeouts'>
<funcprototype>
<funcdef>Status <function>DPMSSetTimeouts</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -255,7 +255,7 @@ or equal to the timeout values of earlier modes. If inconsistent values
are supplied, a BadValue error will result.
</para>
-<funcsynopsis id='dpmsgettimeouts'>
+<funcsynopsis id='DPMSGetTimeouts'>
<funcprototype>
<funcdef>Status <function>DPMSGetTimeouts</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -307,7 +307,7 @@ inactivity in seconds before the third and final level of power savings is
invoked. A value of zero indicates that this mode has been disabled.
</para>
-<funcsynopsis id='dpmsenable'>
+<funcsynopsis id='DPMSEnable'>
<funcprototype>
<funcdef>Status <function>DPMSEnable</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -331,7 +331,7 @@ error is returned. If DPMSEnable is invoked on a display without
support for DPMS, no change is made and no error is returned.
</para>
-<funcsynopsis id='dpmsdisable'>
+<funcsynopsis id='DPMSDisable'>
<funcprototype>
<funcdef>Status <function>DPMSDisable</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -353,7 +353,7 @@ and no error is returned. If DPMSDisable is invoked on a display
without support for DPMS, no change is made and no error is returned.
</para>
-<funcsynopsis id='dpmsforcelevel'>
+<funcsynopsis id='DPMSForceLevel'>
<funcprototype>
<funcdef>Status <function>DPMSForceLevel</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
@@ -382,7 +382,7 @@ is disabled on the display, a BadMatch protocol error will result.
<para>Status DPMSInfo(<emphasis remap='I'>display, power_level, state</emphasis>)</para>
-<funcsynopsis id='dpmsinfo'>
+<funcsynopsis id='DPMSInfo'>
<funcprototype>
<funcdef>Status <function>DPMSInfo</function></funcdef>
<paramdef>Display <parameter>*display</parameter></paramdef>
commit 3464d6eebfaaf015ea6b25a9a437192ddb1b02b0
Author: Matt Dew <marcoz@osource.org>
Date: Tue Sep 20 22:06:05 2011 -0600
Fix id attributes capitolization
#1 - fix the capitolization of the ID attriutes to match either
the <title> or <funcdef> string it goes with.
#2 - fix any <linkend>'s that were affected by #1
#3 - any <function> in the docs that has an actual funcdef, will
become an olink.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/dbelib.xml b/specs/dbelib.xml
index b0001b3..f1692d0 100644
--- a/specs/dbelib.xml
+++ b/specs/dbelib.xml
@@ -56,7 +56,7 @@ purpose of the information in this document. This documentation is provided
</bookinfo>
-<chapter id="introduction">
+<chapter id='Introduction'>
<title>Introduction</title>
<para>
The Double Buffer Extension (DBE) provides a standard way to utilize
@@ -74,7 +74,7 @@ frame. The result is a flicker-free animation.
</chapter>
-<chapter id="goals">
+<chapter id='Goals'>
<title>Goals</title>
<para>
@@ -142,7 +142,7 @@ hardware access (DGHA) architectures.
</chapter>
-<chapter id="concepts">
+<chapter id='Concepts'>
<title>Concepts</title>
<para>
Normal windows are created using the core CreateWindow request, which
@@ -293,7 +293,7 @@ that need such facilities (for example, to maintain a constant frame rate)
should investigate the Synchronization Extension, an X Consortium standard.
</para>
-<sect1 id="window_management_operations">
+<sect1 id='Window_Management_Operations'>
<title>Window Management Operations</title>
<para>
@@ -344,7 +344,7 @@ events are generated for D.
</sect1>
-<sect1 id="complex_swap_actions">
+<sect1 id='Complex_Swap_Actions'>
<title>Complex Swap Actions</title>
<para>
DBE has no explicit knowledge of ancillary buffers (for example, depth buffers
@@ -451,14 +451,14 @@ variety of implementations.
</sect1>
</chapter>
-<chapter id="c_language_bindings">
+<chapter id='C_Language_Binding'>
<title>C Language Binding</title>
<para>
All identifier The header for this extension is <X11/extensions/Xdbe.h>.
names provided by this header begin with Xdbe.
</para>
-<sect1 id="types">
+<sect1 id='Types'>
<title>Types</title>
<para>
@@ -475,7 +475,7 @@ The type <function>XdbeSwapAction</function> can be one of the constants
</sect1>
-<sect1 id="c_functions">
+<sect1 id='C_Functions'>
<title>C Functions</title>
<para>
The C functions provide direct access to the protocol and add no additional
@@ -486,7 +486,7 @@ start of the function name with DBE. All functions that have return type
zero for failure.
</para>
-<funcsynopsis id='xdbequeryextension'>
+<funcsynopsis id='XdbeQueryExtension'>
<funcprototype>
<funcdef>Status <function>XdbeQueryExtension</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -496,7 +496,7 @@ zero for failure.
</funcsynopsis>
<para>
-<function>XdbeQueryExtension</function> sets major version return and minor
+<olink targetdoc='dbelib' targetptr='XdbeQueryExtension'><function>XdbeQueryExtension</function></olink> sets major version return and minor
version return to the major and minor DBE protocol version supported by
the server. If the DBE library is compatible with the version returned by
the server, it returns nonzero. If dpy does not support the DBE extension,
@@ -507,7 +507,7 @@ violates this rule, the effects of all subsequent Xdbe calls that it makes
are undefined.
</para>
-<funcsynopsis id='xdbegetvisualinfo'>
+<funcsynopsis id='XdbeGetVisualInfo'>
<funcprototype>
<funcdef>XdbeScreenVisualInfo *<function>XdbeGetVisualInfo</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -518,7 +518,7 @@ are undefined.
<para>
-<function>XdbeGetVisualInfo</function> returns information about which
+<olink targetdoc='dbelib' targetptr='XdbeGetVisualInfo'><function>XdbeGetVisualInfo</function></olink> returns information about which
visuals support double buffering. The argument num_screens specifies how
many elements there are in the screen_specifiers list. Each drawable in
screen_specifiers designates a screen for which the supported visuals are
@@ -564,11 +564,11 @@ int perflevel performance level of visual
<para>
<function>XdbeFreeVisualInfo</function> frees the list of
<function>XdbeScreenVisualInfo</function> returned by
-<function>XdbeGetVisualInfo</function>.
+<olink targetdoc='dbelib' targetptr='XdbeGetVisualInfo'><function>XdbeGetVisualInfo</function></olink>.
</para>
-<funcsynopsis id='xdbeallocatebackbuffername'>
+<funcsynopsis id='XdbeAllocateBackBufferName'>
<funcprototype>
<funcdef>XdbeBackBuffer <function>XdbeAllocateBackBufferName</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -579,16 +579,16 @@ int perflevel performance level of visual
<para>
-<function>XdbeAllocateBackBufferName</function> returns a drawable ID used
+<olink targetdoc='dbelib' targetptr='XdbeAllocateBackBufferName'><function>XdbeAllocateBackBufferName</function></olink> returns a drawable ID used
to refer to the back buffer of the specified window. The swap_action is a
hint to indicate the swap_action that will likely be used in subsequent
-calls to <function>XdbeSwapBuffers</function>. The actual swap_action
-used in calls to <function>XdbeSwapBuffers</function> does not have to be
+calls to <olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink>. The actual swap_action
+used in calls to <olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink> does not have to be
the same as the swap_action passed to this function, though clients are
encouraged to provide accurate information whenever possible.
</para>
-<funcsynopsis id='xdbedeallocatebackbuffername'>
+<funcsynopsis id='XdbeDeallocateBackBufferName'>
<funcprototype>
<funcdef>Status <function>XdbeDeallocateBackBufferName</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -597,14 +597,14 @@ encouraged to provide accurate information whenever possible.
</funcsynopsis>
<para>
-<function>XdbeDeallocateBackBufferName</function> frees the specified
+<olink targetdoc='dbelib' targetptr='XdbeDeallocateBackBufferName'><function>XdbeDeallocateBackBufferName</function></olink> frees the specified
drawable ID, buffer, that was obtained via
-<function>XdbeAllocateBackBufferName</function>. The buffer must be a valid
+<olink targetdoc='dbelib' targetptr='XdbeAllocateBackBufferName'><function>XdbeAllocateBackBufferName</function></olink>. The buffer must be a valid
name for the back buffer of a window, or an
<function>XdbeBadBuffer</function> error results.
</para>
-<funcsynopsis id='xdbeswapbuffers'>
+<funcsynopsis id='XdbeSwapBuffers'>
<funcprototype>
<funcdef>Status <function>XdbeSwapBuffers</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -614,7 +614,7 @@ name for the back buffer of a window, or an
</funcsynopsis>
<para>
-<function>XdbeSwapBuffers</function> swaps the front and back buffers
+<olink targetdoc='dbelib' targetptr='XdbeSwapBuffers'><function>XdbeSwapBuffers</function></olink> swaps the front and back buffers
for a list of windows. The argument num_windows specifies how many windows
are to have their buffers swapped; it is the number of elements in the
swap_info array. The argument swap_info specifies the information needed
@@ -629,7 +629,7 @@ Window swap_window window for which to swap buffers
XdbeSwapAction swap_action swap action to use for this swap window
</literallayout>
-<funcsynopsis id='xdbebeginidiom'>
+<funcsynopsis id='XdbeBeginIdiom'>
<funcprototype>
<funcdef>Status <function>XdbeBeginIdiom</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -637,14 +637,14 @@ XdbeSwapAction swap_action swap action to use for this swap window
</funcsynopsis>
<para>
-<function>XdbeBeginIdiom</function> marks the beginning of an idiom
+<olink targetdoc='dbelib' targetptr='XdbeBeginIdiom'><function>XdbeBeginIdiom</function></olink> marks the beginning of an idiom
sequence. See
-<link linkend="complex_swap_actions">
-<xref linkend="complex_swap_actions"></xref></link>
+<link linkend='Complex_Swap_Actions'>
+<xref linkend='Complex_Swap_Actions'></xref></link>
for a complete discussion of idioms.
</para>
-<funcsynopsis id='xdbeendidiom'>
+<funcsynopsis id='XdbeEndIdiom'>
<funcprototype>
<funcdef>Status <function>XdbeEndIdiom</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -652,10 +652,10 @@ for a complete discussion of idioms.
</funcsynopsis>
<para>
-<function>XdbeEndIdiom</function> marks the end of an idiom sequence.
+<olink targetdoc='dbelib' targetptr='XdbeEndIdiom'><function>XdbeEndIdiom</function></olink> marks the end of an idiom sequence.
</para>
-<funcsynopsis id='xdbegetbackbufferattributes'>
+<funcsynopsis id='XdbeGetBackBufferAttributes'>
<funcprototype>
<funcdef>XdbeBackBufferAttributes *<function>XdbeGetBackBufferAttributes</function></funcdef>
<paramdef>Display <parameter> *dpy</parameter></paramdef>
@@ -664,7 +664,7 @@ for a complete discussion of idioms.
</funcsynopsis>
<para>
-<function>XdbeGetBackBufferAttributes</function> returns the attributes associated with
+<olink targetdoc='dbelib' targetptr='XdbeGetBackBufferAttributes'><function>XdbeGetBackBufferAttributes</function></olink> returns the attributes associated with
the specified buffer.
</para>
<para>
@@ -681,11 +681,11 @@ set to None.
</para>
<para>
The returned <function>XdbeBackBufferAttributes</function> structure
-can be freed with the Xlib function <function>XFree</function>.
+can be freed with the Xlib function <olink targetdoc='libX11' targetptr='XFree'><function>XFree</function></olink>.
</para>
</sect1>
-<sect1 id="errors">
+<sect1 id='Errors'>
<title>Errors</title>
<para>
The <function>XdbeBufferError</function> structure has the following fields:
@@ -702,7 +702,7 @@ unsigned char minor code Minor op-code of failed request
</sect1>
</chapter>
-<chapter id="acknowledgements">
+<chapter id='Acknowledgements'>
<title>Acknowledgements</title>
<para>
@@ -727,7 +727,7 @@ of the specification. David served as architect.
</para>
</chapter>
-<chapter id="references">
+<chapter id='References'>
<title>References</title>
<para>
Jeffrey Friedberg, Larry Seiler, and Jeff Vroom, "Multi-buffering Extension
commit 17271b78c5d8d9864eda2476863543ba284bee2d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 19:01:41 2011 -0400
specs: regroup <author> <editor> <othercredit> under authorgroup
Some elements are not displayed when outside authorgroup
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/dbelib.xml b/specs/dbelib.xml
index d3616fc..b0001b3 100644
--- a/specs/dbelib.xml
+++ b/specs/dbelib.xml
@@ -19,11 +19,11 @@
<firstname>Ian</firstname><surname>Elliot</surname>
<affiliation><orgname>Hewlett-Packard Company</orgname></affiliation>
</author>
+ <othercredit>
+ <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
+ <affiliation><orgname>X Consortium, Inc</orgname></affiliation>
+ </othercredit>
</authorgroup>
- <othercredit>
- <firstname>David</firstname><othername>P.</othername><surname>Wiggins</surname>
- <affiliation><orgname>X Consortium, Inc</orgname></affiliation>
- </othercredit>
<copyright><year>1989</year>
<holder>X Consortium Inc</holder>
<holder>Digital Equipment Corporation</holder>
commit a58e7d756111eafd4b75763692808198315f1c75
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 10:18:22 2011 -0400
xtest1: adding legal text related to the X Consortium Copyright
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/xtest1.xml b/specs/xtest1.xml
index 9229d27..df05881 100644
--- a/specs/xtest1.xml
+++ b/specs/xtest1.xml
@@ -18,6 +18,35 @@
</authorgroup>
<copyright><year>1993</year><holder>X Consortium</holder></copyright>
+<legalnotice>
+<para>
+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:
+</para>
+<para>
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+</para>
+<para>
+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 X
+CONSORTIUM 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.
+</para>
+<para>
+Except as contained in this notice, the name of the X Consortium 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 X Consortium.
+</para>
+<para>X Window System is a trademark of The Open Group.</para>
+</legalnotice>
+
<abstract>
<para>
This is a proposal for an extension to the X11 server and Xlib.
commit 276df4dd2de616617cb439df4367cbaa4f568a0a
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 10:07:06 2011 -0400
dpmslib: minor markup fix in legal text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/dpmslib.xml b/specs/dpmslib.xml
index 93e6398..60565b5 100644
--- a/specs/dpmslib.xml
+++ b/specs/dpmslib.xml
@@ -33,9 +33,7 @@ of the information in this document. This documentation is
provided "as is" without express or implied warranty.
</para>
-<para>
-<emphasis remap='I'>X Window System</emphasis> is a trademark of The Open Group.
-</para>
+<para>X Window System is a trademark of The Open Group.</para>
</legalnotice>
</bookinfo>
commit ca39a358c35ea364c10fa7c16b6a584171d27600
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue Sep 20 09:57:26 2011 -0400
synclib: refactor copyright legal text for multiple licensing
One sentence added as per the xorg License doc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/synclib.xml b/specs/synclib.xml
index 51b7cf5..12145eb 100644
--- a/specs/synclib.xml
+++ b/specs/synclib.xml
@@ -45,12 +45,12 @@
<affiliation><orgname>X Consortium, Inc.</orgname></affiliation>
</author>
</authorgroup>
-<legalnotice>
-
-<para>
-Copyright 1991 by Olivetti Research Limited, Cambridge England and Digital Equipment Corporation, Maynard, Massachusetts
-</para>
+ <copyright><year>1991</year>
+ <holder>Olivetti Research Limited, Cambridge England</holder>
+ <holder>Digital Equipment Corporation, Maynard, Massachusetts</holder>
+ </copyright>
+<legalnotice>
<para>
Permission to use, copy, modify, and distribute this documentation for any
purpose and without fee is hereby granted, provided that the above
@@ -62,11 +62,7 @@ is without express or implied warranty.
</legalnotice>
<legalnotice>
-
-<para>
-Copyright © 1991 X Consortium, Inc.
-</para>
-
+<para role="multiLicensing">Copyright © 1991 X Consortium, Inc.</para>
<para>
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files
@@ -82,7 +78,7 @@ The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
</para>
-<para>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+<para>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 X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
@@ -97,6 +93,7 @@ not be used in advertising or otherwise to promote the sale, use or other
dealings in this Software without prior written authorization from the
X Consortium.
</para>
+<para>X Window System is a trademark of The OpenGroup.</para>
</legalnotice>
</bookinfo>
commit 877e74e518ec74a07cb8998a3f517ab043cf76be
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Sep 19 17:26:02 2011 -0400
specs: add missing legal text information
The reference being the xorg License doc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/specs/shapelib.xml b/specs/shapelib.xml
index 9a158ee..525cbbe 100644
--- a/specs/shapelib.xml
+++ b/specs/shapelib.xml
@@ -19,7 +19,6 @@
<affiliation><orgname>MIT X Consortium</orgname></affiliation>
</author>
</authorgroup>
- <corpname>MIT X Consortium</corpname>
<copyright><year>1989</year><holder>X Consortium</holder></copyright>
<legalnotice>
@@ -54,6 +53,7 @@ Except as contained in this notice, the name of the X Consortium 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 X Consortium.
</para>
+<para>X Window System is a trademark of The OpenGroup.</para>
</legalnotice>
</bookinfo>
commit b46167511d429792086fb8e8cfea6f19b2fc9847
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:18:56 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/AUTHORS b/AUTHORS
index 00e1f42..6e545c0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,14 +6,14 @@ XAppgroup: Kaleb S. Keithley, X Consortium
Xcup: Kaleb S, Keithley, The Open Group
Xdbe: Ian Elliot, Hewlett-Packard, David Wiggens, X Consortium
XEVI: Peter Daifuku, Silicon Graphics
-XLbx: D. Converse, J Fulton, C. Kantarjiev, D. Lemke, R. Mor,
- Keith Packard, NCD (who now believes lbx should be nuked),
+XLbx: D. Converse, J Fulton, C. Kantarjiev, D. Lemke, R. Mor,
+ Keith Packard, NCD (who now believes lbx should be nuked),
R. Tice, D. Tonogai
XMultibuf: Jeffrey Friedberg, Larry Seiler, Jeff Vroom, Digital Equipment
XSecurity: Dave Wiggens, X Consortium
XShape: Jonathan Corbet, NCAR, Keith Packard, MIT X Consortium
Xshm: Bob Scheifler and Keith Packard, MIT X Consortium
-XSync: Tim Glauert, Olivetti Research, DAve Carver, Jim Gettys,
+XSync: Tim Glauert, Olivetti Research, DAve Carver, Jim Gettys,
Digital Equipment, Dave Wiggens, X Consortium
XTestExt: Kieron Drake, UniSoft, Ltd.
diff --git a/COPYING b/COPYING
index b4005cb..80622a0 100644
--- a/COPYING
+++ b/COPYING
@@ -34,14 +34,14 @@ 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
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL 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 Digital Equipment Corporation
+Except as contained in this notice, the name of Digital Equipment Corporation
shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
+dealings in this Software without prior written authorization from Digital
Equipment Corporation.
Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
@@ -81,7 +81,7 @@ NCD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
@@ -116,8 +116,8 @@ documentation, and that the name of Hewlett-Packard not be used in
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
-Hewlett-Packard makes no representations about the
-suitability of this software for any purpose. It is provided
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
This software is not subject to any license of the American
diff --git a/configure.ac b/configure.ac
index 6e6cc8b..dd9788a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ XORG_WITH_XSLTPROC
XORG_CHECK_SGML_DOCTOOLS(1.8)
XORG_CHECK_MALLOC_ZERO
-# Determine .so library version per platform
+# Determine .so library version per platform
# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl
if test "x$XEXT_SOREV" = "x" ; then
case $host_os in
diff --git a/include/X11/extensions/XLbx.h b/include/X11/extensions/XLbx.h
index ce8c835..1af4f9c 100644
--- a/include/X11/extensions/XLbx.h
+++ b/include/X11/extensions/XLbx.h
@@ -15,11 +15,11 @@
Reply to: