libxinerama: Changes to 'upstream-unstable'
.gitignore | 9 +++
Makefile.am | 4 -
README | 25 ++++++++++
configure.ac | 16 ++----
include/X11/extensions/Xinerama.h | 74 +++++++++++++++++++++++++++++
include/X11/extensions/panoramiXext.h | 85 ++++++++++++++++++++++++++++++++++
man/Xinerama.man | 26 +++++-----
src/.gitignore | 6 --
src/Makefile.am | 10 +++-
src/Xinerama.c | 22 ++++----
10 files changed, 235 insertions(+), 42 deletions(-)
New commits:
commit ee877cebfea0773a91337439d32ece12444cf0a6
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 13:27:04 2009 +1000
libXinerama 1.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 0cd6cf5..2be3ff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXinerama, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT(libXinerama, 1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit c5f1f903ddf1f2216bb31408caec3e87ea795dd9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 13:26:17 2009 +1000
Require macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index cf7fc80..0cd6cf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,14 +27,14 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
# Check for dependencies
PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
@@ -47,9 +47,6 @@ XORG_WITH_LINT
LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
XORG_CHECK_MALLOC_ZERO
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
commit 46e5273f34fd950cb4757583e06d5687d1f10407
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 11:47:34 2009 +1000
libXinerama 1.0.99.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 73cb60c..cf7fc80 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXinerama, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
+AC_INIT(libXinerama, 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXinerama)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 0bfbff6d88be339f5837aa2fff016950d07a6bc5
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 11:46:33 2009 +1000
Require xineramaproto 1.1.99.1 to avoid header conflicts.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index af5fbf4..73cb60c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PROG_LIBTOOL
XORG_CWARNFLAGS
# Check for dependencies
-PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto xineramaproto)
+PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1])
XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS"
AC_SUBST(XINERAMA_CFLAGS)
AC_SUBST(XINERAMA_LIBS)
commit 90d4d23bf2e94721149ddc0a80093b10a82e8845
Author: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Fri Feb 13 14:48:50 2009 +1030
Proto major/minors shouldn't live in the extension header but the proto header
Previously the Xserver was pulling in the extension header rather than the proto header
this led to issues when compiling the xserver. Instead we shift the proto numbers to
the proto header and tell the X server to use the proto header. Hence it's possible
to compile the server without the lib again.
Signed-off-by: Benjamin Close <Benjamin.Close@clearchain.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
index a302b82..9c75643 100644
--- a/include/X11/extensions/panoramiXext.h
+++ b/include/X11/extensions/panoramiXext.h
@@ -33,11 +33,6 @@ Equipment Corporation.
#include <X11/Xfuncproto.h>
-#define PANORAMIX_MAJOR_VERSION 1 /* current version number */
-#define PANORAMIX_MINOR_VERSION 1
-
-#ifndef _PANORAMIX_SERVER
-
typedef struct {
Window window; /* PanoramiX window - may not exist */
int screen;
@@ -87,6 +82,4 @@ extern Status XPanoramiXGetScreenSize (
_XFUNCPROTOEND
-#endif /* _PANORAMIX_SERVER */
-
#endif /* _panoramiXext_h */
commit 9810140927d4aa646f585367215d6ca684ce60a4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:34 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..3972335 100644
--- a/README
+++ b/README
@@ -0,0 +1,25 @@
+libXinerama - API for Xinerama extension to X11 Protocol
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXinerama
+
+ http://cgit.freedesktop.org/xorg/lib/libXinerama
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 39a19b89cb7bd226ec51000d4e8e7643ac076ce6
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 03:53:40 2009 -0200
panoramiXext.h is included in X Server build.
The X Server build only requires the value of the macros
PANORAMIX_MAJOR_VERSION and PANORAMIX_MINOR_VERSION.
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
index 82682b8..a302b82 100644
--- a/include/X11/extensions/panoramiXext.h
+++ b/include/X11/extensions/panoramiXext.h
@@ -31,9 +31,13 @@ Equipment Corporation.
#ifndef _panoramiXext_h
#define _panoramiXext_h
+#include <X11/Xfuncproto.h>
+
#define PANORAMIX_MAJOR_VERSION 1 /* current version number */
#define PANORAMIX_MINOR_VERSION 1
+#ifndef _PANORAMIX_SERVER
+
typedef struct {
Window window; /* PanoramiX window - may not exist */
int screen;
@@ -44,6 +48,8 @@ typedef struct {
XID eventMask; /* selected events for this client */
} XPanoramiXInfo;
+_XFUNCPROTOBEGIN
+
extern Bool XPanoramiXQueryExtension (
Display * /* dpy */,
int * /* event_base_return */,
@@ -79,4 +85,8 @@ extern Status XPanoramiXGetScreenSize (
XPanoramiXInfo * /* panoramiX_info */
);
+_XFUNCPROTOEND
+
+#endif /* _PANORAMIX_SERVER */
+
#endif /* _panoramiXext_h */
commit 7c72e844a794a9cedd9e614e919f696b47ede5e5
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 19:42:06 2009 -0200
Janitor: ansification, make distcheck, compiler warnings.
diff --git a/.gitignore b/.gitignore
index c79a22f..5a1f04c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
config.guess
@@ -19,3 +21,10 @@ mkinstalldirs
stamp-h1
xinerama.pc
*~
+*.3
+*.o
+*.la
+*.lo
+libXinerama-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index e02c660..9eeb5e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,13 +24,13 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xinerama.pc
-EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
+EXTRA_DIST = xinerama.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 8fc368c..af5fbf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,19 +26,19 @@ AC_INIT(libXinerama, 1.0.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER(config.h)
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later])])
-XORG_MACROS_VERSION(1.1)
-
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
+XORG_CWARNFLAGS
# Check for dependencies
PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto xineramaproto)
-
+XINERAMA_CFLAGS="$CWARNFLAGS $XINERAMA_CFLAGS"
AC_SUBST(XINERAMA_CFLAGS)
AC_SUBST(XINERAMA_LIBS)
@@ -49,6 +49,7 @@ LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
index 280efc5..82682b8 100644
--- a/include/X11/extensions/panoramiXext.h
+++ b/include/X11/extensions/panoramiXext.h
@@ -28,6 +28,9 @@ Equipment Corporation.
/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
+#ifndef _panoramiXext_h
+#define _panoramiXext_h
+
#define PANORAMIX_MAJOR_VERSION 1 /* current version number */
#define PANORAMIX_MINOR_VERSION 1
@@ -41,6 +44,39 @@ typedef struct {
XID eventMask; /* selected events for this client */
} XPanoramiXInfo;
+extern Bool XPanoramiXQueryExtension (
+ Display * /* dpy */,
+ int * /* event_base_return */,
+ int * /* error_base_return */
+);
+
+extern Status XPanoramiXQueryVersion(
+ Display * /* dpy */,
+ int * /* major_version_return */,
+ int * /* minor_version_return */
+);
+
extern XPanoramiXInfo *XPanoramiXAllocInfo (
void
-);
+);
+
+extern Status XPanoramiXGetState (
+ Display * /* dpy */,
+ Drawable /* drawable */,
+ XPanoramiXInfo * /* panoramiX_info */
+);
+
+extern Status XPanoramiXGetScreenCount (
+ Display * /* dpy */,
+ Drawable /* drawable */,
+ XPanoramiXInfo * /* panoramiX_info */
+);
+
+extern Status XPanoramiXGetScreenSize (
+ Display * /* dpy */,
+ Drawable /* drawable */,
+ int /* screen_num */,
+ XPanoramiXInfo * /* panoramiX_info */
+);
+
+#endif /* _panoramiXext_h */
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 3f6f09d..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libXinerama.la
-*.lo
-Makefile
-Makefile.in
commit 8123c94eba27d1a3eb3f509a79c229ddfa1f881a
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 22:56:50 2008 +0930
Add Xinerama.h and panoramiXext.h to includedir.
Were previously part of xineramaproto, but they really belong here.
For a history of these files please refer to
git://anongit.freedesktop.org/git/xorg/proto/xineramaproto
diff --git a/include/X11/extensions/Xinerama.h b/include/X11/extensions/Xinerama.h
new file mode 100644
index 0000000..666f52a
--- /dev/null
+++ b/include/X11/extensions/Xinerama.h
@@ -0,0 +1,74 @@
+/*
+
+Copyright 2003 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifndef _Xinerama_h
+#define _Xinerama_h
+
+#include <X11/Xlib.h>
+
+typedef struct {
+ int screen_number;
+ short x_org;
+ short y_org;
+ short width;
+ short height;
+} XineramaScreenInfo;
+
+_XFUNCPROTOBEGIN
+
+Bool XineramaQueryExtension (
+ Display *dpy,
+ int *event_base,
+ int *error_base
+);
+
+Status XineramaQueryVersion(
+ Display *dpy,
+ int *major_versionp,
+ int *minor_versionp
+);
+
+Bool XineramaIsActive(Display *dpy);
+
+
+/*
+ Returns the number of heads and a pointer to an array of
+ structures describing the position and size of the individual
+ heads. Returns NULL and number = 0 if Xinerama is not active.
+
+ Returned array should be freed with XFree().
+*/
+
+XineramaScreenInfo *
+XineramaQueryScreens(
+ Display *dpy,
+ int *number
+);
+
+_XFUNCPROTOEND
+
+#endif /* _Xinerama_h */
+
diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h
new file mode 100644
index 0000000..280efc5
--- /dev/null
+++ b/include/X11/extensions/panoramiXext.h
@@ -0,0 +1,46 @@
+/*****************************************************************
+Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
+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.
+
+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
+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
+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
+Equipment Corporation.
+******************************************************************/
+/*
+ * PanoramiX definitions
+ */
+
+/* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
+
+#define PANORAMIX_MAJOR_VERSION 1 /* current version number */
+#define PANORAMIX_MINOR_VERSION 1
+
+typedef struct {
+ Window window; /* PanoramiX window - may not exist */
+ int screen;
+ int State; /* PanroamiXOff, PanoramiXOn */
+ int width; /* width of this screen */
+ int height; /* height of this screen */
+ int ScreenCount; /* real physical number of screens */
+ XID eventMask; /* selected events for this client */
+} XPanoramiXInfo;
+
+extern XPanoramiXInfo *XPanoramiXAllocInfo (
+ void
+);
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d718d4..3efc111 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,8 @@
-AM_CFLAGS = $(XINERAMA_CFLAGS) $(MALLOC_ZERO_CFLAGS)
+AM_CFLAGS = -I$(top_srcdir)/include \
+ -I$(top_srcdir)/include/X11 \
+ -I$(top_srcdir)/include/X11/extensions \
+ $(XINERAMA_CFLAGS) \
+ $(MALLOC_ZERO_CFLAGS)
lib_LTLIBRARIES = libXinerama.la
libXinerama_la_SOURCES = \
@@ -8,6 +12,10 @@ libXinerama_la_LIBADD = $(XINERAMA_LIBS)
libXinerama_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+libXineramaincludedir = $(includedir)/X11/extensions
+libXineramainclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xinerama.h \
+ $(top_srcdir)/include/X11/extensions/panoramiXext.h
+
if LINT
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS)
commit c5ac895a7dabe5a46e33e733771f20cc08e72d95
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:43:19 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
diff --git a/man/Xinerama.man b/man/Xinerama.man
index bec9f80..74bc53d 100644
--- a/man/Xinerama.man
+++ b/man/Xinerama.man
@@ -41,11 +41,11 @@ Xinerama \- API for Xinerama extension to X11 Protocol
.nf
.sp
Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP,
- int *\fIevent_basep\fP, int *\fIerror_basep\fP\^);
+ int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^);
.sp
Status XineramaQueryVersion \^(\^Display *\fIdpy\fP,
- int *\fImajor_versionp\fP,
- int *\fIminor_versionp\fP\^);
+ int *\fImajor_version_return\fP,
+ int *\fIminor_version_return\fP\^);
.sp
Bool XineramaIsActive \^(\^Display *\fIdpy\fP\^);
.sp
@@ -55,13 +55,13 @@ XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP,
.SH ARGUMENTS
.IP \fIdisplay\fP 1i
Specifies the connection to the X server.
-.IP \fIevent_basep\fP 1i
+.IP \fIevent_base_return\fP 1i
Specifies the return location for the assigned base event code
-.IP \fIerror_basep\fP 1i
+.IP \fIerror_base_return\fP 1i
Specifies the return location for the assigned base error code
-.IP \fImajor_versionp\fP 1i
+.IP \fImajor_version_return\fP 1i
Returns the major version supported by the server
-.IP \fIminor_versionp\fP 1i
+.IP \fIminor_version_return\fP 1i
Returns the minor version supported by the server
.IP \fInumber\fP 1i
Returns the number of entries in the returned XineramaScreenInfo array.
@@ -78,18 +78,18 @@ into a single logical X screen.
.LP
The XineramaQueryExtension function queries the Xserver to determine the
availability of the Xinerama Extension. If the extension is available, the
-return value is True, and event_base and error_base are set to the base event
-number and base error number for the extension, respectively. Otherwise, the
-return value is False, and the values of event_base and error_base are
-undefined.
+return value is True, and event_base_return and error_base_return are set to
+the base event number and base error number for the extension, respectively.
+Otherwise, the return value is False, and the values of event_base_return and
+error_base_return are undefined.
.sp
.SS \fBXineramaQueryVersion()\fR
.LP
The XineramaQueryVersion function returns the version of the Xinerama extension
-implemented by the Xserver. The version is returned in major_versionp and
-minor_versionp. The major version will be incremented for protocol
+implemented by the Xserver. The version is returned in major_version_return
+and minor_version_return. The major version will be incremented for protocol
incompatible changes, and the minor version will be incremented for small,
upwardly compatible changes.
.LP
diff --git a/src/Xinerama.c b/src/Xinerama.c
index eff7633..e58ede8 100644
--- a/src/Xinerama.c
+++ b/src/Xinerama.c
@@ -78,15 +78,15 @@ static XEXT_GENERATE_CLOSE_DISPLAY (close_display, panoramiX_ext_info)
Bool XPanoramiXQueryExtension (
Display *dpy,
- int *event_basep,
- int *error_basep
+ int *event_base_return,
+ int *error_base_return
)
{
XExtDisplayInfo *info = find_display (dpy);
if (XextHasExtension(info)) {
- *event_basep = info->codes->first_event;
- *error_basep = info->codes->first_error;
+ *event_base_return = info->codes->first_event;
+ *error_base_return = info->codes->first_error;
return True;
} else {
return False;
@@ -96,8 +96,8 @@ Bool XPanoramiXQueryExtension (
Status XPanoramiXQueryVersion(
Display *dpy,
- int *major_versionp,
- int *minor_versionp
+ int *major_version_return,
+ int *minor_version_return
)
{
XExtDisplayInfo *info = find_display (dpy);
@@ -117,8 +117,8 @@ Status XPanoramiXQueryVersion(
SyncHandle ();
return 0;
}
- *major_versionp = rep.majorVersion;
- *minor_versionp = rep.minorVersion;
+ *major_version_return = rep.majorVersion;
+ *minor_version_return = rep.minorVersion;
UnlockDisplay (dpy);
SyncHandle ();
return 1;
@@ -228,11 +228,11 @@ Status XPanoramiXGetScreenSize (
Bool XineramaQueryExtension (
Display *dpy,
- int *event_base,
- int *error_base
+ int *event_base_return,
+ int *error_base_return
)
{
- return XPanoramiXQueryExtension(dpy, event_base, error_base);
+ return XPanoramiXQueryExtension(dpy, event_base_return, error_base_return);
}
Status XineramaQueryVersion(
Reply to: