diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | include/X11/extensions/Xinerama.h | 6 | ||||
| -rw-r--r-- | include/X11/extensions/panoramiXext.h | 4 | ||||
| -rw-r--r-- | man/Xinerama.man | 24 | ||||
| -rw-r--r-- | src/Xinerama.c | 6 |
6 files changed, 24 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 037ef62..d744d0f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ -# +# # Copyright 2005 Red Hat, Inc. -# +# # 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 @@ -10,7 +10,7 @@ # specific, written prior permission. Red Hat makes no # representations about the suitability of this software for any purpose. It # is provided "as is" without express or implied warranty. -# +# # RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, # INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO # EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR diff --git a/configure.ac b/configure.ac index 04dfc9d..8727719 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1]) # Allow checking code with lint, sparse, etc. XORG_WITH_LINT LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}" - + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile diff --git a/include/X11/extensions/Xinerama.h b/include/X11/extensions/Xinerama.h index 666f52a..8c0f829 100644 --- a/include/X11/extensions/Xinerama.h +++ b/include/X11/extensions/Xinerama.h @@ -54,15 +54,15 @@ Status XineramaQueryVersion( 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 * +XineramaScreenInfo * XineramaQueryScreens( Display *dpy, int *number diff --git a/include/X11/extensions/panoramiXext.h b/include/X11/extensions/panoramiXext.h index 6b18d6d..8312a17 100644 --- a/include/X11/extensions/panoramiXext.h +++ b/include/X11/extensions/panoramiXext.h @@ -22,7 +22,7 @@ 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 */ @@ -41,7 +41,7 @@ typedef struct { int height; /* height of this screen */ int ScreenCount; /* real physical number of screens */ XID eventMask; /* selected events for this client */ -} XPanoramiXInfo; +} XPanoramiXInfo; _XFUNCPROTOBEGIN diff --git a/man/Xinerama.man b/man/Xinerama.man index 13abe06..3774131 100644 --- a/man/Xinerama.man +++ b/man/Xinerama.man @@ -25,14 +25,14 @@ .ns .TP \\$1 .. -.TH XINERAMA __libmansuffix__ __vendorversion__ +.TH XINERAMA __libmansuffix__ __vendorversion__ .SH NAME Xinerama \- API for Xinerama extension to X11 Protocol .SH SYNOPSIS \&#include <X11/extensions/Xinerama.h> -.nf +.nf .sp -Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP, +Bool XineramaQueryExtension \^(\^Display *\fIdpy\fP, int *\fIevent_base_return\fP, int *\fIerror_base_return\fP\^); .sp Status XineramaQueryVersion \^(\^Display *\fIdpy\fP, @@ -41,7 +41,7 @@ Status XineramaQueryVersion \^(\^Display *\fIdpy\fP, .sp Bool XineramaIsActive \^(\^Display *\fIdpy\fP\^); .sp -XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP, +XineramaScreenInfo * XineramaQueryScreens \^(\^Display *\fIdpy\fP, int *\fInumber\fP\^); .fi .SH ARGUMENTS @@ -59,7 +59,7 @@ Returns the minor version supported by the server Returns the number of entries in the returned XineramaScreenInfo array. .SH DESCRIPTION .B Xinerama -is a simple library designed to interface the Xinerama Extension for +is a simple library designed to interface the Xinerama Extension for retrieving information about physical output devices which may be combined into a single logical X screen. @@ -68,8 +68,8 @@ into a single logical X screen. .SS \fBXineramaQueryExtension()\fR .LP -The XineramaQueryExtension function queries the Xserver to determine the -availability of the Xinerama Extension. If the extension is available, the +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_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 @@ -82,7 +82,7 @@ error_base_return are undefined. The XineramaQueryVersion function returns the version of the Xinerama extension 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, +incompatible changes, and the minor version will be incremented for small, upwardly compatible changes. .LP If the Xinerama library is compatible with the version returned by the @@ -95,8 +95,8 @@ incompatible, it returns zero. .SS \fBXineramaIsActive()\fR .LP -The XineramaIsActive function returns a Boolean operator used to determine if -Xinerama is activated on the screen. Returns True for active and False for +The XineramaIsActive function returns a Boolean operator used to determine if +Xinerama is activated on the screen. Returns True for active and False for not active. .sp @@ -107,10 +107,10 @@ The \fBXineramaQueryScreens()\fR function returns info about each individual output device within the Xinerama Screen. The integer pointed to by the \fInumber\fR argument is updated to the number of output devices listed in the returned array of \fIXineramaScreenInfo\fR -structures. \fBXineramaQueryScreens()\fR returns NULL and sets \fInumber\fR +structures. \fBXineramaQueryScreens()\fR returns NULL and sets \fInumber\fR to 0 if Xinerama is not active. -The pointer returned should be released with XFree(__libmansuffix__) +The pointer returned should be released with XFree(__libmansuffix__) when no longer needed. .sp diff --git a/src/Xinerama.c b/src/Xinerama.c index 9dbff36..93b1a9f 100644 --- a/src/Xinerama.c +++ b/src/Xinerama.c @@ -58,7 +58,7 @@ static /* const */ XExtensionHooks panoramiX_extension_hooks = { }; static XEXT_GENERATE_FIND_DISPLAY (find_display, panoramiX_ext_info, - panoramiX_extension_name, + panoramiX_extension_name, &panoramiX_extension_hooks, 0, NULL) @@ -201,7 +201,7 @@ Status XPanoramiXGetScreenSize ( req->reqType = info->codes->major_opcode; req->panoramiXReqType = X_PanoramiXGetScreenSize; req->window = drawable; - req->screen = screen_num; /* need to define */ + req->screen = screen_num; /* need to define */ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue)) { UnlockDisplay (dpy); SyncHandle (); @@ -263,7 +263,7 @@ Bool XineramaIsActive(Display *dpy) return rep.state; } -XineramaScreenInfo * +XineramaScreenInfo * XineramaQueryScreens( Display *dpy, int *number |