libxext: Changes to 'upstream-unstable'
.gitignore | 74 ++++++++--
COPYING | 33 ++--
INSTALL | 229 ---------------------------------
Makefile.am | 10 -
configure.ac | 15 +-
include/X11/extensions/XShm.h | 2
include/X11/extensions/dpms.h | 2
include/X11/extensions/sync.h | 6
man/.gitignore | 2
man/DPMSCapable.man | 35 ++---
man/DPMSDisable.man | 35 ++---
man/DPMSEnable.man | 35 ++---
man/DPMSForceLevel.man | 35 ++---
man/DPMSGetTimeouts.man | 35 ++---
man/DPMSGetVersion.man | 35 ++---
man/DPMSInfo.man | 35 ++---
man/DPMSQueryExtension.man | 35 ++---
man/DPMSSetTimeouts.man | 35 ++---
man/XShm.man | 33 ++--
man/XcupGetReservedColormapEntries.man | 35 ++---
man/XcupQueryVersion.man | 35 ++---
man/XcupStoreColors.man | 35 ++---
src/Makefile.am | 4
src/Xdbe.c | 5
src/extutil.c | 2
25 files changed, 298 insertions(+), 539 deletions(-)
New commits:
commit ce440c7d68fa06763f8413859c25ae3a8a22c81b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 3 17:19:30 2010 -0700
libXext 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index cde461b..d5d631c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.60])
AC_INIT([libXext],
- [1.1.1],
+ [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[libXext])
commit 904f71cda5ef818b53171888efb6b0dd0f929565
Author: Jamey Sharp <jamey@minilop.net>
Date: Fri Apr 9 17:30:06 2010 -0700
XAllocID must only be called with the Display lock held.
This patch makes XdbeAllocateBackBufferName follow the same XID allocation
pattern used in other stubs.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
diff --git a/src/Xdbe.c b/src/Xdbe.c
index 77344b4..7b5244d 100644
--- a/src/Xdbe.c
+++ b/src/Xdbe.c
@@ -184,14 +184,11 @@ XdbeBackBuffer XdbeAllocateBackBufferName(
*/
DbeCheckExtension (dpy, info, (XdbeBackBuffer)0);
- /* allocate the id */
- buffer = XAllocID (dpy);
-
LockDisplay(dpy);
DbeGetReq(DbeAllocateBackBufferName, req, info);
req->window = window;
req->swapAction = (unsigned char)swap_action;
- req->buffer = buffer;
+ req->buffer = buffer = XAllocID (dpy);
UnlockDisplay (dpy);
SyncHandle ();
commit b403e38d7d0994d223984c11f26f5b8749851522
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Apr 5 19:58:03 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 25df2ad..cde461b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.57)
+AC_PREREQ([2.60])
AC_INIT([libXext],
- 1.1.1,
+ [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXext)
+ [libXext])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 048e97e3948dd0caf886f3cb789899f63dc9d1bf
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Mar 29 14:53:48 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index 9bc56ee..2eb82b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xext.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST=xext.pc.in
.PHONY: ChangeLog INSTALL
commit 658574bb531f342947f484f9903e30032afce070
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 5 13:58:33 2010 +0100
Revert "Don't smash the event_vec if num_events differs between lib and server."
That commit created a single ext_handlers[] array to check for
non-overlapping extension events, but the event codes need to be
per-display, so checking them globally is wrong.
This reverts commit 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287.
Signed-off-by: Julien Cristau <jcristau@debian.org>
Cc: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/extutil.c b/src/extutil.c
index a8f4d5d..8f4923a 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -103,7 +103,6 @@ XExtDisplayInfo *XextAddDisplay (
int nevents,
XPointer data)
{
- static unsigned char ext_handlers[64] = {0};
XExtDisplayInfo *dpyinfo;
dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
@@ -118,54 +117,10 @@ XExtDisplayInfo *XextAddDisplay (
*/
if (dpyinfo->codes) {
int i, j;
- int idx = dpyinfo->codes->first_event & 0x3f;
-
-
- /* Xlib extensions use compiled in event numbers. A new library
- * against an older server may thus expect a different (higher)
- * number of events than the server will send. We have no way of
- * knowing the number of events for an extension, the server won't
- * tell us.
- *
- * Depending on the extension initialization order, this smashes the
- * event_vec[type] for anything after the extension with the
- * different number of events.
- *
- * e.g. server with inputproto 1.3 expects 15 events, libXi with
- * inputproto 2.0 expects 17 events.
- * base code is 80, events [80,96] are handled by libXi. events [95,
- * 96] belong to the next extension already though.
- * This requires XI to be initialized after the extension occupying
- * the next range of event codes.
- *
- * To avoid this, we have a zeroed out array of extension handlers.
- * If an extension handler for an event type is already set, and the
- * previous event code (before base_code) is the same extension, we
- * have the nevents conflict. Unset all those handlers and allow
- * overwriting them with the new handlers.
- *
- * If a handler for a (base + n) event is already set, stop
- * registering this extension for the event codes.
- *
- * event_codes are subtracted by 64 since we don't need to worry
- * about core.
- */
-
- if (idx && ext_handlers[idx - 1] == ext_handlers[idx]) {
- for (i = idx; i < 64; i++) {
- if (ext_handlers[idx - 1] == ext_handlers[i])
- ext_handlers[i] = 0;
- else
- break;
- }
- }
- for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++, idx++) {
- if (ext_handlers[idx]) /* don't smash the following extension */
- break;
+ for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) {
XESetWireToEvent (dpy, j, hooks->wire_to_event);
XESetEventToWire (dpy, j, hooks->event_to_wire);
- ext_handlers[idx] = dpyinfo->codes->first_event & 0x3f;
}
/* register extension for XGE */
commit 1ed7492638d6d6fb7c06da64017df6b7877d9780
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Jan 14 20:36:51 2010 -0800
Update Sun license notices to current X.Org standard form
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/COPYING b/COPYING
index 443e63a..b8c9d54 100644
--- a/COPYING
+++ b/COPYING
@@ -160,28 +160,23 @@ makes no representations about the suitability for any purpose
of the information in this document. This documentation is
provided ``as is'' without express or implied warranty.
-Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All Rights Reserved
+Copyright 1999, 2005, 2006 Sun Microsystems, Inc. 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
-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 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 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 NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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 names of the copyright holders
-shall not be used in advertising or otherwise to promote the sale, use
-or other dealings in this Software without prior written authorization
-from said copyright holders.
+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 AUTHORS OR COPYRIGHT HOLDERS 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.
diff --git a/man/DPMSCapable.man b/man/DPMSCapable.man
index f21a8a8..2b75add 100644
--- a/man/DPMSCapable.man
+++ b/man/DPMSCapable.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSDisable.man b/man/DPMSDisable.man
index f68177d..c97ecb3 100644
--- a/man/DPMSDisable.man
+++ b/man/DPMSDisable.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSEnable.man b/man/DPMSEnable.man
index d52902c..c06d5eb 100644
--- a/man/DPMSEnable.man
+++ b/man/DPMSEnable.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSForceLevel.man b/man/DPMSForceLevel.man
index 21447d1..ffc08a0 100644
--- a/man/DPMSForceLevel.man
+++ b/man/DPMSForceLevel.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSGetTimeouts.man b/man/DPMSGetTimeouts.man
index 65d51d1..bde81ea 100644
--- a/man/DPMSGetTimeouts.man
+++ b/man/DPMSGetTimeouts.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSGetVersion.man b/man/DPMSGetVersion.man
index 552a441..8064512 100644
--- a/man/DPMSGetVersion.man
+++ b/man/DPMSGetVersion.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSInfo.man b/man/DPMSInfo.man
index 9dfbd31..70fc267 100644
--- a/man/DPMSInfo.man
+++ b/man/DPMSInfo.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSQueryExtension.man b/man/DPMSQueryExtension.man
index 7d1369d..9361d9b 100644
--- a/man/DPMSQueryExtension.man
+++ b/man/DPMSQueryExtension.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/DPMSSetTimeouts.man b/man/DPMSSetTimeouts.man
index ab0edd3..212714f 100644
--- a/man/DPMSSetTimeouts.man
+++ b/man/DPMSSetTimeouts.man
@@ -10,31 +10,26 @@
.\" of the information in this document. This documentation is
.\" provided ``as is'' without express or implied warranty.
.\"
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/XShm.man b/man/XShm.man
index 64f292c..4309461 100644
--- a/man/XShm.man
+++ b/man/XShm.man
@@ -23,31 +23,26 @@
.\" dealing in this Software without prior written authorization from the
.\" X Consortium.
.\"
-.\" Copyright 2006 Sun Microsystems, Inc. All Rights Reserved
+.\" Copyright 2006 Sun Microsystems, Inc. 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
-.\" 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 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 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 NONINFRINGEMENT.
-.\" IN NO EVENT SHALL THE COPYRIGHT HOLDERS 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 names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/XcupGetReservedColormapEntries.man b/man/XcupGetReservedColormapEntries.man
index 4ead6fe..1eadd38 100644
--- a/man/XcupGetReservedColormapEntries.man
+++ b/man/XcupGetReservedColormapEntries.man
@@ -1,31 +1,26 @@
.\" $XdotOrg: $
.\"
.\" Copyright \(co 1986-1997 The Open Group All Rights Reserved
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/XcupQueryVersion.man b/man/XcupQueryVersion.man
index b76a19c..cc92b92 100644
--- a/man/XcupQueryVersion.man
+++ b/man/XcupQueryVersion.man
@@ -1,31 +1,26 @@
.\" $XdotOrg: $
.\"
.\" Copyright \(co 1986-1997 The Open Group All Rights Reserved
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
diff --git a/man/XcupStoreColors.man b/man/XcupStoreColors.man
index 0f08f1d..bca843a 100644
--- a/man/XcupStoreColors.man
+++ b/man/XcupStoreColors.man
@@ -1,31 +1,26 @@
.\" $XdotOrg: $
.\"
.\" Copyright \(co 1986-1997 The Open Group All Rights Reserved
-.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved
-.\"
+.\" Copyright 1999, 2005 Sun Microsystems, Inc. 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
-.\" 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 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 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 COPYRIGHT HOLDERS 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.
+.\" The above copyright notice and this permission notice (including the next
+.\" paragraph) shall be included in all copies or substantial portions of the
+.\" Software.
.\"
-.\" Except as contained in this notice, the names of the copyright holders
-.\" shall not be used in advertising or otherwise to promote the sale, use
-.\" or other dealings in this Software without prior written authorization
-.\" from said copyright holders.
+.\" 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 AUTHORS OR COPYRIGHT HOLDERS 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.
.\"
.\" X Window System is a trademark of The Open Group.
.\"
commit 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 26 09:38:31 2009 +1000
Don't smash the event_vec if num_events differs between lib and server.
If the library extension thinks there's more events to an extension than the
server actually has, the event_vec for the overlapping range can get
overwritten. This depends on the initialization order of the libraries.
Reported-by: Nathan Kidd
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Julien Cristau <jcristau@debian.org>
diff --git a/src/extutil.c b/src/extutil.c
index 8f4923a..a8f4d5d 100644
--- a/src/extutil.c
+++ b/src/extutil.c
@@ -103,6 +103,7 @@ XExtDisplayInfo *XextAddDisplay (
int nevents,
XPointer data)
{
+ static unsigned char ext_handlers[64] = {0};
XExtDisplayInfo *dpyinfo;
dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo));
@@ -117,10 +118,54 @@ XExtDisplayInfo *XextAddDisplay (
*/
if (dpyinfo->codes) {
int i, j;
+ int idx = dpyinfo->codes->first_event & 0x3f;
+
+
+ /* Xlib extensions use compiled in event numbers. A new library
+ * against an older server may thus expect a different (higher)
+ * number of events than the server will send. We have no way of
+ * knowing the number of events for an extension, the server won't
+ * tell us.
+ *
+ * Depending on the extension initialization order, this smashes the
+ * event_vec[type] for anything after the extension with the
+ * different number of events.
+ *
+ * e.g. server with inputproto 1.3 expects 15 events, libXi with
+ * inputproto 2.0 expects 17 events.
+ * base code is 80, events [80,96] are handled by libXi. events [95,
+ * 96] belong to the next extension already though.
+ * This requires XI to be initialized after the extension occupying
+ * the next range of event codes.
+ *
+ * To avoid this, we have a zeroed out array of extension handlers.
+ * If an extension handler for an event type is already set, and the
+ * previous event code (before base_code) is the same extension, we
+ * have the nevents conflict. Unset all those handlers and allow
+ * overwriting them with the new handlers.
+ *
+ * If a handler for a (base + n) event is already set, stop
+ * registering this extension for the event codes.
Reply to: