xwininfo fontconfig libX11 libXau libXext libxcb mesa pixman

xkeyboard-config git update 27 Aug 2012

254 files changed, 38220 insertions, 49973 deletions

diff --git a/apps/xwininfo/xwininfo.c b/apps/xwininfo/xwininfo.c
index f1126e6c0..70947eef3 100644
--- a/apps/xwininfo/xwininfo.c
+++ b/apps/xwininfo/xwininfo.c
@@ -251,7 +251,7 @@ static Bool window_id_format_dec = False;
 static iconv_t iconv_from_utf8;
 #endif
 static const char *user_encoding;
-static void print_utf8 (const char *, char *, size_t, const char *);
+static void print_utf8 (const char *, const char *, size_t, const char *);
 static char *get_friendly_name (const char *, const char *);
 
 static xcb_connection_t *dpy;
@@ -278,6 +278,7 @@ static size_t strlcat (char *dst, const char *src, size_t dstsize)
 /*
  * Report the syntax for calling xwininfo:
  */
+_X_NORETURN
 static void
 usage (void)
 {
@@ -324,12 +325,12 @@ static int bp = 0, bmm = 0;
 static int english = 0, metric = 0;
 
 static void
-scale_init (xcb_screen_t *screen)
+scale_init (xcb_screen_t *scale_screen)
 {
-    xp = screen->width_in_pixels;
-    yp = screen->height_in_pixels;
-    xmm = screen->width_in_millimeters;
-    ymm = screen->height_in_millimeters;
+    xp = scale_screen->width_in_pixels;
+    yp = scale_screen->height_in_pixels;
+    xmm = scale_screen->width_in_millimeters;
+    ymm = scale_screen->height_in_millimeters;
     bp  = xp  + yp;
     bmm = xmm + ymm;
 }
@@ -704,10 +705,10 @@ fetch_win_attributes (struct wininfo *w)
 
 #ifndef USE_XCB_ICCCM
 static Bool
-wm_size_hints_reply (xcb_connection_t *dpy, xcb_get_property_cookie_t cookie,
-		     wm_size_hints_t *hints_return, xcb_generic_error_t **err)
+wm_size_hints_reply (xcb_connection_t *wshr_dpy, xcb_get_property_cookie_t cookie,
+		     wm_size_hints_t *hints_return, xcb_generic_error_t **wshr_err)
 {
-    xcb_get_property_reply_t *prop = xcb_get_property_reply (dpy, cookie, err);
+    xcb_get_property_reply_t *prop = xcb_get_property_reply (wshr_dpy, cookie, wshr_err);
     int length;
 
     if (!prop || (prop->type != XCB_ATOM_WM_SIZE_HINTS) ||
@@ -842,7 +843,7 @@ Display_Window_Id (struct wininfo *w, Bool newline_wanted)
 	    if (wm_name_encoding == XCB_ATOM_STRING) {
 		printf (" \"%.*s\"", wm_name_len, wm_name);
 	    } else if (wm_name_encoding == atom_utf8_string) {
-		print_utf8 (" \"", (char *) wm_name, wm_name_len,  "\"");
+		print_utf8 (" \"", wm_name, wm_name_len,  "\"");
 	    } else {
 		/* Encodings we don't support, including COMPOUND_TEXT */
 		const char *enc_name = Get_Atom_Name (dpy, wm_name_encoding);
@@ -1608,10 +1609,10 @@ static const binding _state_hints[] = {
 
 #ifndef USE_XCB_ICCCM
 static Bool
-wm_hints_reply (xcb_connection_t *dpy, xcb_get_property_cookie_t cookie,
-		wm_hints_t *hints_return, xcb_generic_error_t **err)
+wm_hints_reply (xcb_connection_t *whr_dpy, xcb_get_property_cookie_t cookie,
+		wm_hints_t *hints_return, xcb_generic_error_t **whr_err)
 {
-    xcb_get_property_reply_t *prop = xcb_get_property_reply (dpy, cookie, err);
+    xcb_get_property_reply_t *prop = xcb_get_property_reply (whr_dpy, cookie, whr_err);
     int length;
 
     if (!prop || (prop->type != XCB_ATOM_WM_HINTS) || (prop->format != 32)) {
@@ -1778,16 +1779,16 @@ wininfo_wipe (struct wininfo *w)
 
 /* Gets UTF-8 encoded EMWH property _NET_WM_NAME for a window */
 static xcb_get_property_cookie_t
-get_net_wm_name (xcb_connection_t *dpy, xcb_window_t win)
+get_net_wm_name (xcb_connection_t *gnwn_dpy, xcb_window_t win)
 {
     if (!atom_net_wm_name)
-	atom_net_wm_name = Get_Atom (dpy, "_NET_WM_NAME");
+	atom_net_wm_name = Get_Atom (gnwn_dpy, "_NET_WM_NAME");
 
     if (!atom_utf8_string)
-	atom_utf8_string = Get_Atom (dpy, "UTF8_STRING");
+	atom_utf8_string = Get_Atom (gnwn_dpy, "UTF8_STRING");
 
     if (atom_net_wm_name && atom_utf8_string)
-	return xcb_get_property (dpy, False, win, atom_net_wm_name,
+	return xcb_get_property (gnwn_dpy, False, win, atom_net_wm_name,
 				 atom_utf8_string, 0, BUFSIZ);
     else {
 	xcb_get_property_cookie_t dummy = { 0 };
@@ -1878,14 +1879,10 @@ is_valid_utf8 (const char *string, int len)
  * Length of the string is specified in bytes, or -1 for going until '\0'
  */
 static void
-print_utf8 (const char *prefix, char *u8str, size_t length, const char *suffix)
+print_utf8 (const char *prefix, const char *u8str, size_t length, const char *suffix)
 {
     size_t inlen = length;
 
-    if (inlen < 0) {
-	inlen = strlen (u8str);
-    }
-
     if (is_valid_utf8 (u8str, inlen) != UTF8_VALID) {
 	printf (" (invalid UTF8_STRING)");
 	return;
@@ -1967,7 +1964,7 @@ get_friendly_name (const char *string, const char *prefix)
 	} else if (first) {
 	    first = False;
 	} else {
-	    *n = tolower(*n);
+	    *n = tolower((unsigned char)*n);
 	}
     }
 
diff --git a/fontconfig/fc-lang/nqo.orth b/fontconfig/fc-lang/nqo.orth
index 285e1d79c..544fbf640 100644
--- a/fontconfig/fc-lang/nqo.orth
+++ b/fontconfig/fc-lang/nqo.orth
@@ -27,5 +27,4 @@
 #  http://www.unicode.org/charts/PDF/U07C0.pdf
 #  http://en.wikipedia.org/wiki/N'Ko_alphabet
 #
-07c0-07ff
-
+07c0-07fa
diff --git a/libX11/man/AllPlanes.man b/libX11/man/AllPlanes.man
index 55ab17925..8766645f4 100644
--- a/libX11/man/AllPlanes.man
+++ b/libX11/man/AllPlanes.man
@@ -1,379 +1,318 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH AllPlanes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-AllPlanes, BlackPixel, WhitePixel, ConnectionNumber, DefaultColormap, DefaultDepth, XListDepths, DefaultGC, DefaultRootWindow, DefaultScreenOfDisplay, DefaultScreen, DefaultVisual, DisplayCells, DisplayPlanes, DisplayString, XMaxRequestSize, XExtendedMaxRequestSize, LastKnownRequestProcessed, NextRequest, ProtocolVersion, ProtocolRevision, QLength, RootWindow, ScreenCount, ScreenOfDisplay, ServerVendor, VendorRelease \- Display macros and functions

-.SH SYNTAX

-unsigned long AllPlanes; 

-.HP

-unsigned long BlackPixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^);

-.HP

-unsigned long WhitePixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^); 

-.HP

-int ConnectionNumber\^(\^Display *\fIdisplay\fP\^); 

-.HP

-Colormap DefaultColormap\^(\^Display *\fIdisplay\fP\^,

-\^int \fIscreen_number\fP\^); 

-.HP

-int DefaultDepth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 

-.HP

-int *XListDepths\^(\^Display *\fIdisplay\fP, int \fIscreen_number\fP, int

-\fIcount_return\fP\^); 

-.HP

-GC DefaultGC\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 

-.HP

-Window DefaultRootWindow\^(\^Display *\fIdisplay\fP\^); 

-.HP

-Screen *DefaultScreenOfDisplay\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int DefaultScreen\^(\^Display *\fIdisplay\fP\^); 

-.HP

-Visual *DefaultVisual\^(\^Display *\fIdisplay\fP\^, \^int

-\fIscreen_number\fP\^); 

-.HP

-int DisplayCells\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 

-.HP

-int DisplayPlanes\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);

-.HP

-char *DisplayString\^(\^Display *\fIdisplay\fP\^);

-.HP

-long XMaxRequestSize(\^Display *\fIdisplay\fP\^)

-.HP

-long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^)

-.HP

-unsigned long LastKnownRequestProcessed\^(\^Display *\fIdisplay\fP\^); 

-.HP

-unsigned long NextRequest\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int ProtocolVersion\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int ProtocolRevision\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int QLength\^(\^Display *\fIdisplay\fP\^); 

-.HP

-Window RootWindow\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 

-.HP

-int ScreenCount\^(\^Display *\fIdisplay\fP\^); 

-.HP

-Screen *ScreenOfDisplay\^(\^Display *\fIdisplay\fP, int

-\fIscreen_number\fP\^); 

-.HP

-char *ServerVendor\^(\^Display *\fIdisplay\fP\^)

-.HP

-int VendorRelease\^(\^Display *\fIdisplay\fP\^)

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIscreen_number\fP 1i

-Specifies the appropriate screen number on the host server.

-.ds Cn depths

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.SH DESCRIPTION

-The

-.ZN AllPlanes

-macro returns a value with all bits set to 1 suitable for use in a plane 

-argument to a procedure.

-.LP

-The

-.ZN BlackPixel

-macro returns the black pixel value for the specified screen.

-.LP

-The

-.ZN WhitePixel

-macro returns the white pixel value for the specified screen.

-.LP

-The

-.ZN ConnectionNumber

-macro returns a connection number for the specified display.

-.LP

-The

-.ZN DefaultColormap

-macro returns the default colormap ID for allocation on the specified screen.

-.LP

-The

-.ZN DefaultDepth

-macro returns the depth (number of planes) of the default root window for the

-specified screen.

-.LP

-The

-.ZN XListDepths

-function returns the array of depths 

-that are available on the specified screen.

-If the specified screen_number is valid and sufficient memory for the array

-can be allocated,

-.ZN XListDepths

-sets count_return to the number of available depths.

-Otherwise, it does not set count_return and returns NULL.

-To release the memory allocated for the array of depths, use

-.ZN XFree .

-.LP

-The

-.ZN DefaultGC

-macro returns the default GC for the root window of the

-specified screen.

-.LP

-The

-.ZN DefaultRootWindow

-macro returns the root window for the default screen.

-.LP

-The

-.ZN DefaultScreenOfDisplay

-macro returns the default screen of the specified display.

-.LP

-The

-.ZN DefaultScreen

-macro returns the default screen number referenced in the

-.ZN XOpenDisplay

-routine.

-.LP

-The

-.ZN DefaultVisual

-macro returns the default visual type for the specified screen.

-.LP

-The

-.ZN DisplayCells

-macro returns the number of entries in the default colormap.

-.LP

-The

-.ZN DisplayPlanes

-macro returns the depth of the root window of the specified screen.

-.LP

-The

-.ZN DisplayString

-macro returns the string that was passed to

-.ZN XOpenDisplay

-when the current display was opened.

-.LP

-The

-.ZN XMaxRequestSize

-function returns the maximum request size (in 4-byte units) supported

-by the server without using an extended-length protocol encoding.

-Single protocol requests to the server can be no larger than this size

-unless an extended-length protocol encoding is supported by the server.

-The protocol guarantees the size to be no smaller than 4096 units

-(16384 bytes).

-Xlib automatically breaks data up into multiple protocol requests

-as necessary for the following functions:

-.ZN XDrawPoints ,

-.ZN XDrawRectangles ,

-.ZN XDrawSegments ,

-.ZN XFillArcs ,

-.ZN XFillRectangles ,

-and 

-.ZN XPutImage .

-.LP

-The

-.ZN XExtendedMaxRequestSize

-function returns zero if the specified display does not support an

-extended-length protocol encoding; otherwise,

-it returns the maximum request size (in 4-byte units) supported

-by the server using the extended-length encoding.

-The Xlib functions

-.ZN XDrawLines ,

-.ZN XDrawArcs ,

-.ZN XFillPolygon ,

-.ZN XChangeProperty ,

-.ZN XSetClipRectangles ,

-and

-.ZN XSetRegion

-will use the extended-length encoding as necessary, if supported

-by the server.  Use of the extended-length encoding in other Xlib

-functions (for example,

-.ZN XDrawPoints ,

-.ZN XDrawRectangles ,

-.ZN XDrawSegments ,

-.ZN XFillArcs ,

-.ZN XFillRectangles ,

-.ZN XPutImage )

-is permitted but not required; an Xlib implementation may choose to

-split the data across multiple smaller requests instead.

-.LP

-The

-.ZN LastKnownRequestProcessed

-macro extracts the full serial number of the last request known by Xlib

-to have been processed by the X server.

-.LP

-The

-.ZN NextRequest

-macro extracts the full serial number that is to be used for the next request.

-.LP

-The

-.ZN ProtocolVersion

-macro returns the major version number (11) of the X protocol associated with

-the connected display.

-.LP

-The

-.ZN ProtocolRevision

-macro returns the minor protocol revision number of the X server.

-.LP

-The

-.ZN QLength

-macro returns the length of the event queue for the connected display.

-.LP

-The

-.ZN RootWindow

-macro returns the root window.

-.LP

-The

-.ZN ScreenCount

-macro returns the number of available screens.

-.LP

-The

-.ZN ScreenOfDisplay

-macro returns a pointer to the screen of the specified display.

-.LP

-The

-.ZN ServerVendor

-macro returns a pointer to a null-terminated string that provides

-some identification of the owner of the X server implementation.

-.LP

-The

-.ZN VendorRelease

-macro returns a number related to a vendor's release of the X server.

-.SH "SEE ALSO"

-BlackPixelOfScreen(__libmansuffix__),

-ImageByteOrder(__libmansuffix__),

-IsCursorKey(__libmansuffix__),

-XOpenDisplay(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH AllPlanes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+AllPlanes, BlackPixel, WhitePixel, ConnectionNumber, DefaultColormap, DefaultDepth, XListDepths, DefaultGC, DefaultRootWindow, DefaultScreenOfDisplay, DefaultScreen, DefaultVisual, DisplayCells, DisplayPlanes, DisplayString, XMaxRequestSize, XExtendedMaxRequestSize, LastKnownRequestProcessed, NextRequest, ProtocolVersion, ProtocolRevision, QLength, RootWindow, ScreenCount, ScreenOfDisplay, ServerVendor, VendorRelease \- Display macros and functions
+.SH SYNTAX
+unsigned long AllPlanes; 
+.HP
+unsigned long BlackPixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^);
+.HP
+unsigned long WhitePixel\^(\^Display *\fIdisplay\fP\^, int \^\fIscreen_number\fP\^); 
+.HP
+int ConnectionNumber\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Colormap DefaultColormap\^(\^Display *\fIdisplay\fP\^,
+\^int \fIscreen_number\fP\^); 
+.HP
+int DefaultDepth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int *XListDepths\^(\^Display *\fIdisplay\fP, int \fIscreen_number\fP, int
+\fIcount_return\fP\^); 
+.HP
+GC DefaultGC\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+Window DefaultRootWindow\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Screen *DefaultScreenOfDisplay\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int DefaultScreen\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Visual *DefaultVisual\^(\^Display *\fIdisplay\fP\^, \^int
+\fIscreen_number\fP\^); 
+.HP
+int DisplayCells\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int DisplayPlanes\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+char *DisplayString\^(\^Display *\fIdisplay\fP\^);
+.HP
+long XMaxRequestSize(\^Display *\fIdisplay\fP\^)
+.HP
+long XExtendedMaxRequestSize(\^Display *\fIdisplay\fP\^)
+.HP
+unsigned long LastKnownRequestProcessed\^(\^Display *\fIdisplay\fP\^); 
+.HP
+unsigned long NextRequest\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int ProtocolVersion\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int ProtocolRevision\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int QLength\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Window RootWindow\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^); 
+.HP
+int ScreenCount\^(\^Display *\fIdisplay\fP\^); 
+.HP
+Screen *ScreenOfDisplay\^(\^Display *\fIdisplay\fP, int
+\fIscreen_number\fP\^); 
+.HP
+char *ServerVendor\^(\^Display *\fIdisplay\fP\^)
+.HP
+int VendorRelease\^(\^Display *\fIdisplay\fP\^)
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIscreen_number\fP 1i
+Specifies the appropriate screen number on the host server.
+.ds Cn depths
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.SH DESCRIPTION
+The
+.ZN AllPlanes
+macro returns a value with all bits set to 1 suitable for use in a plane 
+argument to a procedure.
+.LP
+The
+.ZN BlackPixel
+macro returns the black pixel value for the specified screen.
+.LP
+The
+.ZN WhitePixel
+macro returns the white pixel value for the specified screen.
+.LP
+The
+.ZN ConnectionNumber
+macro returns a connection number for the specified display.
+.LP
+The
+.ZN DefaultColormap
+macro returns the default colormap ID for allocation on the specified screen.
+.LP
+The
+.ZN DefaultDepth
+macro returns the depth (number of planes) of the default root window for the
+specified screen.
+.LP
+The
+.ZN XListDepths
+function returns the array of depths 
+that are available on the specified screen.
+If the specified screen_number is valid and sufficient memory for the array
+can be allocated,
+.ZN XListDepths
+sets count_return to the number of available depths.
+Otherwise, it does not set count_return and returns NULL.
+To release the memory allocated for the array of depths, use
+.ZN XFree .
+.LP
+The
+.ZN DefaultGC
+macro returns the default GC for the root window of the
+specified screen.
+.LP
+The
+.ZN DefaultRootWindow
+macro returns the root window for the default screen.
+.LP
+The
+.ZN DefaultScreenOfDisplay
+macro returns the default screen of the specified display.
+.LP
+The
+.ZN DefaultScreen
+macro returns the default screen number referenced in the
+.ZN XOpenDisplay
+routine.
+.LP
+The
+.ZN DefaultVisual
+macro returns the default visual type for the specified screen.
+.LP
+The
+.ZN DisplayCells
+macro returns the number of entries in the default colormap.
+.LP
+The
+.ZN DisplayPlanes
+macro returns the depth of the root window of the specified screen.
+.LP
+The
+.ZN DisplayString
+macro returns the string that was passed to
+.ZN XOpenDisplay
+when the current display was opened.
+.LP
+The
+.ZN XMaxRequestSize
+function returns the maximum request size (in 4-byte units) supported
+by the server without using an extended-length protocol encoding.
+Single protocol requests to the server can be no larger than this size
+unless an extended-length protocol encoding is supported by the server.
+The protocol guarantees the size to be no smaller than 4096 units
+(16384 bytes).
+Xlib automatically breaks data up into multiple protocol requests
+as necessary for the following functions:
+.ZN XDrawPoints ,
+.ZN XDrawRectangles ,
+.ZN XDrawSegments ,
+.ZN XFillArcs ,
+.ZN XFillRectangles ,
+and 
+.ZN XPutImage .
+.LP
+The
+.ZN XExtendedMaxRequestSize
+function returns zero if the specified display does not support an
+extended-length protocol encoding; otherwise,
+it returns the maximum request size (in 4-byte units) supported
+by the server using the extended-length encoding.
+The Xlib functions
+.ZN XDrawLines ,
+.ZN XDrawArcs ,
+.ZN XFillPolygon ,
+.ZN XChangeProperty ,
+.ZN XSetClipRectangles ,
+and
+.ZN XSetRegion
+will use the extended-length encoding as necessary, if supported
+by the server.  Use of the extended-length encoding in other Xlib
+functions (for example,
+.ZN XDrawPoints ,
+.ZN XDrawRectangles ,
+.ZN XDrawSegments ,
+.ZN XFillArcs ,
+.ZN XFillRectangles ,
+.ZN XPutImage )
+is permitted but not required; an Xlib implementation may choose to
+split the data across multiple smaller requests instead.
+.LP
+The
+.ZN LastKnownRequestProcessed
+macro extracts the full serial number of the last request known by Xlib
+to have been processed by the X server.
+.LP
+The
+.ZN NextRequest
+macro extracts the full serial number that is to be used for the next request.
+.LP
+The
+.ZN ProtocolVersion
+macro returns the major version number (11) of the X protocol associated with
+the connected display.
+.LP
+The
+.ZN ProtocolRevision
+macro returns the minor protocol revision number of the X server.
+.LP
+The
+.ZN QLength
+macro returns the length of the event queue for the connected display.
+.LP
+The
+.ZN RootWindow
+macro returns the root window.
+.LP
+The
+.ZN ScreenCount
+macro returns the number of available screens.
+.LP
+The
+.ZN ScreenOfDisplay
+macro returns a pointer to the screen of the specified display.
+.LP
+The
+.ZN ServerVendor
+macro returns a pointer to a null-terminated string that provides
+some identification of the owner of the X server implementation.
+.LP
+The
+.ZN VendorRelease
+macro returns a number related to a vendor's release of the X server.
+.SH "SEE ALSO"
+BlackPixelOfScreen(__libmansuffix__),
+ImageByteOrder(__libmansuffix__),
+IsCursorKey(__libmansuffix__),
+XOpenDisplay(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/BlackPixelOfScreen.man b/libX11/man/BlackPixelOfScreen.man
index b513cc38c..535b4ad44 100644
--- a/libX11/man/BlackPixelOfScreen.man
+++ b/libX11/man/BlackPixelOfScreen.man
@@ -1,287 +1,252 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH BlackPixelOfScreen __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-BlackPixelOfScreen, WhitePixelOfScreen, CellsOfScreen, DefaultColormapOfScreen, DefaultDepthOfScreen, DefaultGCOfScreen, DefaultVisualOfScreen, DoesBackingStore, DoesSaveUnders, DisplayOfScreen, XScreenNumberOfScreen, EventMaskOfScreen, HeightOfScreen, HeightMMOfScreen, MaxCmapsOfScreen, MinCmapsOfScreen, PlanesOfScreen, RootWindowOfScreen, WidthOfScreen, WidthMMOfScreen \- screen information functions and macros

-.SH SYNTAX

-.HP

-unsigned long BlackPixelOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-unsigned long WhitePixelOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int CellsOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-Colormap DefaultColormapOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int DefaultDepthOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-GC DefaultGCOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-Visual *DefaultVisualOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int DoesBackingStore\^(\^Screen *\fIscreen\fP\^);

-.HP

-Bool DoesSaveUnders\^(\^Screen *\fIscreen\fP\^);

-.HP

-Display *DisplayOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int XScreenNumberOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-long EventMaskOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int HeightOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int HeightMMOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int MaxCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int MinCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int PlanesOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-Window RootWindowOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int WidthOfScreen\^(\^Screen *\fIscreen\fP\^);

-.HP

-int WidthMMOfScreen\^(\^Screen *\fIscreen\fP\^);

-.SH ARGUMENTS

-.IP \fIscreen\fP 1i

-Specifies the appropriate 

-.ZN Screen

-structure.

-.SH DESCRIPTION

-The

-.ZN BlackPixelOfScreen

-macro returns the black pixel value of the specified screen.

-.LP

-The

-.ZN WhitePixelOfScreen

-macro returns the white pixel value of the specified screen.

-.LP

-The

-.ZN CellsOfScreen

-macro returns the number of colormap cells in the default colormap

-of the specified screen.

-.LP

-The

-.ZN DefaultColormapOfScreen

-macro returns the default colormap of the specified screen.

-.LP

-The

-.ZN DefaultDepthOfScreen

-macro returns the default depth of the root window of the specified screen.

-.LP

-The

-.ZN DefaultGCOfScreen

-macro returns the default GC of the specified screen,

-which has the same depth as the root window of the screen.

-.LP

-The

-.ZN DefaultVisualOfScreen

-macro returns the default visual of the specified screen.

-.LP

-The

-.ZN DoesBackingStore

-macro returns 

-.ZN WhenMapped ,

-.ZN NotUseful ,

-or

-.ZN Always ,

-which indicate whether the screen supports backing stores.

-.LP

-The

-.ZN DoesSaveUnders

-macro returns a Boolean value indicating whether the

-screen supports save unders.

-.LP

-The

-.ZN DisplayOfScreen

-macro returns the display of the specified screen.

-.LP

-The

-.ZN XScreenNumberOfScreen

-function returns the screen index number of the specified screen.

-.LP

-The

-.ZN EventMaskOfScreen

-macro returns the root event mask of the root window for the specified screen

-at connection setup.

-.LP

-The

-.ZN HeightOfScreen

-macro returns the height of the specified screen.

-.LP

-The

-.ZN HeightMMOfScreen

-macro returns the height of the specified screen in millimeters.

-.LP

-The

-.ZN MaxCmapsOfScreen

-macro returns the maximum number of installed colormaps supported 

-by the specified screen.

-.LP

-The

-.ZN MinCmapsOfScreen

-macro returns the minimum number of installed colormaps supported 

-by the specified screen.

-.LP

-The

-.ZN PlanesOfScreen

-macro returns the number of planes in the root window of the specified screen.

-.LP

-The

-.ZN RootWindowOfScreen

-macro returns the root window of the specified screen.

-.LP

-The

-.ZN WidthOfScreen

-macro returns the width of the specified screen.

-.LP

-The

-.ZN WidthMMOfScreen

-macro returns the width of the specified screen in millimeters.

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-ImageByteOrder(__libmansuffix__),

-IsCursorKey(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.de NT
+.ne 7
+.ds NO Note
+.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
+.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
+.ie n .sp
+.el .sp 10p
+.TB
+.ce
+\\*(NO
+.ie n .sp
+.el .sp 5p
+.if '\\$1'C' .ce 99
+.if '\\$2'C' .ce 99
+.in +5n
+.ll -5n
+.R
+..
+.		\" Note End -- doug kraft 3/85
+.de NE
+.ce 0
+.in -5n
+.ll +5n
+.ie n .sp
+.el .sp 10p
+..
+.ny0
+.TH BlackPixelOfScreen __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+BlackPixelOfScreen, WhitePixelOfScreen, CellsOfScreen, DefaultColormapOfScreen, DefaultDepthOfScreen, DefaultGCOfScreen, DefaultVisualOfScreen, DoesBackingStore, DoesSaveUnders, DisplayOfScreen, XScreenNumberOfScreen, EventMaskOfScreen, HeightOfScreen, HeightMMOfScreen, MaxCmapsOfScreen, MinCmapsOfScreen, PlanesOfScreen, RootWindowOfScreen, WidthOfScreen, WidthMMOfScreen \- screen information functions and macros
+.SH SYNTAX
+.HP
+unsigned long BlackPixelOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+unsigned long WhitePixelOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int CellsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Colormap DefaultColormapOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int DefaultDepthOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+GC DefaultGCOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Visual *DefaultVisualOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int DoesBackingStore\^(\^Screen *\fIscreen\fP\^);
+.HP
+Bool DoesSaveUnders\^(\^Screen *\fIscreen\fP\^);
+.HP
+Display *DisplayOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int XScreenNumberOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+long EventMaskOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int HeightOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int HeightMMOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int MaxCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int MinCmapsOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int PlanesOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+Window RootWindowOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int WidthOfScreen\^(\^Screen *\fIscreen\fP\^);
+.HP
+int WidthMMOfScreen\^(\^Screen *\fIscreen\fP\^);
+.SH ARGUMENTS
+.IP \fIscreen\fP 1i
+Specifies the appropriate 
+.ZN Screen
+structure.
+.SH DESCRIPTION
+The
+.ZN BlackPixelOfScreen
+macro returns the black pixel value of the specified screen.
+.LP
+The
+.ZN WhitePixelOfScreen
+macro returns the white pixel value of the specified screen.
+.LP
+The
+.ZN CellsOfScreen
+macro returns the number of colormap cells in the default colormap
+of the specified screen.
+.LP
+The
+.ZN DefaultColormapOfScreen
+macro returns the default colormap of the specified screen.
+.LP
+The
+.ZN DefaultDepthOfScreen
+macro returns the default depth of the root window of the specified screen.
+.LP
+The
+.ZN DefaultGCOfScreen
+macro returns the default GC of the specified screen,
+which has the same depth as the root window of the screen.
+.LP
+The
+.ZN DefaultVisualOfScreen
+macro returns the default visual of the specified screen.
+.LP
+The
+.ZN DoesBackingStore
+macro returns 
+.ZN WhenMapped ,
+.ZN NotUseful ,
+or
+.ZN Always ,
+which indicate whether the screen supports backing stores.
+.LP
+The
+.ZN DoesSaveUnders
+macro returns a Boolean value indicating whether the
+screen supports save unders.
+.LP
+The
+.ZN DisplayOfScreen
+macro returns the display of the specified screen.
+.LP
+The
+.ZN XScreenNumberOfScreen
+function returns the screen index number of the specified screen.
+.LP
+The
+.ZN EventMaskOfScreen
+macro returns the root event mask of the root window for the specified screen
+at connection setup.
+.LP
+The
+.ZN HeightOfScreen
+macro returns the height of the specified screen.
+.LP
+The
+.ZN HeightMMOfScreen
+macro returns the height of the specified screen in millimeters.
+.LP
+The
+.ZN MaxCmapsOfScreen
+macro returns the maximum number of installed colormaps supported 
+by the specified screen.
+.LP
+The
+.ZN MinCmapsOfScreen
+macro returns the minimum number of installed colormaps supported 
+by the specified screen.
+.LP
+The
+.ZN PlanesOfScreen
+macro returns the number of planes in the root window of the specified screen.
+.LP
+The
+.ZN RootWindowOfScreen
+macro returns the root window of the specified screen.
+.LP
+The
+.ZN WidthOfScreen
+macro returns the width of the specified screen.
+.LP
+The
+.ZN WidthMMOfScreen
+macro returns the width of the specified screen in millimeters.
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+ImageByteOrder(__libmansuffix__),
+IsCursorKey(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/DisplayOfCCC.man b/libX11/man/DisplayOfCCC.man
index 160eeb57f..85bd67203 100644
--- a/libX11/man/DisplayOfCCC.man
+++ b/libX11/man/DisplayOfCCC.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
diff --git a/libX11/man/ImageByteOrder.man b/libX11/man/ImageByteOrder.man
index 7a0912fd5..bfae68871 100644
--- a/libX11/man/ImageByteOrder.man
+++ b/libX11/man/ImageByteOrder.man
@@ -1,245 +1,182 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH ImageByteOrder __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-ImageByteOrder, BitmapBitOrder, BitmapPad, BitmapUnit, DisplayHeight, DisplayHeightMM, DisplayWidth, DisplayWidthMM, XListPixmapFormats, XPixmapFormatValues \- image format functions and macros

-.SH SYNTAX

-.HP

-XPixmapFormatValues *XListPixmapFormats\^(\^Display *\fIdisplay\fP, int *\fIcount_return\fP\^);

-.HP

-int ImageByteOrder\^(\^Display *\fIdisplay\fP\^);

-.HP

-int BitmapBitOrder\^(\^Display *\fIdisplay\fP\^);

-.HP

-int BitmapPad\^(\^Display *\fIdisplay\fP\^);

-.HP

-int BitmapUnit\^(\^Display *\fIdisplay\fP\^);

-.HP

-int DisplayHeight\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);

-.HP

-int DisplayHeightMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);

-.HP

-int DisplayWidth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);

-.HP

-int DisplayWidthMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Cn pixmap formats that are supported by the display

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIscreen_number\fP 1i

-Specifies the appropriate screen number on the host server.

-.SH DESCRIPTION

-The

-.ZN XListPixmapFormats

-function returns an array of

-.ZN XPixmapFormatValues

-structures that describe the types of Z format images supported

-by the specified display.

-If insufficient memory is available,

-.ZN XListPixmapFormats

-returns NULL.

-To free the allocated storage for the

-.ZN XPixmapFormatValues

-structures, use

-.ZN XFree .

-.LP

-The

-.ZN ImageByteOrder

-macro specifies the required byte order for images for each scanline unit in

-XY format (bitmap) or for each pixel value in Z format.

-.LP

-The

-.ZN BitmapBitOrder

-macro returns 

-.ZN LSBFirst

-or

-.ZN MSBFirst

-to indicate whether the leftmost bit in the bitmap as displayed

-on the screen is the least or most significant bit in the unit.

-.LP

-The

-.ZN BitmapPad

-macro returns the number of bits that each scanline must be padded.

-.LP

-The

-.ZN BitmapUnit

-macro returns the size of a bitmap's scanline unit in bits.

-.LP

-The

-.ZN DisplayHeight

-macro returns the height of the specified screen in pixels.

-.LP

-The

-.ZN DisplayHeightMM

-macro returns the height of the specified screen in millimeters.

-.LP

-The

-.ZN DisplayWidth

-macro returns the width of the screen in pixels.

-.LP

-The

-.ZN DisplayWidthMM

-macro returns the width of the specified screen in millimeters.

-.SH STRUCTURES

-The

-.ZN XPixmapFormatValues

-structure provides an interface to the pixmap format information

-that is returned at the time of a connection setup.

-It contains:

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int depth;

-	int bits_per_pixel;

-	int scanline_pad;

-} XPixmapFormatValues;

-.De

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-BlackPixelOfScreen(__libmansuffix__),

-IsCursorKey(__libmansuffix__),

-XFree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH ImageByteOrder __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+ImageByteOrder, BitmapBitOrder, BitmapPad, BitmapUnit, DisplayHeight, DisplayHeightMM, DisplayWidth, DisplayWidthMM, XListPixmapFormats, XPixmapFormatValues \- image format functions and macros
+.SH SYNTAX
+.HP
+XPixmapFormatValues *XListPixmapFormats\^(\^Display *\fIdisplay\fP, int *\fIcount_return\fP\^);
+.HP
+int ImageByteOrder\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapBitOrder\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapPad\^(\^Display *\fIdisplay\fP\^);
+.HP
+int BitmapUnit\^(\^Display *\fIdisplay\fP\^);
+.HP
+int DisplayHeight\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayHeightMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayWidth\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.HP
+int DisplayWidthMM\^(\^Display *\fIdisplay\fP\^, \^int \fIscreen_number\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Cn pixmap formats that are supported by the display
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIscreen_number\fP 1i
+Specifies the appropriate screen number on the host server.
+.SH DESCRIPTION
+The
+.ZN XListPixmapFormats
+function returns an array of
+.ZN XPixmapFormatValues
+structures that describe the types of Z format images supported
+by the specified display.
+If insufficient memory is available,
+.ZN XListPixmapFormats
+returns NULL.
+To free the allocated storage for the
+.ZN XPixmapFormatValues
+structures, use
+.ZN XFree .
+.LP
+The
+.ZN ImageByteOrder
+macro specifies the required byte order for images for each scanline unit in
+XY format (bitmap) or for each pixel value in Z format.
+.LP
+The
+.ZN BitmapBitOrder
+macro returns 
+.ZN LSBFirst
+or
+.ZN MSBFirst
+to indicate whether the leftmost bit in the bitmap as displayed
+on the screen is the least or most significant bit in the unit.
+.LP
+The
+.ZN BitmapPad
+macro returns the number of bits that each scanline must be padded.
+.LP
+The
+.ZN BitmapUnit
+macro returns the size of a bitmap's scanline unit in bits.
+.LP
+The
+.ZN DisplayHeight
+macro returns the height of the specified screen in pixels.
+.LP
+The
+.ZN DisplayHeightMM
+macro returns the height of the specified screen in millimeters.
+.LP
+The
+.ZN DisplayWidth
+macro returns the width of the screen in pixels.
+.LP
+The
+.ZN DisplayWidthMM
+macro returns the width of the specified screen in millimeters.
+.SH STRUCTURES
+The
+.ZN XPixmapFormatValues
+structure provides an interface to the pixmap format information
+that is returned at the time of a connection setup.
+It contains:
+.Ds 0
+typedef struct {
+        int depth;
+        int bits_per_pixel;
+        int scanline_pad;
+} XPixmapFormatValues;
+.De
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+BlackPixelOfScreen(__libmansuffix__),
+IsCursorKey(__libmansuffix__),
+XFree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/IsCursorKey.man b/libX11/man/IsCursorKey.man
index 0fa3dfb78..fdeb4168c 100644
--- a/libX11/man/IsCursorKey.man
+++ b/libX11/man/IsCursorKey.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH IsCursorKey __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
diff --git a/libX11/man/XAddConnectionWatch.man b/libX11/man/XAddConnectionWatch.man
index 5f561a182..e58afffc8 100644
--- a/libX11/man/XAddConnectionWatch.man
+++ b/libX11/man/XAddConnectionWatch.man
@@ -1,236 +1,175 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAddConnectionWatch __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAddConnectionWatch, XRemoveConnectionWatch, XProcessInternalConnection, XInternalConnectionNumbers \- handle Xlib internal connections

-.SH SYNTAX

-.HP

-typedef void (*XConnectionWatchProc)\^(\^Display *\fIdisplay\fP\^, XPointer

-\fIclient_data\fP\^, int \fIfd\fP\^, Bool \fIopening\fP\^, XPointer

-*\fIwatch_data\fP\^); 

-.HP

-Status XAddConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc

-\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 

-.HP

-Status XRemoveConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc

-\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 

-.HP

-void XProcessInternalConnection\^(\^Display *\fIdisplay\fP\^, int \fIfd\fP\^);

-.HP

-Status XInternalConnectionNumbers\^(\^Display *\fIdisplay\fP\^, int

-**\fIfd_return\fP\^, int *\fIcount_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIclient_data\fP 1i

-Specifies the additional client data.

-.ds Cn file descriptors

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfd\fP 1i

-Specifies the file descriptor.

-.IP \fIfd_return\fP 1i

-Returns the file descriptors.

-.IP \fIprocedure\fP 1i

-Specifies the procedure to be called.

-.SH DESCRIPTION

-The

-.ZN XAddConnectionWatch

-function registers a procedure to be called each time Xlib opens or closes an

-internal connection for the specified display.  The procedure is passed the

-display, the specified client_data, the file descriptor for the connection,

-a Boolean indicating whether the connection is being opened or closed, and a

-pointer to a location for private watch data.  If opening is

-.ZN True ,

-the procedure can store a pointer to private data in the location pointed

-to by watch_data;

-when the procedure is later called for this same connection and opening is

-.ZN False ,

-the location pointed to by watch_data will hold this same private data pointer.

-.LP

-This function can be called at any time after a display is opened.

-If internal connections already exist, the registered procedure will

-immediately be called for each of them, before

-.ZN XAddConnectionWatch

-returns.

-.ZN XAddConnectionWatch

-returns a nonzero status if the procedure is successfully registered;

-otherwise, it returns zero.

-.LP

-The registered procedure should not call any Xlib functions.

-If the procedure directly or indirectly causes the state of internal

-connections or watch procedures to change, the result is not defined.

-If Xlib has been initialized for threads, the procedure is called with

-the display locked and the result of a call by the procedure to any

-Xlib function that locks the display is not defined unless the executing

-thread has externally locked the display using

-.ZN XLockDisplay .

-.LP

-The

-.ZN XRemoveConnectionWatch

-function removes a previously registered connection watch procedure.

-The client_data must match the client_data used when the procedure

-was initially registered.

-

-.LP

-The

-.ZN XProcessInternalConnection

-function processes input available on an internal connection.

-This function should be called for an internal connection only

-after an operating system facility (for example,

-.ZN select

-or

-.ZN poll )

-has indicated that input is available; otherwise,

-the effect is not defined.

-.LP

-The

-.ZN XInternalConnectionNumbers

-function returns a list of the file descriptors for all internal

-connections currently open for the specified display.

-When the allocated list is no longer needed,

-free it by using

-.ZN XFree .

-This functions returns a nonzero status if the list is successfully allocated;

-otherwise, it returns zero.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAddConnectionWatch __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAddConnectionWatch, XRemoveConnectionWatch, XProcessInternalConnection, XInternalConnectionNumbers \- handle Xlib internal connections
+.SH SYNTAX
+.HP
+typedef void (*XConnectionWatchProc)\^(\^Display *\fIdisplay\fP\^, XPointer
+\fIclient_data\fP\^, int \fIfd\fP\^, Bool \fIopening\fP\^, XPointer
+*\fIwatch_data\fP\^); 
+.HP
+Status XAddConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc
+\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 
+.HP
+Status XRemoveConnectionWatch\^(\^Display *\fIdisplay\fP\^, XWatchProc
+\fIprocedure\fP\^, XPointer \fIclient_data\fP\^); 
+.HP
+void XProcessInternalConnection\^(\^Display *\fIdisplay\fP\^, int \fIfd\fP\^);
+.HP
+Status XInternalConnectionNumbers\^(\^Display *\fIdisplay\fP\^, int
+**\fIfd_return\fP\^, int *\fIcount_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIclient_data\fP 1i
+Specifies the additional client data.
+.ds Cn file descriptors
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfd\fP 1i
+Specifies the file descriptor.
+.IP \fIfd_return\fP 1i
+Returns the file descriptors.
+.IP \fIprocedure\fP 1i
+Specifies the procedure to be called.
+.SH DESCRIPTION
+The
+.ZN XAddConnectionWatch
+function registers a procedure to be called each time Xlib opens or closes an
+internal connection for the specified display.  The procedure is passed the
+display, the specified client_data, the file descriptor for the connection,
+a Boolean indicating whether the connection is being opened or closed, and a
+pointer to a location for private watch data.  If opening is
+.ZN True ,
+the procedure can store a pointer to private data in the location pointed
+to by watch_data;
+when the procedure is later called for this same connection and opening is
+.ZN False ,
+the location pointed to by watch_data will hold this same private data pointer.
+.LP
+This function can be called at any time after a display is opened.
+If internal connections already exist, the registered procedure will
+immediately be called for each of them, before
+.ZN XAddConnectionWatch
+returns.
+.ZN XAddConnectionWatch
+returns a nonzero status if the procedure is successfully registered;
+otherwise, it returns zero.
+.LP
+The registered procedure should not call any Xlib functions.
+If the procedure directly or indirectly causes the state of internal
+connections or watch procedures to change, the result is not defined.
+If Xlib has been initialized for threads, the procedure is called with
+the display locked and the result of a call by the procedure to any
+Xlib function that locks the display is not defined unless the executing
+thread has externally locked the display using
+.ZN XLockDisplay .
+.LP
+The
+.ZN XRemoveConnectionWatch
+function removes a previously registered connection watch procedure.
+The client_data must match the client_data used when the procedure
+was initially registered.
+
+.LP
+The
+.ZN XProcessInternalConnection
+function processes input available on an internal connection.
+This function should be called for an internal connection only
+after an operating system facility (for example,
+.ZN select
+or
+.ZN poll )
+has indicated that input is available; otherwise,
+the effect is not defined.
+.LP
+The
+.ZN XInternalConnectionNumbers
+function returns a list of the file descriptors for all internal
+connections currently open for the specified display.
+When the allocated list is no longer needed,
+free it by using
+.ZN XFree .
+This functions returns a nonzero status if the list is successfully allocated;
+otherwise, it returns zero.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XAddHost.man b/libX11/man/XAddHost.man
index 63407704b..44f3dbaac 100644
--- a/libX11/man/XAddHost.man
+++ b/libX11/man/XAddHost.man
@@ -1,378 +1,313 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" 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, and/or sell copies of the Software, and to permit persons

-.\" to whom the Software is furnished to do so, provided that the above

-.\" copyright notice(s) and this permission notice appear in all copies of

-.\" the Software and that both the above copyright notice(s) and this

-.\" permission notice appear in supporting documentation.

-.\" 

-.\" 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

-.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

-.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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 CONNECTION

-.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

-.\" 

-.\" Except as contained in this notice, the name of a copyright holder

-.\" shall not be used in advertising or otherwise to promote the sale, use

-.\" or other dealings in this Software without prior written authorization

-.\" of the copyright holder.

-.\" 

-.\" X Window System is a trademark of The Open Group.

-.\"

-.\" Copyright 2004 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAddHost __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAddHost, XAddHosts, XListHosts, XRemoveHost, XRemoveHosts, XSetAccessControl, XEnableAccessControl, XDisableAccessControl, XHostAddress, XServerInterpretedAddress \- control host access and host control structure

-.SH SYNTAX

-.HP

-int XAddHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^); 

-.HP

-int XAddHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, 

-int \fInum_hosts\fP\^);

-.HP

-XHostAddress *XListHosts\^(\^Display *\fIdisplay\fP, int *\fInhosts_return\fP,

-Bool \fIstate_return\fP\^);

-.HP

-int XRemoveHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^);

-.HP

-int XRemoveHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, int \fInum_hosts\fP\^);

-.HP

-int XSetAccessControl\^(\^Display *\fIdisplay\fP, int \fImode\fP\^);

-.HP

-int XEnableAccessControl\^(\^Display *\fIdisplay\fP\^);

-.HP

-int XDisableAccessControl\^(\^Display *\fIdisplay\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Ho added or removed

-.IP \fIhost\fP 1i

-Specifies the host that is to be \*(Ho.

-.ds Ho added or removed

-.IP \fIhosts\fP 1i

-Specifies each host that is to be \*(Ho.

-.IP \fImode\fP 1i

-Specifies the mode.

-You can pass

-.ZN EnableAccess

-or

-.ZN DisableAccess .

-.IP \fInhosts_return\fP 1i

-Returns the number of hosts currently in the access control list.

-.IP \fInum_hosts\fP 1i

-Specifies the number of hosts.

-.IP \fIstate_return\fP 1i

-Returns the state of the access control.

-.SH DESCRIPTION

-The

-.ZN XAddHost

-function adds the specified host to the access control list for that display.

-The server must be on the same host as the client issuing the command, or a

-.ZN BadAccess

-error results.

-.LP

-.ZN XAddHost

-can generate

-.ZN BadAccess

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XAddHosts

-function adds each specified host to the access control list for that display.

-The server must be on the same host as the client issuing the command, or a

-.ZN BadAccess

-error results.

-.LP

-.ZN XAddHosts

-can generate

-.ZN BadAccess

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XListHosts

-function returns the current access control list as well as whether the use 

-of the list at connection setup was enabled or disabled.

-.ZN XListHosts

-allows a program to find out what machines can make connections.

-It also returns a pointer to a list of host structures that

-were allocated by the function. 

-When no longer needed,

-this memory should be freed by calling

-.ZN XFree .

-.LP

-The

-.ZN XRemoveHost

-function removes the specified host from the access control list 

-for that display.

-The server must be on the same host as the client process, or a

-.ZN BadAccess

-error results.

-If you remove your machine from the access list,

-you can no longer connect to that server,

-and this operation cannot be reversed unless you reset the server.

-.LP

-.ZN XRemoveHost

-can generate

-.ZN BadAccess

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XRemoveHosts

-function removes each specified host from the access control list for that 

-display.  

-The X server must be on the same host as the client process, or a

-.ZN BadAccess

-error results.

-If you remove your machine from the access list, 

-you can no longer connect to that server,

-and this operation cannot be reversed unless you reset the server.

-.LP

-.ZN XRemoveHosts

-can generate

-.ZN BadAccess

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XSetAccessControl

-function either enables or disables the use of the access control list 

-at each connection setup.

-.LP

-.ZN XSetAccessControl

-can generate

-.ZN BadAccess

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XEnableAccessControl

-function enables the use of the access control list at each connection setup.

-.LP

-.ZN XEnableAccessControl

-can generate a

-.ZN BadAccess 

-error.

-.LP

-The

-.ZN XDisableAccessControl

-function disables the use of the access control list at each connection setup.

-.LP

-.ZN XDisableAccessControl

-can generate a

-.ZN BadAccess 

-error.

-.SH STRUCTURES

-The

-.ZN XHostAddress

-structure contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int family;	/\&* for example FamilyInternet */

-	int length;	/\&* length of address, in bytes */

-	char *address;	/\&* pointer to where to find the address */

-} XHostAddress;

-.De

-.LP

-The family member specifies which protocol address family to use 

-(for example, TCP/IP or DECnet) and can be

-.ZN FamilyInternet ,

-.ZN FamilyInternet6 ,

-.ZN FamilyServerInterpreted ,

-.ZN FamilyDECnet ,

-or

-.ZN FamilyChaos .

-The length member specifies the length of the address in bytes.

-The address member specifies a pointer to the address.

-.LP

-For the ServerInterpreted family, the length is ignored and the address 

-member is a pointer to a 

-.ZN XServerInterpretedAddress

-structure which contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int typelength;		/\&* length of type string, in bytes */

-	int valuelength;	/\&* length of value string, in bytes */

-	char *type;		/\&* pointer to where to find the type string */

-	char *value;		/\&* pointer to where to find the address */

-} XServerInterpretedAddress;

-.De

-.LP

-The type and value members point to strings representing the type and value of

-the server interpreted entry.  These strings may not be NULL-terminated so care

-should be used when accessing them.  The typelength and valuelength members

-specify the length in byte of the type and value strings.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAccess

-A client attempted

-to modify the access control list from other than the local

-(or otherwise authorized) host.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XFree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" 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, and/or sell copies of the Software, and to permit persons
+.\" to whom the Software is furnished to do so, provided that the above
+.\" copyright notice(s) and this permission notice appear in all copies of
+.\" the Software and that both the above copyright notice(s) and this
+.\" permission notice appear in supporting documentation.
+.\" 
+.\" 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
+.\" OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+.\" HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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 CONNECTION
+.\" WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\" 
+.\" Except as contained in this notice, the name of a copyright holder
+.\" shall not be used in advertising or otherwise to promote the sale, use
+.\" or other dealings in this Software without prior written authorization
+.\" of the copyright holder.
+.\" 
+.\" X Window System is a trademark of The Open Group.
+.\"
+.\" Copyright 2004 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAddHost __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAddHost, XAddHosts, XListHosts, XRemoveHost, XRemoveHosts, XSetAccessControl, XEnableAccessControl, XDisableAccessControl, XHostAddress, XServerInterpretedAddress \- control host access and host control structure
+.SH SYNTAX
+.HP
+int XAddHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^); 
+.HP
+int XAddHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, 
+int \fInum_hosts\fP\^);
+.HP
+XHostAddress *XListHosts\^(\^Display *\fIdisplay\fP, int *\fInhosts_return\fP,
+Bool \fIstate_return\fP\^);
+.HP
+int XRemoveHost\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhost\fP\^);
+.HP
+int XRemoveHosts\^(\^Display *\fIdisplay\fP, XHostAddress *\fIhosts\fP, int \fInum_hosts\fP\^);
+.HP
+int XSetAccessControl\^(\^Display *\fIdisplay\fP, int \fImode\fP\^);
+.HP
+int XEnableAccessControl\^(\^Display *\fIdisplay\fP\^);
+.HP
+int XDisableAccessControl\^(\^Display *\fIdisplay\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Ho added or removed
+.IP \fIhost\fP 1i
+Specifies the host that is to be \*(Ho.
+.ds Ho added or removed
+.IP \fIhosts\fP 1i
+Specifies each host that is to be \*(Ho.
+.IP \fImode\fP 1i
+Specifies the mode.
+You can pass
+.ZN EnableAccess
+or
+.ZN DisableAccess .
+.IP \fInhosts_return\fP 1i
+Returns the number of hosts currently in the access control list.
+.IP \fInum_hosts\fP 1i
+Specifies the number of hosts.
+.IP \fIstate_return\fP 1i
+Returns the state of the access control.
+.SH DESCRIPTION
+The
+.ZN XAddHost
+function adds the specified host to the access control list for that display.
+The server must be on the same host as the client issuing the command, or a
+.ZN BadAccess
+error results.
+.LP
+.ZN XAddHost
+can generate
+.ZN BadAccess
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XAddHosts
+function adds each specified host to the access control list for that display.
+The server must be on the same host as the client issuing the command, or a
+.ZN BadAccess
+error results.
+.LP
+.ZN XAddHosts
+can generate
+.ZN BadAccess
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XListHosts
+function returns the current access control list as well as whether the use 
+of the list at connection setup was enabled or disabled.
+.ZN XListHosts
+allows a program to find out what machines can make connections.
+It also returns a pointer to a list of host structures that
+were allocated by the function. 
+When no longer needed,
+this memory should be freed by calling
+.ZN XFree .
+.LP
+The
+.ZN XRemoveHost
+function removes the specified host from the access control list 
+for that display.
+The server must be on the same host as the client process, or a
+.ZN BadAccess
+error results.
+If you remove your machine from the access list,
+you can no longer connect to that server,
+and this operation cannot be reversed unless you reset the server.
+.LP
+.ZN XRemoveHost
+can generate
+.ZN BadAccess
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XRemoveHosts
+function removes each specified host from the access control list for that 
+display.  
+The X server must be on the same host as the client process, or a
+.ZN BadAccess
+error results.
+If you remove your machine from the access list, 
+you can no longer connect to that server,
+and this operation cannot be reversed unless you reset the server.
+.LP
+.ZN XRemoveHosts
+can generate
+.ZN BadAccess
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XSetAccessControl
+function either enables or disables the use of the access control list 
+at each connection setup.
+.LP
+.ZN XSetAccessControl
+can generate
+.ZN BadAccess
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XEnableAccessControl
+function enables the use of the access control list at each connection setup.
+.LP
+.ZN XEnableAccessControl
+can generate a
+.ZN BadAccess 
+error.
+.LP
+The
+.ZN XDisableAccessControl
+function disables the use of the access control list at each connection setup.
+.LP
+.ZN XDisableAccessControl
+can generate a
+.ZN BadAccess 
+error.
+.SH STRUCTURES
+The
+.ZN XHostAddress
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        int family;     /\&* for example FamilyInternet */
+        int length;     /\&* length of address, in bytes */
+        char *address;  /\&* pointer to where to find the address */
+} XHostAddress;
+.De
+.LP
+The family member specifies which protocol address family to use 
+(for example, TCP/IP or DECnet) and can be
+.ZN FamilyInternet ,
+.ZN FamilyInternet6 ,
+.ZN FamilyServerInterpreted ,
+.ZN FamilyDECnet ,
+or
+.ZN FamilyChaos .
+The length member specifies the length of the address in bytes.
+The address member specifies a pointer to the address.
+.LP
+For the ServerInterpreted family, the length is ignored and the address 
+member is a pointer to a 
+.ZN XServerInterpretedAddress
+structure which contains:
+.LP
+.Ds 0
+typedef struct {
+        int typelength;         /\&* length of type string, in bytes */
+        int valuelength;        /\&* length of value string, in bytes */
+        char *type;             /\&* pointer to where to find the type string */
+        char *value;            /\&* pointer to where to find the address */
+} XServerInterpretedAddress;
+.De
+.LP
+The type and value members point to strings representing the type and value of
+the server interpreted entry.  These strings may not be NULL-terminated so care
+should be used when accessing them.  The typelength and valuelength members
+specify the length in byte of the type and value strings.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAccess
+A client attempted
+to modify the access control list from other than the local
+(or otherwise authorized) host.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XFree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocClassHint.man b/libX11/man/XAllocClassHint.man
index c8161a12b..34d0ce778 100644
--- a/libX11/man/XAllocClassHint.man
+++ b/libX11/man/XAllocClassHint.man
@@ -1,265 +1,201 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAllocClassHint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocClassHint, XSetClassHint, XGetClassHint, XClassHint \- allocate class hints structure and set or read a window's WM_CLASS property

-.SH SYNTAX

-.HP

-XClassHint *XAllocClassHint\^(void\^);

-.HP

-XSetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints\fP\^);

-.HP

-Status XGetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints_return\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIclass_hints\fP 1i

-Specifies the

-.ZN XClassHint

-structure that is to be used.

-.IP \fIclass_hints_return\fP 1i

-Returns the 

-.ZN XClassHint

-structure.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XAllocClassHint

-function allocates and returns a pointer to a

-.ZN XClassHint

-structure.

-Note that the pointer fields in the

-.ZN XClassHint

-structure are initially set to NULL.

-If insufficient memory is available, 

-.ZN XAllocClassHint

-returns NULL.

-To free the memory allocated to this structure,

-use

-.ZN XFree .

-.LP

-The

-.ZN XSetClassHint

-function sets the class hint for the specified window.

-If the strings are not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-.LP

-.ZN XSetClassHint

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetClassHint

-function returns the class hint of the specified window to the members

-of the supplied structure.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned strings are in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-It returns a nonzero status on success;

-otherwise, it returns a zero status.

-To free res_name and res_class when finished with the strings,

-use

-.ZN XFree

-on each individually.

-.LP

-.ZN XGetClassHint

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_CLASS\s+1

-Set by application programs to allow window and session

-managers to obtain the application's resources from the resource database.

-.SH STRUCTURES

-The

-.ZN XClassHint

-structure contains:

-.LP

-.IN "XClassHint" "" "@DEF@"

-.Ds 0

-.TA .5i

-.ta .5i

-typedef struct {

-	char *res_name;

-	char *res_class;

-} XClassHint;

-.De

-.LP

-The res_name member contains the application name, 

-and the res_class member contains the application class. 

-Note that the name set in this property may differ from the name set as WM_NAME.

-That is, WM_NAME specifies what should be displayed in the title bar and,

-therefore, can contain temporal information (for example, the name of

-a file currently in an editor's buffer).

-On the other hand, 

-the name specified as part of WM_CLASS is the formal name of the application

-that should be used when retrieving the application's resources from the 

-resource database.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAllocClassHint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocClassHint, XSetClassHint, XGetClassHint, XClassHint \- allocate class hints structure and set or read a window's WM_CLASS property
+.SH SYNTAX
+.HP
+XClassHint *XAllocClassHint\^(void\^);
+.HP
+XSetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints\fP\^);
+.HP
+Status XGetClassHint\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XClassHint *\fIclass_hints_return\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIclass_hints\fP 1i
+Specifies the
+.ZN XClassHint
+structure that is to be used.
+.IP \fIclass_hints_return\fP 1i
+Returns the 
+.ZN XClassHint
+structure.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XAllocClassHint
+function allocates and returns a pointer to a
+.ZN XClassHint
+structure.
+Note that the pointer fields in the
+.ZN XClassHint
+structure are initially set to NULL.
+If insufficient memory is available, 
+.ZN XAllocClassHint
+returns NULL.
+To free the memory allocated to this structure,
+use
+.ZN XFree .
+.LP
+The
+.ZN XSetClassHint
+function sets the class hint for the specified window.
+If the strings are not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+.LP
+.ZN XSetClassHint
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetClassHint
+function returns the class hint of the specified window to the members
+of the supplied structure.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned strings are in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+It returns a nonzero status on success;
+otherwise, it returns a zero status.
+To free res_name and res_class when finished with the strings,
+use
+.ZN XFree
+on each individually.
+.LP
+.ZN XGetClassHint
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_CLASS\s+1
+Set by application programs to allow window and session
+managers to obtain the application's resources from the resource database.
+.SH STRUCTURES
+The
+.ZN XClassHint
+structure contains:
+.LP
+.IN "XClassHint" "" "@DEF@"
+.Ds 0
+typedef struct {
+        char *res_name;
+        char *res_class;
+} XClassHint;
+.LP
+The res_name member contains the application name, 
+and the res_class member contains the application class. 
+Note that the name set in this property may differ from the name set as WM_NAME.
+That is, WM_NAME specifies what should be displayed in the title bar and,
+therefore, can contain temporal information (for example, the name of
+a file currently in an editor's buffer).
+On the other hand, 
+the name specified as part of WM_CLASS is the formal name of the application
+that should be used when retrieving the application's resources from the 
+resource database.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocColor.man b/libX11/man/XAllocColor.man
index 1f04d6e57..7b21b5639 100644
--- a/libX11/man/XAllocColor.man
+++ b/libX11/man/XAllocColor.man
@@ -1,447 +1,386 @@
-'\" e

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" e

-.TH XAllocColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocColor, XAllocNamedColor, XAllocColorCells, XAllocColorPlanes, XFreeColors \- allocate and free colors

-.SH SYNTAX

-.HP

-Status XAllocColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,

-XColor *\fIscreen_in_out\fP\^);

-.HP

-Status XAllocNamedColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,

-char *\fIcolor_name\fP\^, XColor *\fIscreen_def_return\fP\^, XColor

-*\fIexact_def_return\fP\^);

-.HP

-Status XAllocColorCells\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,

-Bool \fIcontig\fP\^, unsigned long \fIplane_masks_return\fP[\^]\^, unsigned int

-\fInplanes\fP\^, unsigned long \fIpixels_return\fP[\^]\^, unsigned int

-\fInpixels\fP\^);

-.HP

-Status XAllocColorPlanes\^(\^Display *\fIdisplay\fP, Colormap

-\fIcolormap\fP\^, Bool \fIcontig\fP\^, unsigned long

-\fIpixels_return\fP[\^]\^, int \fIncolors\fP\^, int \fInreds\fP\^, int

-\fIngreens\fP\^, int \fInblues\fP\^, unsigned long *\fIrmask_return\fP\^,

-unsigned long *\fIgmask_return\fP\^, unsigned long *\fIbmask_return\fP\^);

-.HP

-int XFreeColors\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^, unsigned

-long \fIpixels\fP\^[\^], int \fInpixels\fP\^, unsigned long \fIplanes\fP\^);

-.IP \fIcolor_name\fP 1i

-Specifies the color name string (for example, red) whose color 

-definition structure you want returned.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIcontig\fP 1i

-Specifies a Boolean value that indicates whether the planes must be contiguous.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIexact_def_return\fP 1i

-Returns the exact RGB values.

-.IP \fIncolors\fP 1i

-Specifies the number of pixel values that are to be returned in the 

-pixels_return array. 

-.IP \fInpixels\fP 1i

-Specifies the number of pixels. 

-.IP \fInplanes\fP 1i

-Specifies the number of plane masks that are to be returned in the plane masks 

-array. 

-.IP \fInreds\fP 1i

-.br

-.ns

-.IP \fIngreens\fP 1i

-.br

-.ns

-.IP \fInblues\fP 1i

-.br

-.ns

-Specify the number of red, green, and blue planes.

-The value you pass must be nonnegative. 

-.IP \fIpixels\fP 1i

-Specifies an array of pixel values. 

-.IP \fIpixels_return\fP 1i

-Returns an array of pixel values. 

-.IP \fIplane_mask_return\fP 1i

-Returns an array of plane masks.

-.\" *** JIM: NEED MORE INFO FOR THIS. ***

-.IP \fIplanes\fP 1i

-Specifies the planes you want to free.

-.IP \fIrmask_return\fP 1i

-.br

-.ns

-.IP \fIgmask_return\fP 1i

-.br

-.ns

-.IP \fIbmask_return\fP 1i

-Return bit masks for the red, green, and blue planes.

-.IP \fIscreen_def_return\fP 1i

-Returns the closest RGB values provided by the hardware.

-.IP \fIscreen_in_out\fP 1i

-Specifies and returns the values actually used in the colormap.

-.SH DESCRIPTION

-The

-.ZN XAllocColor

-function allocates a read-only colormap entry corresponding to the closest

-RGB value supported by the hardware.

-.ZN XAllocColor

-returns the pixel value of the color closest to the specified

-RGB elements supported by the hardware

-and returns the RGB value actually used.

-The corresponding colormap cell is read-only.

-In addition,

-.ZN XAllocColor

-returns nonzero if it succeeded or zero if it failed.

-.IN "Color map"

-.IN "Color" "allocation"

-.IN "Allocation" "colormap"

-.IN "read-only colormap cells"

-Multiple clients that request the same effective RGB value can be assigned

-the same read-only entry, thus allowing entries to be shared.

-When the last client deallocates a shared cell, it is deallocated.

-.ZN XAllocColor

-does not use or affect the flags in the

-.ZN XColor

-structure.

-.LP

-.ZN XAllocColor

-can generate a

-.ZN BadColor 

-error.

-.LP

-The

-.ZN XAllocNamedColor

-function looks up the named color with respect to the screen that is

-associated with the specified colormap.

-It returns both the exact database definition and

-the closest color supported by the screen.

-The allocated color cell is read-only.

-The pixel value is returned in screen_def_return.

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-If screen_def_return and exact_def_return

-point to the same structure, the pixel field will be set correctly,

-but the color values are undefined.

-.ZN XAllocNamedColor

-returns nonzero if a cell is allocated;

-otherwise, it returns zero.

-.LP

-.ZN XAllocNamedColor

-can generate a

-.ZN BadColor

-error.

-.LP

-.EQ

-delim %%

-.EN

-The

-.ZN XAllocColorCells

-function allocates read/write color cells.

-The number of colors must be positive and the number of planes nonnegative,

-or a

-.ZN BadValue

-error results.

-If ncolors and nplanes are requested, 

-then ncolors pixels

-and nplane plane masks are returned.

-No mask will have any bits set to 1 in common with

-any other mask or with any of the pixels.

-By ORing together each pixel with zero or more masks,

-ncolors * %2 sup nplanes% distinct pixels can be produced.

-All of these are

-allocated writable by the request.

-For 

-.ZN GrayScale 

-or 

-.ZN PseudoColor , 

-each mask has exactly one bit set to 1. 

-For 

-.ZN DirectColor , 

-each has exactly three bits set to 1.

-If contig is 

-.ZN True 

-and if all masks are ORed

-together, a single contiguous set of bits set to 1 will be formed for 

-.ZN GrayScale

-or 

-.ZN PseudoColor 

-and three contiguous sets of bits set to 1 (one within each

-pixel subfield) for 

-.ZN DirectColor .

-The RGB values of the allocated

-entries are undefined.

-.ZN XAllocColorCells

-returns nonzero if it succeeded or zero if it failed.

-.LP

-.ZN XAllocColorCells

-can generate

-.ZN BadColor

-and

-.ZN BadValue 

-errors.

-.LP

-.EQ

-delim %%

-.EN

-The specified ncolors must be positive; 

-and nreds, ngreens, and nblues must be nonnegative,

-or a

-.ZN BadValue

-error results.

-If ncolors colors, nreds reds, ngreens greens, and nblues blues are requested, 

-ncolors pixels are returned; and the masks have nreds, ngreens, and 

-nblues bits set to 1, respectively.

-If contig is 

-.ZN True , 

-each mask will have

-a contiguous set of bits set to 1.

-No mask will have any bits set to 1 in common with

-any other mask or with any of the pixels.

-For 

-.ZN DirectColor , 

-each mask

-will lie within the corresponding pixel subfield.

-By ORing together

-subsets of masks with each pixel value, 

-ncolors * %2 sup (nreds+ngreens+nblues)% distinct pixel values can be produced. 

-All of these are allocated by the request.

-However, in the

-colormap, there are only ncolors * %2 sup nreds% independent red entries, 

-ncolors * %2 sup ngreens% independent green entries, 

-and ncolors * %2 sup nblues% independent blue entries. 

-This is true even for 

-.ZN PseudoColor .

-When the colormap entry of a pixel

-value is changed (using 

-.ZN XStoreColors ,

-.ZN XStoreColor ,

-or 

-.ZN XStoreNamedColor ),

-the pixel is decomposed according to the masks, 

-and the corresponding independent entries are updated.

-.ZN XAllocColorPlanes

-returns nonzero if it succeeded or zero if it failed.

-.LP

-.ZN XAllocColorPlanes

-can generate

-.ZN BadColor

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XFreeColors

-function frees the cells represented by pixels whose values are in the

-pixels array.

-The planes argument should not have any bits set to 1 in common with any of the

-pixels. 

-The set of all pixels is produced by ORing together subsets of

-the planes argument with the pixels.

-The request frees all of these pixels that

-were allocated by the client (using 

-.IN XAllocColor

-.IN XAllocNamedColor

-.IN XAllocColorCells

-.IN XAllocColorPlanes

-.ZN XAllocColor , 

-.ZN XAllocNamedColor ,

-.ZN XAllocColorCells ,

-and 

-.ZN XAllocColorPlanes ).

-Note that freeing an

-individual pixel obtained from 

-.ZN XAllocColorPlanes 

-may not actually allow

-it to be reused until all of its related pixels are also freed.

-Similarly,

-a read-only entry is not actually freed until it has been freed by all clients,

-and if a client allocates the same read-only entry multiple times,

-it must free the entry that many times before the entry is actually freed.

-.LP

-All specified pixels that are allocated by the client in the colormap are

-freed, even if one or more pixels produce an error. 

-If a specified pixel is not a valid index into the colormap, a 

-.ZN BadValue 

-error results.

-If a specified pixel is not allocated by the

-client (that is, is unallocated or is only allocated by another client)

-or if the colormap was created with all entries writable (by passing

-.ZN AllocAll

-to

-.ZN XCreateColormap ),

-a

-.ZN BadAccess

-error results. 

-If more than one pixel is in error, 

-the one that gets reported is arbitrary.

-.LP

-.ZN XFreeColors

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAccess

-A client attempted

-to free a color map entry that it did not already allocate.

-.TP 1i

-.ZN BadAccess

-A client attempted

-to store into a read-only color map entry.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateColormap(__libmansuffix__), 

-XQueryColor(__libmansuffix__),

-XStoreColors(__libmansuffix__) 

-.br

-\fI\*(xL\fP

+'\" e
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" e
+.TH XAllocColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocColor, XAllocNamedColor, XAllocColorCells, XAllocColorPlanes, XFreeColors \- allocate and free colors
+.SH SYNTAX
+.HP
+Status XAllocColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+XColor *\fIscreen_in_out\fP\^);
+.HP
+Status XAllocNamedColor\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+char *\fIcolor_name\fP\^, XColor *\fIscreen_def_return\fP\^, XColor
+*\fIexact_def_return\fP\^);
+.HP
+Status XAllocColorCells\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^,
+Bool \fIcontig\fP\^, unsigned long \fIplane_masks_return\fP[\^]\^, unsigned int
+\fInplanes\fP\^, unsigned long \fIpixels_return\fP[\^]\^, unsigned int
+\fInpixels\fP\^);
+.HP
+Status XAllocColorPlanes\^(\^Display *\fIdisplay\fP, Colormap
+\fIcolormap\fP\^, Bool \fIcontig\fP\^, unsigned long
+\fIpixels_return\fP[\^]\^, int \fIncolors\fP\^, int \fInreds\fP\^, int
+\fIngreens\fP\^, int \fInblues\fP\^, unsigned long *\fIrmask_return\fP\^,
+unsigned long *\fIgmask_return\fP\^, unsigned long *\fIbmask_return\fP\^);
+.HP
+int XFreeColors\^(\^Display *\fIdisplay\fP, Colormap \fIcolormap\fP\^, unsigned
+long \fIpixels\fP\^[\^], int \fInpixels\fP\^, unsigned long \fIplanes\fP\^);
+.IP \fIcolor_name\fP 1i
+Specifies the color name string (for example, red) whose color 
+definition structure you want returned.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIcontig\fP 1i
+Specifies a Boolean value that indicates whether the planes must be contiguous.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIexact_def_return\fP 1i
+Returns the exact RGB values.
+.IP \fIncolors\fP 1i
+Specifies the number of pixel values that are to be returned in the 
+pixels_return array. 
+.IP \fInpixels\fP 1i
+Specifies the number of pixels. 
+.IP \fInplanes\fP 1i
+Specifies the number of plane masks that are to be returned in the plane masks 
+array. 
+.IP \fInreds\fP 1i
+.br
+.ns
+.IP \fIngreens\fP 1i
+.br
+.ns
+.IP \fInblues\fP 1i
+.br
+.ns
+Specify the number of red, green, and blue planes.
+The value you pass must be nonnegative. 
+.IP \fIpixels\fP 1i
+Specifies an array of pixel values. 
+.IP \fIpixels_return\fP 1i
+Returns an array of pixel values. 
+.IP \fIplane_mask_return\fP 1i
+Returns an array of plane masks.
+.\" *** JIM: NEED MORE INFO FOR THIS. ***
+.IP \fIplanes\fP 1i
+Specifies the planes you want to free.
+.IP \fIrmask_return\fP 1i
+.br
+.ns
+.IP \fIgmask_return\fP 1i
+.br
+.ns
+.IP \fIbmask_return\fP 1i
+Return bit masks for the red, green, and blue planes.
+.IP \fIscreen_def_return\fP 1i
+Returns the closest RGB values provided by the hardware.
+.IP \fIscreen_in_out\fP 1i
+Specifies and returns the values actually used in the colormap.
+.SH DESCRIPTION
+The
+.ZN XAllocColor
+function allocates a read-only colormap entry corresponding to the closest
+RGB value supported by the hardware.
+.ZN XAllocColor
+returns the pixel value of the color closest to the specified
+RGB elements supported by the hardware
+and returns the RGB value actually used.
+The corresponding colormap cell is read-only.
+In addition,
+.ZN XAllocColor
+returns nonzero if it succeeded or zero if it failed.
+.IN "Color map"
+.IN "Color" "allocation"
+.IN "Allocation" "colormap"
+.IN "read-only colormap cells"
+Multiple clients that request the same effective RGB value can be assigned
+the same read-only entry, thus allowing entries to be shared.
+When the last client deallocates a shared cell, it is deallocated.
+.ZN XAllocColor
+does not use or affect the flags in the
+.ZN XColor
+structure.
+.LP
+.ZN XAllocColor
+can generate a
+.ZN BadColor 
+error.
+.LP
+The
+.ZN XAllocNamedColor
+function looks up the named color with respect to the screen that is
+associated with the specified colormap.
+It returns both the exact database definition and
+the closest color supported by the screen.
+The allocated color cell is read-only.
+The pixel value is returned in screen_def_return.
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+If screen_def_return and exact_def_return
+point to the same structure, the pixel field will be set correctly,
+but the color values are undefined.
+.ZN XAllocNamedColor
+returns nonzero if a cell is allocated;
+otherwise, it returns zero.
+.LP
+.ZN XAllocNamedColor
+can generate a
+.ZN BadColor
+error.
+.LP
+.EQ
+delim %%
+.EN
+The
+.ZN XAllocColorCells
+function allocates read/write color cells.
+The number of colors must be positive and the number of planes nonnegative,
+or a
+.ZN BadValue
+error results.
+If ncolors and nplanes are requested, 
+then ncolors pixels
+and nplane plane masks are returned.
+No mask will have any bits set to 1 in common with
+any other mask or with any of the pixels.
+By ORing together each pixel with zero or more masks,
+ncolors * %2 sup nplanes% distinct pixels can be produced.
+All of these are
+allocated writable by the request.
+For 
+.ZN GrayScale 
+or 
+.ZN PseudoColor , 
+each mask has exactly one bit set to 1. 
+For 
+.ZN DirectColor , 
+each has exactly three bits set to 1.
+If contig is 
+.ZN True 
+and if all masks are ORed
+together, a single contiguous set of bits set to 1 will be formed for 
+.ZN GrayScale
+or 
+.ZN PseudoColor 
+and three contiguous sets of bits set to 1 (one within each
+pixel subfield) for 
+.ZN DirectColor .
+The RGB values of the allocated
+entries are undefined.
+.ZN XAllocColorCells
+returns nonzero if it succeeded or zero if it failed.
+.LP
+.ZN XAllocColorCells
+can generate
+.ZN BadColor
+and
+.ZN BadValue 
+errors.
+.LP
+.EQ
+delim %%
+.EN
+The specified ncolors must be positive; 
+and nreds, ngreens, and nblues must be nonnegative,
+or a
+.ZN BadValue
+error results.
+If ncolors colors, nreds reds, ngreens greens, and nblues blues are requested, 
+ncolors pixels are returned; and the masks have nreds, ngreens, and 
+nblues bits set to 1, respectively.
+If contig is 
+.ZN True , 
+each mask will have
+a contiguous set of bits set to 1.
+No mask will have any bits set to 1 in common with
+any other mask or with any of the pixels.
+For 
+.ZN DirectColor , 
+each mask
+will lie within the corresponding pixel subfield.
+By ORing together
+subsets of masks with each pixel value, 
+ncolors * %2 sup (nreds+ngreens+nblues)% distinct pixel values can be produced. 
+All of these are allocated by the request.
+However, in the
+colormap, there are only ncolors * %2 sup nreds% independent red entries, 
+ncolors * %2 sup ngreens% independent green entries, 
+and ncolors * %2 sup nblues% independent blue entries. 
+This is true even for 
+.ZN PseudoColor .
+When the colormap entry of a pixel
+value is changed (using 
+.ZN XStoreColors ,
+.ZN XStoreColor ,
+or 
+.ZN XStoreNamedColor ),
+the pixel is decomposed according to the masks, 
+and the corresponding independent entries are updated.
+.ZN XAllocColorPlanes
+returns nonzero if it succeeded or zero if it failed.
+.LP
+.ZN XAllocColorPlanes
+can generate
+.ZN BadColor
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XFreeColors
+function frees the cells represented by pixels whose values are in the
+pixels array.
+The planes argument should not have any bits set to 1 in common with any of the
+pixels. 
+The set of all pixels is produced by ORing together subsets of
+the planes argument with the pixels.
+The request frees all of these pixels that
+were allocated by the client (using 
+.IN XAllocColor
+.IN XAllocNamedColor
+.IN XAllocColorCells
+.IN XAllocColorPlanes
+.ZN XAllocColor , 
+.ZN XAllocNamedColor ,
+.ZN XAllocColorCells ,
+and 
+.ZN XAllocColorPlanes ).
+Note that freeing an
+individual pixel obtained from 
+.ZN XAllocColorPlanes 
+may not actually allow
+it to be reused until all of its related pixels are also freed.
+Similarly,
+a read-only entry is not actually freed until it has been freed by all clients,
+and if a client allocates the same read-only entry multiple times,
+it must free the entry that many times before the entry is actually freed.
+.LP
+All specified pixels that are allocated by the client in the colormap are
+freed, even if one or more pixels produce an error. 
+If a specified pixel is not a valid index into the colormap, a 
+.ZN BadValue 
+error results.
+If a specified pixel is not allocated by the
+client (that is, is unallocated or is only allocated by another client)
+or if the colormap was created with all entries writable (by passing
+.ZN AllocAll
+to
+.ZN XCreateColormap ),
+a
+.ZN BadAccess
+error results. 
+If more than one pixel is in error, 
+the one that gets reported is arbitrary.
+.LP
+.ZN XFreeColors
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAccess
+A client attempted
+to free a color map entry that it did not already allocate.
+.TP 1i
+.ZN BadAccess
+A client attempted
+to store into a read-only color map entry.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateColormap(__libmansuffix__), 
+XQueryColor(__libmansuffix__),
+XStoreColors(__libmansuffix__) 
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocIconSize.man b/libX11/man/XAllocIconSize.man
index 6950ae4b5..c8b9087fa 100644
--- a/libX11/man/XAllocIconSize.man
+++ b/libX11/man/XAllocIconSize.man
@@ -1,261 +1,198 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAllocIconSize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocIconSize, XSetIconSizes, XGetIconSizes, XIconSize \- allocate icon size structure and set or read a window's WM_ICON_SIZES property

-.SH SYNTAX

-XIconSize *XAllocIconSize\^(void\^);

-.LP

-int XSetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize

-*\fIsize_list\fP, int \fIcount\fP\^);

-.LP

-Status XGetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize

-**\fIsize_list_return\fP, int \fIcount_return\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcount\fP 1i

-Specifies the number of items in the size list.

-.IP \fIcount_return\fP 1i

-Returns the number of items in the size list.

-.IP \fIsize_list\fP 1i

-Specifies the size list.

-.IP \fIsize_list_return\fP 1i

-Returns the size list.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XAllocIconSize 

-function allocates and returns a pointer to a

-.ZN XIconSize 

-structure.

-Note that all fields in the

-.ZN XIconSize

-structure are initially set to zero.

-If insufficient memory is available, 

-.ZN XAllocIconSize

-returns NULL.

-To free the memory allocated to this structure,

-use

-.ZN XFree .

-.LP

-The

-.ZN XSetIconSizes

-function is used only by window managers to set the supported icon sizes.

-.LP

-.ZN XSetIconSizes

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetIconSizes

-function returns zero if a window manager has not set icon sizes;

-otherwise, it return nonzero.

-.ZN XGetIconSizes

-should be called by an application that

-wants to find out what icon sizes would be most appreciated by the

-window manager under which the application is running.

-The application

-should then use

-.ZN XSetWMHints

-to supply the window manager with an icon pixmap or window in one of the

-supported sizes.

-To free the data allocated in size_list_return, use

-.ZN XFree .

-.LP

-.ZN XGetIconSizes

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_ICON_SIZES\s+1

-The window manager may set this property on the root window to

-specify the icon sizes it supports.

-The C type of this property is 

-.ZN XIconSize .

-.SH STRUCTURES

-The

-.ZN XIconSize

-structure contains:

-.LP

-.IN "XIconSize" "" "@DEF@"

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	int min_width, min_height;

-	int max_width, max_height;

-	int width_inc, height_inc;

-} XIconSize;

-.De

-.LP

-The width_inc and height_inc members define an arithmetic progression of

-sizes (minimum to maximum) that represent the supported icon sizes.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAllocIconSize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocIconSize, XSetIconSizes, XGetIconSizes, XIconSize \- allocate icon size structure and set or read a window's WM_ICON_SIZES property
+.SH SYNTAX
+XIconSize *XAllocIconSize\^(void\^);
+.LP
+int XSetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
+*\fIsize_list\fP, int \fIcount\fP\^);
+.LP
+Status XGetIconSizes\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XIconSize
+**\fIsize_list_return\fP, int \fIcount_return\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcount\fP 1i
+Specifies the number of items in the size list.
+.IP \fIcount_return\fP 1i
+Returns the number of items in the size list.
+.IP \fIsize_list\fP 1i
+Specifies the size list.
+.IP \fIsize_list_return\fP 1i
+Returns the size list.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XAllocIconSize 
+function allocates and returns a pointer to a
+.ZN XIconSize 
+structure.
+Note that all fields in the
+.ZN XIconSize
+structure are initially set to zero.
+If insufficient memory is available, 
+.ZN XAllocIconSize
+returns NULL.
+To free the memory allocated to this structure,
+use
+.ZN XFree .
+.LP
+The
+.ZN XSetIconSizes
+function is used only by window managers to set the supported icon sizes.
+.LP
+.ZN XSetIconSizes
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetIconSizes
+function returns zero if a window manager has not set icon sizes;
+otherwise, it return nonzero.
+.ZN XGetIconSizes
+should be called by an application that
+wants to find out what icon sizes would be most appreciated by the
+window manager under which the application is running.
+The application
+should then use
+.ZN XSetWMHints
+to supply the window manager with an icon pixmap or window in one of the
+supported sizes.
+To free the data allocated in size_list_return, use
+.ZN XFree .
+.LP
+.ZN XGetIconSizes
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_ICON_SIZES\s+1
+The window manager may set this property on the root window to
+specify the icon sizes it supports.
+The C type of this property is 
+.ZN XIconSize .
+.SH STRUCTURES
+The
+.ZN XIconSize
+structure contains:
+.LP
+.IN "XIconSize" "" "@DEF@"
+.Ds 0
+typedef struct {
+        int min_width, min_height;
+        int max_width, max_height;
+        int width_inc, height_inc;
+} XIconSize;
+.De
+.LP
+The width_inc and height_inc members define an arithmetic progression of
+sizes (minimum to maximum) that represent the supported icon sizes.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocSizeHints.man b/libX11/man/XAllocSizeHints.man
index c52fd08ff..9c01736fd 100644
--- a/libX11/man/XAllocSizeHints.man
+++ b/libX11/man/XAllocSizeHints.man
@@ -1,502 +1,439 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, 

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XAllocSizeHints __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocSizeHints, XSetWMNormalHints, XGetWMNormalHints, XSetWMSizeHints, XGetWMSizeHints, XSizeHints \- allocate size hints structure and set or read a window's WM_NORMAL_HINTS property

-.SH SYNTAX

-.HP

-XSizeHints *XAllocSizeHints\^(void\^);

-.HP

-void XSetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints *\fIhints\fP\^);

-.HP

-Status XGetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP,

-XSizeHints *\fIhints_return\fP, long *\fIsupplied_return\fP\^);

-.HP

-void XSetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints

-*\fIhints\fP, Atom \fIproperty\fP\^);

-.HP

-Status XGetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints

-*\fIhints_return\fP, long *\fIsupplied_return\fP, Atom \fIproperty\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIhints\fP 1i

-Specifies the size hints for the window in its normal state.

-.IP \fIhints\fP 1i

-Specifies the

-.ZN XSizeHints

-structure to be used.

-.IP \fIhints_return\fP 1i

-Returns the size hints for the window in its normal state.

-.IP \fIproperty\fP 1i

-Specifies the property name.

-.IP \fIsupplied_return\fP 1i

-Returns the hints that were supplied by the user.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XAllocSizeHints

-function allocates and returns a pointer to a

-.ZN XSizeHints

-structure.

-Note that all fields in the

-.ZN XSizeHints

-structure are initially set to zero.

-If insufficient memory is available, 

-.ZN XAllocSizeHints

-returns NULL.

-To free the memory allocated to this structure,

-use

-.ZN XFree .

-.LP

-The 

-.ZN XSetWMNormalHints 

-function replaces the size hints for the WM_NORMAL_HINTS property 

-on the specified window.

-If the property does not already exist,

-.ZN XSetWMNormalHints

-sets the size hints for the WM_NORMAL_HINTS property on the specified window.

-The property is stored with a type of WM_SIZE_HINTS and a format of 32.

-.LP

-.ZN XSetWMNormalHints

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The 

-.ZN XGetWMNormalHints 

-function returns the size hints stored in the WM_NORMAL_HINTS property 

-on the specified window.

-If the property is of type WM_SIZE_HINTS, is of format 32,

-and is long enough to contain either an old (pre-ICCCM) 

-or new size hints structure, 

-.ZN XGetWMNormalHints

-sets the various fields of the 

-.ZN XSizeHints

-structure, sets the supplied_return argument to the list of fields 

-that were supplied by the user (whether or not they contained defined values),

-and returns a nonzero status.

-Otherwise, it returns a zero status.

-.LP

-If 

-.ZN XGetWMNormalHints

-returns successfully and a pre-ICCCM size hints property is read, 

-the supplied_return argument will contain the following bits:

-.LP

-.Ds

-(USPosition|USSize|PPosition|PSize|PMinSize|

- PMaxSize|PResizeInc|PAspect)

-.De

-.LP

-If the property is large enough to contain the base size 

-and window gravity fields as well, 

-the supplied_return argument will also contain the following bits:

-.LP

-.Ds

-PBaseSize|PWinGravity

-.De

-.LP

-.ZN XGetWMNormalHints

-can generate a

-PN BadWindow

-error.

-.LP

-The 

-.ZN XSetWMSizeHints 

-function replaces the size hints for the specified property 

-on the named window.

-If the specified property does not already exist,

-.ZN XSetWMSizeHints

-sets the size hints for the specified property

-on the named window.

-The property is stored with a type of WM_SIZE_HINTS and a format of 32.

-To set a window's normal size hints, 

-you can use the 

-.ZN XSetWMNormalHints

-function.

-.LP

-.ZN XSetWMSizeHints

-can generate

-.ZN BadAlloc ,

-.ZN BadAtom ,

-and

-.ZN BadWindow

-errors.

-.LP

-The 

-.ZN XGetWMSizeHints

-function returns the size hints stored in the specified property 

-on the named window.

-If the property is of type WM_SIZE_HINTS, is of format 32, 

-and is long enough to contain either an old (pre-ICCCM) 

-or new size hints structure, 

-.ZN XGetWMSizeHints

-sets the various fields of the 

-.ZN XSizeHints

-structure, sets the supplied_return argument to the

-list of fields that were supplied by the user 

-(whether or not they contained defined values), 

-and returns a nonzero status.

-Otherwise, it returns a zero status.

-To get a window's normal size hints, 

-you can use the 

-.ZN XGetWMNormalHints 

-function.

-.LP

-If 

-.ZN XGetWMSizeHints

-returns successfully and a pre-ICCCM size hints property is read, 

-the supplied_return argument will contain the following bits:

-.LP

-.Ds

-(USPosition|USSize|PPosition|PSize|PMinSize|

- PMaxSize|PResizeInc|PAspect)

-.De

-.LP

-If the property is large enough to contain the base size 

-and window gravity fields as well, 

-the supplied_return argument will also contain the following bits:

-.LP

-.Ds

-PBaseSize|PWinGravity

-.De

-.LP

-.ZN XGetWMSizeHints

-can generate

-.ZN BadAtom

-and

-.ZN BadWindow

-errors.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_NORMAL_HINTS\s+1

-Size hints for a window in its normal state.

-The C type of this property is

-.ZN XSizeHints .

-.SH STRUCTURES

-The

-.ZN XSizeHints

-structure contains:

-.LP

-/\&* Size hints mask bits */

-.TS

-lw(.5i) lw(1.1i) lw(1.5i) lw(3.1i).

-T{

-\&#define

-T}	T{

-.ZN USPosition

-T}	T{

-(1L << 0)

-T}	T{

-/\&* user specified x, y */

-T}

-T{

-\&#define

-T}	T{

-.ZN USSize

-T}	T{

-(1L << 1)

-T}	T{

-/\&* user specified width, height */

-T}

-T{

-\&#define

-T}	T{

-.ZN PPosition

-T}	T{

-(1L << 2)

-T}	T{

-/\&* program specified position */

-T}

-T{

-\&#define

-T}	T{

-.ZN PSize

-T}	T{

-(1L << 3)

-T}	T{

-/\&* program specified size */

-T}

-T{

-\&#define

-T}	T{

-.ZN PMinSize

-T}	T{

-(1L << 4)

-T}	T{

-/\&* program specified minimum size */

-T}

-T{

-\&#define

-T}	T{

-.ZN PMaxSize

-T}	T{

-(1L << 5)

-T}	T{

-/\&* program specified maximum size */

-T}

-T{

-\&#define

-T}	T{

-.ZN PResizeInc

-T}	T{

-(1L << 6)

-T}	T{

-/\&* program specified resize increments */

-T}

-T{

-\&#define

-T}	T{

-.ZN PAspect

-T}	T{

-(1L << 7)

-T}	T{

-/\&* program specified min and max aspect ratios */

-T}

-T{

-\&#define

-T}	T{

-.ZN PBaseSize

-T}	T{

-(1L << 8)

-T}

-T{

-\&#define

-T}	T{

-.ZN PWinGravity

-T}	T{

-(1L << 9)

-T}

-T{

-\&#define

-T}	T{

-.ZN PAllHints

-T}	T{

-(PPosition|PSize|

-.br

-PMinSize|PMaxSize|

-.br

-PResizeInc|PAspect)

-T}	T{

-T}

-.TE

-.IN "XSizeHints" "" "@DEF@"

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-/\&* Values */

-

-typedef struct {

-	long flags;	/\&* marks which fields in this structure are defined */

-	int x, y;	/\&* Obsolete */

-	int width, height;	/\&* Obsolete */

-	int min_width, min_height;

-	int max_width, max_height;

-	int width_inc, height_inc;

-	struct {

-	       int x;	/\&* numerator */

-	       int y;	/\&* denominator */

-	} min_aspect, max_aspect;

-	int base_width, base_height;

-	int win_gravity;

-	/\&* this structure may be extended in the future */

-} XSizeHints;

-.De

-.LP

-The x, y, width, and height members are now obsolete

-and are left solely for compatibility reasons.

-The min_width and min_height members specify the

-minimum window size that still allows the application to be useful.

-The max_width and max_height members specify the maximum window size.

-The width_inc and height_inc members define an arithmetic progression of

-sizes (minimum to maximum) into which the window prefers to be resized.

-The min_aspect and max_aspect members are expressed

-as ratios of x and y, 

-and they allow an application to specify the range of aspect

-ratios it prefers.

-The base_width and base_height members define the desired size of the window.

-The window manager will interpret the position of the window 

-and its border width to position the point of the outer rectangle 

-of the overall window specified by the win_gravity member.

-The outer rectangle of the window includes any borders or decorations

-supplied by the window manager.

-In other words,

-if the window manager decides to place the window where the client asked,

-the position on the parent window's border named by the win_gravity 

-will be placed where the client window would have been placed 

-in the absence of a window manager.

-.LP

-Note that use of the

-.ZN PAllHints

-macro is highly discouraged.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, 
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XAllocSizeHints __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocSizeHints, XSetWMNormalHints, XGetWMNormalHints, XSetWMSizeHints, XGetWMSizeHints, XSizeHints \- allocate size hints structure and set or read a window's WM_NORMAL_HINTS property
+.SH SYNTAX
+.HP
+XSizeHints *XAllocSizeHints\^(void\^);
+.HP
+void XSetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints *\fIhints\fP\^);
+.HP
+Status XGetWMNormalHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XSizeHints *\fIhints_return\fP, long *\fIsupplied_return\fP\^);
+.HP
+void XSetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints
+*\fIhints\fP, Atom \fIproperty\fP\^);
+.HP
+Status XGetWMSizeHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XSizeHints
+*\fIhints_return\fP, long *\fIsupplied_return\fP, Atom \fIproperty\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIhints\fP 1i
+Specifies the size hints for the window in its normal state.
+.IP \fIhints\fP 1i
+Specifies the
+.ZN XSizeHints
+structure to be used.
+.IP \fIhints_return\fP 1i
+Returns the size hints for the window in its normal state.
+.IP \fIproperty\fP 1i
+Specifies the property name.
+.IP \fIsupplied_return\fP 1i
+Returns the hints that were supplied by the user.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XAllocSizeHints
+function allocates and returns a pointer to a
+.ZN XSizeHints
+structure.
+Note that all fields in the
+.ZN XSizeHints
+structure are initially set to zero.
+If insufficient memory is available, 
+.ZN XAllocSizeHints
+returns NULL.
+To free the memory allocated to this structure,
+use
+.ZN XFree .
+.LP
+The 
+.ZN XSetWMNormalHints 
+function replaces the size hints for the WM_NORMAL_HINTS property 
+on the specified window.
+If the property does not already exist,
+.ZN XSetWMNormalHints
+sets the size hints for the WM_NORMAL_HINTS property on the specified window.
+The property is stored with a type of WM_SIZE_HINTS and a format of 32.
+.LP
+.ZN XSetWMNormalHints
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The 
+.ZN XGetWMNormalHints 
+function returns the size hints stored in the WM_NORMAL_HINTS property 
+on the specified window.
+If the property is of type WM_SIZE_HINTS, is of format 32,
+and is long enough to contain either an old (pre-ICCCM) 
+or new size hints structure, 
+.ZN XGetWMNormalHints
+sets the various fields of the 
+.ZN XSizeHints
+structure, sets the supplied_return argument to the list of fields 
+that were supplied by the user (whether or not they contained defined values),
+and returns a nonzero status.
+Otherwise, it returns a zero status.
+.LP
+If 
+.ZN XGetWMNormalHints
+returns successfully and a pre-ICCCM size hints property is read, 
+the supplied_return argument will contain the following bits:
+.LP
+.Ds
+(USPosition|USSize|PPosition|PSize|PMinSize|
+ PMaxSize|PResizeInc|PAspect)
+.De
+.LP
+If the property is large enough to contain the base size 
+and window gravity fields as well, 
+the supplied_return argument will also contain the following bits:
+.LP
+.Ds
+PBaseSize|PWinGravity
+.De
+.LP
+.ZN XGetWMNormalHints
+can generate a
+PN BadWindow
+error.
+.LP
+The 
+.ZN XSetWMSizeHints 
+function replaces the size hints for the specified property 
+on the named window.
+If the specified property does not already exist,
+.ZN XSetWMSizeHints
+sets the size hints for the specified property
+on the named window.
+The property is stored with a type of WM_SIZE_HINTS and a format of 32.
+To set a window's normal size hints, 
+you can use the 
+.ZN XSetWMNormalHints
+function.
+.LP
+.ZN XSetWMSizeHints
+can generate
+.ZN BadAlloc ,
+.ZN BadAtom ,
+and
+.ZN BadWindow
+errors.
+.LP
+The 
+.ZN XGetWMSizeHints
+function returns the size hints stored in the specified property 
+on the named window.
+If the property is of type WM_SIZE_HINTS, is of format 32, 
+and is long enough to contain either an old (pre-ICCCM) 
+or new size hints structure, 
+.ZN XGetWMSizeHints
+sets the various fields of the 
+.ZN XSizeHints
+structure, sets the supplied_return argument to the
+list of fields that were supplied by the user 
+(whether or not they contained defined values), 
+and returns a nonzero status.
+Otherwise, it returns a zero status.
+To get a window's normal size hints, 
+you can use the 
+.ZN XGetWMNormalHints 
+function.
+.LP
+If 
+.ZN XGetWMSizeHints
+returns successfully and a pre-ICCCM size hints property is read, 
+the supplied_return argument will contain the following bits:
+.LP
+.Ds
+(USPosition|USSize|PPosition|PSize|PMinSize|
+ PMaxSize|PResizeInc|PAspect)
+.De
+.LP
+If the property is large enough to contain the base size 
+and window gravity fields as well, 
+the supplied_return argument will also contain the following bits:
+.LP
+.Ds
+PBaseSize|PWinGravity
+.De
+.LP
+.ZN XGetWMSizeHints
+can generate
+.ZN BadAtom
+and
+.ZN BadWindow
+errors.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_NORMAL_HINTS\s+1
+Size hints for a window in its normal state.
+The C type of this property is
+.ZN XSizeHints .
+.SH STRUCTURES
+The
+.ZN XSizeHints
+structure contains:
+.LP
+/\&* Size hints mask bits */
+.TS
+lw(.5i) lw(1.1i) lw(1.5i) lw(3.1i).
+T{
+\&#define
+T}	T{
+.ZN USPosition
+T}	T{
+(1L << 0)
+T}	T{
+/\&* user specified x, y */
+T}
+T{
+\&#define
+T}	T{
+.ZN USSize
+T}	T{
+(1L << 1)
+T}	T{
+/\&* user specified width, height */
+T}
+T{
+\&#define
+T}	T{
+.ZN PPosition
+T}	T{
+(1L << 2)
+T}	T{
+/\&* program specified position */
+T}
+T{
+\&#define
+T}	T{
+.ZN PSize
+T}	T{
+(1L << 3)
+T}	T{
+/\&* program specified size */
+T}
+T{
+\&#define
+T}	T{
+.ZN PMinSize
+T}	T{
+(1L << 4)
+T}	T{
+/\&* program specified minimum size */
+T}
+T{
+\&#define
+T}	T{
+.ZN PMaxSize
+T}	T{
+(1L << 5)
+T}	T{
+/\&* program specified maximum size */
+T}
+T{
+\&#define
+T}	T{
+.ZN PResizeInc
+T}	T{
+(1L << 6)
+T}	T{
+/\&* program specified resize increments */
+T}
+T{
+\&#define
+T}	T{
+.ZN PAspect
+T}	T{
+(1L << 7)
+T}	T{
+/\&* program specified min and max aspect ratios */
+T}
+T{
+\&#define
+T}	T{
+.ZN PBaseSize
+T}	T{
+(1L << 8)
+T}
+T{
+\&#define
+T}	T{
+.ZN PWinGravity
+T}	T{
+(1L << 9)
+T}
+T{
+\&#define
+T}	T{
+.ZN PAllHints
+T}	T{
+(PPosition|PSize|
+.br
+PMinSize|PMaxSize|
+.br
+PResizeInc|PAspect)
+T}	T{
+T}
+.TE
+.IN "XSizeHints" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        long flags;     /\&* marks which fields in this structure are defined */
+        int x, y;       /\&* Obsolete */
+        int width, height;      /\&* Obsolete */
+        int min_width, min_height;
+        int max_width, max_height;
+        int width_inc, height_inc;
+        struct {
+               int x;   /\&* numerator */
+               int y;   /\&* denominator */
+        } min_aspect, max_aspect;
+        int base_width, base_height;
+        int win_gravity;
+        /\&* this structure may be extended in the future */
+} XSizeHints;
+.De
+.LP
+The x, y, width, and height members are now obsolete
+and are left solely for compatibility reasons.
+The min_width and min_height members specify the
+minimum window size that still allows the application to be useful.
+The max_width and max_height members specify the maximum window size.
+The width_inc and height_inc members define an arithmetic progression of
+sizes (minimum to maximum) into which the window prefers to be resized.
+The min_aspect and max_aspect members are expressed
+as ratios of x and y, 
+and they allow an application to specify the range of aspect
+ratios it prefers.
+The base_width and base_height members define the desired size of the window.
+The window manager will interpret the position of the window 
+and its border width to position the point of the outer rectangle 
+of the overall window specified by the win_gravity member.
+The outer rectangle of the window includes any borders or decorations
+supplied by the window manager.
+In other words,
+if the window manager decides to place the window where the client asked,
+the position on the parent window's border named by the win_gravity 
+will be placed where the client window would have been placed 
+in the absence of a window manager.
+.LP
+Note that use of the
+.ZN PAllHints
+macro is highly discouraged.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocStandardColormap.man b/libX11/man/XAllocStandardColormap.man
index f27b643a4..13cab682e 100644
--- a/libX11/man/XAllocStandardColormap.man
+++ b/libX11/man/XAllocStandardColormap.man
@@ -1,405 +1,338 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XAllocStandardColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocStandardColormap, XSetRGBColormaps, XGetRGBColormaps, XStandardColormap \- allocate, set, or read a standard colormap structure

-.SH SYNTAX

-.HP

-XStandardColormap *XAllocStandardColormap\^(void\^);

-.HP

-void XSetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,

-XStandardColormap *\fIstd_colormap\fP,

-int \fIcount\fP, Atom \fIproperty\fP\^);

-.HP

-Status XGetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,

-XStandardColormap **\fIstd_colormap_return\fP, int *\fIcount_return\fP,

-Atom \fIproperty\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Cn colormaps

-.IP \fIcount\fP 1i

-Specifies the number of \*(Cn.

-.ds Cn colormaps

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIproperty\fP 1i

-Specifies the property name.

-.IP \fIstd_colormap\fP 1i

-Specifies the

-.ZN XStandardColormap

-structure to be used.

-.IP \fIstd_colormap_return\fP 1i

-Returns the

-.ZN XStandardColormap

-structure.

-.SH DESCRIPTION

-The

-.ZN XAllocStandardColormap

-function allocates and returns a pointer to a

-.ZN XStandardColormap

-structure.

-Note that all fields in the

-.ZN XStandardColormap

-structure are initially set to zero.

-If insufficient memory is available, 

-.ZN XAllocStandardColormap

-returns NULL.

-To free the memory allocated to this structure,

-use

-.ZN XFree .

-.LP

-The 

-.ZN XSetRGBColormaps 

-function replaces the RGB colormap definition in the specified property 

-on the named window.

-If the property does not already exist,

-.ZN XSetRGBColormaps

-sets the RGB colormap definition in the specified property

-on the named window.

-The property is stored with a type of RGB_COLOR_MAP and a format of 32.

-Note that it is the caller's responsibility to honor the ICCCM

-restriction that only RGB_DEFAULT_MAP contain more than one definition.

-.LP

-The

-.ZN XSetRGBColormaps

-function usually is only used by window or session managers.

-To create a standard colormap, 

-follow this procedure:

-.IP 1. 5

-Open a new connection to the same server.

-.IP 2. 5

-Grab the server.

-.IP 3. 5

-See if the property is on the property list of the root window for the screen.

-.IP 4. 5

-If the desired property is not present:

-.RS

-.IP \(bu 5

-Create a colormap (unless you are using the default colormap of the screen).

-.IP \(bu 5

-Determine the color characteristics of the visual.

-.IP \(bu 5

-Allocate cells in the colormap (or create it with

-.ZN AllocAll ).

-.IP \(bu 5

-Call 

-.ZN XStoreColors

-to store appropriate color values in the colormap.

-.IP \(bu 5

-Fill in the descriptive members in the 

-.ZN XStandardColormap

-structure.

-.IP \(bu 5

-Attach the property to the root window.

-.IP \(bu 5

-Use

-.ZN XSetCloseDownMode

-to make the resource permanent.

-.RE

-.IP 5. 5

-Ungrab the server.

-.LP

-.ZN XSetRGBColormaps

-can generate

-.ZN BadAlloc ,

-.ZN BadAtom ,

-and

-.ZN BadWindow

-errors.

-.LP

-The 

-.ZN XGetRGBColormaps

-function returns the RGB colormap definitions stored 

-in the specified property on the named window.

-If the property exists, is of type RGB_COLOR_MAP, is of format 32, 

-and is long enough to contain a colormap definition,

-.ZN XGetRGBColormaps

-allocates and fills in space for the returned colormaps

-and returns a nonzero status.

-If the visualid is not present, 

-.ZN XGetRGBColormaps 

-assumes the default visual for the screen on which the window is located; 

-if the killid is not present, 

-.ZN None

-is assumed, which indicates that the resources cannot be released.

-Otherwise, 

-none of the fields are set, and 

-.ZN XGetRGBColormaps

-returns a zero status.

-Note that it is the caller's responsibility to honor the ICCCM

-restriction that only RGB_DEFAULT_MAP contain more than one definition.

-.LP

-.ZN XGetRGBColormaps

-can generate

-.ZN BadAtom

-and

-.ZN BadWindow

-errors.

-.SH STRUCTURES

-The

-.ZN XStandardColormap

-structure contains:

-.LP

-/\&* Hints */

-.TS

-lw(.5i) lw(2i) lw(1i).

-T{

-\&#define

-T}	T{

-.ZN ReleaseByFreeingColormap

-T}	T{

-( (XID) 1L)

-T}

-.TE

-/\&* Values */

-.IN "XStandardColormap" "" "@DEF@"

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	Colormap colormap;

-	unsigned long red_max;

-	unsigned long red_mult;

-	unsigned long green_max;

-	unsigned long green_mult;

-	unsigned long blue_max;

-	unsigned long blue_mult;

-	unsigned long base_pixel;

-	VisualID visualid;

-	XID killid;

-} XStandardColormap;

-.De

-.LP

-The colormap member is the colormap created by the

-.ZN XCreateColormap

-function.

-The red_max, green_max, and blue_max members give the maximum

-red, green, and blue values, respectively.  

-Each color coefficient ranges from zero to its max, inclusive.  

-For example,

-a common colormap allocation is 3/3/2 (3 planes for red, 3

-planes for green, and 2 planes for blue).  

-This colormap would have red_max = 7, green_max = 7, 

-and blue_max = 3.  

-An alternate allocation that uses only 216 colors is red_max = 5, 

-green_max = 5, and blue_max = 5.

-.LP

-The red_mult, green_mult, and blue_mult members give the

-scale factors used to compose a full pixel value. 

-(See the discussion of the base_pixel members for further information.)

-For a 3/3/2 allocation, red_mult might be 32,

-green_mult might be 4, and blue_mult might be 1.  

-For a 6-colors-each allocation, red_mult might be 36, 

-green_mult might be 6, and blue_mult might be 1.

-.LP

-The base_pixel member gives the base pixel value used to

-compose a full pixel value.  

-Usually, the base_pixel is obtained from a call to the 

-.ZN XAllocColorPlanes

-function.  

-Given integer red, green, and blue coefficients in their appropriate 

-ranges, one then can compute a corresponding pixel value by

-using the following expression:

-.LP

-.Ds

-.TA .5i 1.5i

-.ta .5i 1.5i

-(r * red_mult + g * green_mult + b * blue_mult + base_pixel) & 0xFFFFFFFF

-.De

-.LP

-For 

-.ZN GrayScale

-colormaps, 

-only the colormap, red_max, red_mult, 

-and base_pixel members are defined. 

-The other members are ignored.  

-To compute a 

-.ZN GrayScale 

-pixel value, use the following expression:

-.LP

-.Ds

-.TA .5i 1.5i

-.ta .5i 1.5i

-(gray * red_mult + base_pixel) & 0xFFFFFFFF

-.De

-.LP

-Negative multipliers can be represented by converting the 2's

-complement representation of the multiplier into an unsigned long and

-storing the result in the appropriate _mult field.

-The step of masking by 0xFFFFFFFF effectively converts the resulting

-positive multiplier into a negative one.

-The masking step will take place automatically on many machine architectures,

-depending on the size of the integer type used to do the computation,

-.LP

-The visualid member gives the ID number of the visual from which the

-colormap was created.

-The killid member gives a resource ID that indicates whether

-the cells held by this standard colormap are to be released 

-by freeing the colormap ID or by calling the

-.ZN XKillClient

-function on the indicated resource.

-(Note that this method is necessary for allocating out of an existing colormap.)

-.LP

-The properties containing the 

-.ZN XStandardColormap 

-information have 

-the type RGB_COLOR_MAP.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocColor(__libmansuffix__),

-XCreateColormap(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCloseDownMode(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XAllocStandardColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocStandardColormap, XSetRGBColormaps, XGetRGBColormaps, XStandardColormap \- allocate, set, or read a standard colormap structure
+.SH SYNTAX
+.HP
+XStandardColormap *XAllocStandardColormap\^(void\^);
+.HP
+void XSetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XStandardColormap *\fIstd_colormap\fP,
+int \fIcount\fP, Atom \fIproperty\fP\^);
+.HP
+Status XGetRGBColormaps\^(\^Display *\fIdisplay\fP, Window \fIw\fP,
+XStandardColormap **\fIstd_colormap_return\fP, int *\fIcount_return\fP,
+Atom \fIproperty\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Cn colormaps
+.IP \fIcount\fP 1i
+Specifies the number of \*(Cn.
+.ds Cn colormaps
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIproperty\fP 1i
+Specifies the property name.
+.IP \fIstd_colormap\fP 1i
+Specifies the
+.ZN XStandardColormap
+structure to be used.
+.IP \fIstd_colormap_return\fP 1i
+Returns the
+.ZN XStandardColormap
+structure.
+.SH DESCRIPTION
+The
+.ZN XAllocStandardColormap
+function allocates and returns a pointer to a
+.ZN XStandardColormap
+structure.
+Note that all fields in the
+.ZN XStandardColormap
+structure are initially set to zero.
+If insufficient memory is available, 
+.ZN XAllocStandardColormap
+returns NULL.
+To free the memory allocated to this structure,
+use
+.ZN XFree .
+.LP
+The 
+.ZN XSetRGBColormaps 
+function replaces the RGB colormap definition in the specified property 
+on the named window.
+If the property does not already exist,
+.ZN XSetRGBColormaps
+sets the RGB colormap definition in the specified property
+on the named window.
+The property is stored with a type of RGB_COLOR_MAP and a format of 32.
+Note that it is the caller's responsibility to honor the ICCCM
+restriction that only RGB_DEFAULT_MAP contain more than one definition.
+.LP
+The
+.ZN XSetRGBColormaps
+function usually is only used by window or session managers.
+To create a standard colormap, 
+follow this procedure:
+.IP 1. 5
+Open a new connection to the same server.
+.IP 2. 5
+Grab the server.
+.IP 3. 5
+See if the property is on the property list of the root window for the screen.
+.IP 4. 5
+If the desired property is not present:
+.RS
+.IP \(bu 5
+Create a colormap (unless you are using the default colormap of the screen).
+.IP \(bu 5
+Determine the color characteristics of the visual.
+.IP \(bu 5
+Allocate cells in the colormap (or create it with
+.ZN AllocAll ).
+.IP \(bu 5
+Call 
+.ZN XStoreColors
+to store appropriate color values in the colormap.
+.IP \(bu 5
+Fill in the descriptive members in the 
+.ZN XStandardColormap
+structure.
+.IP \(bu 5
+Attach the property to the root window.
+.IP \(bu 5
+Use
+.ZN XSetCloseDownMode
+to make the resource permanent.
+.RE
+.IP 5. 5
+Ungrab the server.
+.LP
+.ZN XSetRGBColormaps
+can generate
+.ZN BadAlloc ,
+.ZN BadAtom ,
+and
+.ZN BadWindow
+errors.
+.LP
+The 
+.ZN XGetRGBColormaps
+function returns the RGB colormap definitions stored 
+in the specified property on the named window.
+If the property exists, is of type RGB_COLOR_MAP, is of format 32, 
+and is long enough to contain a colormap definition,
+.ZN XGetRGBColormaps
+allocates and fills in space for the returned colormaps
+and returns a nonzero status.
+If the visualid is not present, 
+.ZN XGetRGBColormaps 
+assumes the default visual for the screen on which the window is located; 
+if the killid is not present, 
+.ZN None
+is assumed, which indicates that the resources cannot be released.
+Otherwise, 
+none of the fields are set, and 
+.ZN XGetRGBColormaps
+returns a zero status.
+Note that it is the caller's responsibility to honor the ICCCM
+restriction that only RGB_DEFAULT_MAP contain more than one definition.
+.LP
+.ZN XGetRGBColormaps
+can generate
+.ZN BadAtom
+and
+.ZN BadWindow
+errors.
+.SH STRUCTURES
+The
+.ZN XStandardColormap
+structure contains:
+.LP
+/\&* Hints */
+.TS
+lw(.5i) lw(2i) lw(1i).
+T{
+\&#define
+T}	T{
+.ZN ReleaseByFreeingColormap
+T}	T{
+( (XID) 1L)
+T}
+.TE
+/\&* Values */
+.IN "XStandardColormap" "" "@DEF@"
+.Ds 0
+typedef struct {
+        Colormap colormap;
+        unsigned long red_max;
+        unsigned long red_mult;
+        unsigned long green_max;
+        unsigned long green_mult;
+        unsigned long blue_max;
+        unsigned long blue_mult;
+        unsigned long base_pixel;
+        VisualID visualid;
+        XID killid;
+} XStandardColormap;
+.De
+.LP
+The colormap member is the colormap created by the
+.ZN XCreateColormap
+function.
+The red_max, green_max, and blue_max members give the maximum
+red, green, and blue values, respectively.  
+Each color coefficient ranges from zero to its max, inclusive.  
+For example,
+a common colormap allocation is 3/3/2 (3 planes for red, 3
+planes for green, and 2 planes for blue).  
+This colormap would have red_max = 7, green_max = 7, 
+and blue_max = 3.  
+An alternate allocation that uses only 216 colors is red_max = 5, 
+green_max = 5, and blue_max = 5.
+.LP
+The red_mult, green_mult, and blue_mult members give the
+scale factors used to compose a full pixel value. 
+(See the discussion of the base_pixel members for further information.)
+For a 3/3/2 allocation, red_mult might be 32,
+green_mult might be 4, and blue_mult might be 1.  
+For a 6-colors-each allocation, red_mult might be 36, 
+green_mult might be 6, and blue_mult might be 1.
+.LP
+The base_pixel member gives the base pixel value used to
+compose a full pixel value.  
+Usually, the base_pixel is obtained from a call to the 
+.ZN XAllocColorPlanes
+function.  
+Given integer red, green, and blue coefficients in their appropriate 
+ranges, one then can compute a corresponding pixel value by
+using the following expression:
+.LP
+.Ds
+(r * red_mult + g * green_mult + b * blue_mult + base_pixel) & 0xFFFFFFFF
+.De
+.LP
+For 
+.ZN GrayScale
+colormaps, 
+only the colormap, red_max, red_mult, 
+and base_pixel members are defined. 
+The other members are ignored.  
+To compute a 
+.ZN GrayScale 
+pixel value, use the following expression:
+.LP
+.Ds
+(gray * red_mult + base_pixel) & 0xFFFFFFFF
+.De
+.LP
+Negative multipliers can be represented by converting the 2's
+complement representation of the multiplier into an unsigned long and
+storing the result in the appropriate _mult field.
+The step of masking by 0xFFFFFFFF effectively converts the resulting
+positive multiplier into a negative one.
+The masking step will take place automatically on many machine architectures,
+depending on the size of the integer type used to do the computation,
+.LP
+The visualid member gives the ID number of the visual from which the
+colormap was created.
+The killid member gives a resource ID that indicates whether
+the cells held by this standard colormap are to be released 
+by freeing the colormap ID or by calling the
+.ZN XKillClient
+function on the indicated resource.
+(Note that this method is necessary for allocating out of an existing colormap.)
+.LP
+The properties containing the 
+.ZN XStandardColormap 
+information have 
+the type RGB_COLOR_MAP.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCloseDownMode(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllocWMHints.man b/libX11/man/XAllocWMHints.man
index 8e83209e2..f871c36e3 100644
--- a/libX11/man/XAllocWMHints.man
+++ b/libX11/man/XAllocWMHints.man
@@ -1,416 +1,353 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol, 1991. 

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XAllocWMHints __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllocWMHints, XSetWMHints, XGetWMHints, XWMHints \- allocate window manager hints structure and set or read a window's WM_HINTS property

-.SH SYNTAX

-.HP

-XWMHints *XAllocWMHints\^(void\^); 

-.HP

-int XSetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XWMHints *\fIwmhints\fP\^);

-.HP

-XWMHints *XGetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIwmhints\fP 1i

-Specifies the 

-.ZN XWMHints

-structure to be used.

-.SH DESCRIPTION

-The

-.ZN XAllocWMHints

-function allocates and returns a pointer to a

-.ZN XWMHints

-structure.

-Note that all fields in the

-.ZN XWMHints

-structure are initially set to zero.

-If insufficient memory is available, 

-.ZN XAllocWMHints

-returns NULL.

-To free the memory allocated to this structure,

-use

-.ZN XFree .

-.LP

-The

-.ZN XSetWMHints

-function sets the window manager hints that include icon information and location,

-the initial state of the window, and whether the application relies on the

-window manager to get keyboard input.

-.LP

-.ZN XSetWMHints

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetWMHints

-function reads the window manager hints and 

-returns NULL if no WM_HINTS property was set on the window 

-or returns a pointer to a 

-.ZN XWMHints 

-structure if it succeeds.

-When finished with the data,

-free the space used for it by calling

-.ZN XFree .

-.LP

-.ZN XGetWMHints

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_HINTS\s+1

-Additional hints set by the client for use by the window manager.

-The C type of this property is 

-.ZN XWMHints .

-.SH STRUCTURES

-The

-.ZN XWMHints

-structure contains:

-.LP

-/\&* Window manager hints mask bits */

-.TS

-lw(.5i) lw(2.5i) lw(2.5i).

-T{

-\&#define

-T}	T{

-.ZN InputHint

-T}	T{

-(1L << 0)

-T}

-T{

-\&#define

-T}	T{

-.ZN StateHint

-T}	T{

-(1L << 1)

-T}

-T{

-\&#define

-T}	T{

-.ZN IconPixmapHint

-T}	T{

-(1L << 2)

-T}

-T{

-\&#define

-T}	T{

-.ZN IconWindowHint

-T}	T{

-(1L << 3)

-T}

-T{

-\&#define

-T}	T{

-.ZN IconPositionHint

-T}	T{

-(1L << 4)

-T}

-T{

-\&#define

-T}	T{

-.ZN IconMaskHint

-T}	T{

-(1L << 5)

-T}

-T{

-\&#define

-T}	T{

-.ZN WindowGroupHint

-T}	T{

-(1L << 6)

-T}

-T{

-\&#define

-T}	T{

-.ZN XUrgencyHint

-T}	T{

-(1L << 8)

-T}

-T{

-\&#define

-T}	T{

-.ZN AllHints

-T}	T{

-(InputHint|StateHint|IconPixmapHint|

-.br

-IconWindowHint|IconPositionHint|

-.br

-IconMaskHint|WindowGroupHint)

-T}

-.TE

-.IN "XWMHints" "" "@DEF@"

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-/\&* Values */

-

-typedef struct {

-	long flags;	/\&* marks which fields in this structure are defined */

-	Bool input;	/\&* does this application rely on the window manager to

-			get keyboard input? */

-	int initial_state;	/\&* see below */

-	Pixmap icon_pixmap;	/\&* pixmap to be used as icon */

-	Window icon_window;	/\&* window to be used as icon */

-	int icon_x, icon_y;	/\&* initial position of icon */

-	Pixmap icon_mask;	/\&* pixmap to be used as mask for icon_pixmap */

-	XID window_group;	/\&* id of related window group */

-	/\&* this structure may be extended in the future */

-} XWMHints;

-.De

-.LP

-The input member is used to communicate to the window manager the input focus

-model used by the application.

-Applications that expect input but never explicitly set focus to any 

-of their subwindows (that is, use the push model of focus management), 

-such as X Version 10 style applications that use real-estate

-driven focus, should set this member to 

-.ZN True .  

-Similarly, applications

-that set input focus to their subwindows only when it is given to their

-top-level window by a window manager should also set this member to 

-.ZN True .

-Applications that manage their own input focus by explicitly setting

-focus to one of their subwindows whenever they want keyboard input 

-(that is, use the pull model of focus management) should set this member to 

-.ZN False .

-Applications that never expect any keyboard input also should set this member

-to 

-.ZN False .

-.LP

-Pull model window managers should make it possible for push model

-applications to get input by setting input focus to the top-level windows of

-applications whose input member is 

-.ZN True .  

-Push model window managers should

-make sure that pull model applications do not break them 

-by resetting input focus to 

-.ZN PointerRoot 

-when it is appropriate (for example, whenever an application whose

-input member is 

-.ZN False 

-sets input focus to one of its subwindows).

-.LP

-The definitions for the initial_state flag are:

-.TS

-lw(.5i) lw(2i) lw(.2i) lw(2.8i).

-T{

-\&#define

-T}	T{

-.ZN WithdrawnState

-T}	T{

-0

-T}	T{

-T}

-T{

-\&#define

-T}	T{

-.ZN NormalState

-T}	T{

-1

-T}	T{

-/\&* most applications start this way */

-T}

-T{

-\&#define

-T}	T{

-.ZN IconicState

-T}	T{

-3

-T}	T{

-/\&* application wants to start as an icon */

-T}

-.TE

-The icon_mask specifies which pixels of the icon_pixmap should be used as the

-icon.  

-This allows for nonrectangular icons.

-Both icon_pixmap and icon_mask must be bitmaps.

-The icon_window lets an application provide a window for use as an icon

-for window managers that support such use.

-The window_group lets you specify that this window belongs to a group

-of other windows.

-For example, if a single application manipulates multiple 

-top-level windows, this allows you to provide enough

-information that a window manager can iconify all of the windows

-rather than just the one window.

-.LP

-The

-.ZN UrgencyHint

-flag, if set in the flags field, indicates that the client deems the window

-contents to be urgent, requiring the timely response of the user.  The

-window manager will make some effort to draw the user's attention to this

-window while this flag is set.  The client must provide some means by which the

-user can cause the urgency flag to be cleared (either mitigating

-the condition that made the window urgent or merely shutting off the alarm)

-or the window to be withdrawn.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol, 1991. 
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XAllocWMHints __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllocWMHints, XSetWMHints, XGetWMHints, XWMHints \- allocate window manager hints structure and set or read a window's WM_HINTS property
+.SH SYNTAX
+.HP
+XWMHints *XAllocWMHints\^(void\^); 
+.HP
+int XSetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP, XWMHints *\fIwmhints\fP\^);
+.HP
+XWMHints *XGetWMHints\^(\^Display *\fIdisplay\fP, Window \fIw\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwmhints\fP 1i
+Specifies the 
+.ZN XWMHints
+structure to be used.
+.SH DESCRIPTION
+The
+.ZN XAllocWMHints
+function allocates and returns a pointer to a
+.ZN XWMHints
+structure.
+Note that all fields in the
+.ZN XWMHints
+structure are initially set to zero.
+If insufficient memory is available, 
+.ZN XAllocWMHints
+returns NULL.
+To free the memory allocated to this structure,
+use
+.ZN XFree .
+.LP
+The
+.ZN XSetWMHints
+function sets the window manager hints that include icon information and location,
+the initial state of the window, and whether the application relies on the
+window manager to get keyboard input.
+.LP
+.ZN XSetWMHints
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetWMHints
+function reads the window manager hints and 
+returns NULL if no WM_HINTS property was set on the window 
+or returns a pointer to a 
+.ZN XWMHints 
+structure if it succeeds.
+When finished with the data,
+free the space used for it by calling
+.ZN XFree .
+.LP
+.ZN XGetWMHints
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_HINTS\s+1
+Additional hints set by the client for use by the window manager.
+The C type of this property is 
+.ZN XWMHints .
+.SH STRUCTURES
+The
+.ZN XWMHints
+structure contains:
+.LP
+/\&* Window manager hints mask bits */
+.TS
+lw(.5i) lw(2.5i) lw(2.5i).
+T{
+\&#define
+T}	T{
+.ZN InputHint
+T}	T{
+(1L << 0)
+T}
+T{
+\&#define
+T}	T{
+.ZN StateHint
+T}	T{
+(1L << 1)
+T}
+T{
+\&#define
+T}	T{
+.ZN IconPixmapHint
+T}	T{
+(1L << 2)
+T}
+T{
+\&#define
+T}	T{
+.ZN IconWindowHint
+T}	T{
+(1L << 3)
+T}
+T{
+\&#define
+T}	T{
+.ZN IconPositionHint
+T}	T{
+(1L << 4)
+T}
+T{
+\&#define
+T}	T{
+.ZN IconMaskHint
+T}	T{
+(1L << 5)
+T}
+T{
+\&#define
+T}	T{
+.ZN WindowGroupHint
+T}	T{
+(1L << 6)
+T}
+T{
+\&#define
+T}	T{
+.ZN XUrgencyHint
+T}	T{
+(1L << 8)
+T}
+T{
+\&#define
+T}	T{
+.ZN AllHints
+T}	T{
+(InputHint|StateHint|IconPixmapHint|
+.br
+IconWindowHint|IconPositionHint|
+.br
+IconMaskHint|WindowGroupHint)
+T}
+.TE
+.IN "XWMHints" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        long flags;     /\&* marks which fields in this structure are defined */
+        Bool input;     /\&* does this application rely on the window manager to
+                        get keyboard input? */
+        int initial_state;      /\&* see below */
+        Pixmap icon_pixmap;     /\&* pixmap to be used as icon */
+        Window icon_window;     /\&* window to be used as icon */
+        int icon_x, icon_y;     /\&* initial position of icon */
+        Pixmap icon_mask;       /\&* pixmap to be used as mask for icon_pixmap */
+        XID window_group;       /\&* id of related window group */
+        /\&* this structure may be extended in the future */
+} XWMHints;
+.De
+.LP
+The input member is used to communicate to the window manager the input focus
+model used by the application.
+Applications that expect input but never explicitly set focus to any 
+of their subwindows (that is, use the push model of focus management), 
+such as X Version 10 style applications that use real-estate
+driven focus, should set this member to 
+.ZN True .  
+Similarly, applications
+that set input focus to their subwindows only when it is given to their
+top-level window by a window manager should also set this member to 
+.ZN True .
+Applications that manage their own input focus by explicitly setting
+focus to one of their subwindows whenever they want keyboard input 
+(that is, use the pull model of focus management) should set this member to 
+.ZN False .
+Applications that never expect any keyboard input also should set this member
+to 
+.ZN False .
+.LP
+Pull model window managers should make it possible for push model
+applications to get input by setting input focus to the top-level windows of
+applications whose input member is 
+.ZN True .  
+Push model window managers should
+make sure that pull model applications do not break them 
+by resetting input focus to 
+.ZN PointerRoot 
+when it is appropriate (for example, whenever an application whose
+input member is 
+.ZN False 
+sets input focus to one of its subwindows).
+.LP
+The definitions for the initial_state flag are:
+.TS
+lw(.5i) lw(2i) lw(.2i) lw(2.8i).
+T{
+\&#define
+T}	T{
+.ZN WithdrawnState
+T}	T{
+0
+T}	T{
+T}
+T{
+\&#define
+T}	T{
+.ZN NormalState
+T}	T{
+1
+T}	T{
+/\&* most applications start this way */
+T}
+T{
+\&#define
+T}	T{
+.ZN IconicState
+T}	T{
+3
+T}	T{
+/\&* application wants to start as an icon */
+T}
+.TE
+The icon_mask specifies which pixels of the icon_pixmap should be used as the
+icon.  
+This allows for nonrectangular icons.
+Both icon_pixmap and icon_mask must be bitmaps.
+The icon_window lets an application provide a window for use as an icon
+for window managers that support such use.
+The window_group lets you specify that this window belongs to a group
+of other windows.
+For example, if a single application manipulates multiple 
+top-level windows, this allows you to provide enough
+information that a window manager can iconify all of the windows
+rather than just the one window.
+.LP
+The
+.ZN UrgencyHint
+flag, if set in the flags field, indicates that the client deems the window
+contents to be urgent, requiring the timely response of the user.  The
+window manager will make some effort to draw the user's attention to this
+window while this flag is set.  The client must provide some means by which the
+user can cause the urgency flag to be cleared (either mitigating
+the condition that made the window urgent or merely shutting off the alarm)
+or the window to be withdrawn.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XAllowEvents.man b/libX11/man/XAllowEvents.man
index 05f6360ad..cecb0066f 100644
--- a/libX11/man/XAllowEvents.man
+++ b/libX11/man/XAllowEvents.man
@@ -1,189 +1,128 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAllowEvents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAllowEvents \- release queued events

-.SH SYNTAX

-.HP

-int XAllowEvents\^(\^Display *\fIdisplay\fP, int \fIevent_mode\fP\^,

-Time \fItime\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mode\fP 1i

-Specifies the event mode.

-You can pass 

-.ZN AsyncPointer , 

-.ZN SyncPointer , 

-.ZN AsyncKeyboard , 

-.ZN SyncKeyboard ,

-.ZN ReplayPointer , 

-.ZN ReplayKeyboard ,

-.ZN AsyncBoth ,

-or

-.ZN SyncBoth .

-.IP \fItime\fP 1i

-Specifies the time.

-You can pass either a timestamp or

-.ZN CurrentTime .

-.SH DESCRIPTION

-The

-.ZN XAllowEvents

-function releases some queued events if the client has caused a device 

-to freeze.

-It has no effect if the specified time is earlier than the last-grab

-time of the most recent active grab for the client or if the specified time

-is later than the current X server time.

-.LP

-.ZN XAllowEvents

-can generate a

-.ZN BadValue 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAllowEvents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAllowEvents \- release queued events
+.SH SYNTAX
+.HP
+int XAllowEvents\^(\^Display *\fIdisplay\fP, int \fIevent_mode\fP\^,
+Time \fItime\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mode\fP 1i
+Specifies the event mode.
+You can pass 
+.ZN AsyncPointer , 
+.ZN SyncPointer , 
+.ZN AsyncKeyboard , 
+.ZN SyncKeyboard ,
+.ZN ReplayPointer , 
+.ZN ReplayKeyboard ,
+.ZN AsyncBoth ,
+or
+.ZN SyncBoth .
+.IP \fItime\fP 1i
+Specifies the time.
+You can pass either a timestamp or
+.ZN CurrentTime .
+.SH DESCRIPTION
+The
+.ZN XAllowEvents
+function releases some queued events if the client has caused a device 
+to freeze.
+It has no effect if the specified time is earlier than the last-grab
+time of the most recent active grab for the client or if the specified time
+is later than the current X server time.
+.LP
+.ZN XAllowEvents
+can generate a
+.ZN BadValue 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XAnyEvent.man b/libX11/man/XAnyEvent.man
index e870524bc..651be4263 100644
--- a/libX11/man/XAnyEvent.man
+++ b/libX11/man/XAnyEvent.man
@@ -1,271 +1,206 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XAnyEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XAnyEvent, XEvent \- generic X event structures

-.SH STRUCTURES

-All the event structures declared in 

-.Pn < X11/Xlib.h >

-have the following common members:

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-} XAnyEvent;

-.De

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The

-.ZN XEvent

-structure is a union of the individual structures declared for each event type:

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef union _XEvent {

-	int type;	/\&* must not be changed */

-	XAnyEvent xany;

-	XKeyEvent xkey;

-	XButtonEvent xbutton;

-	XMotionEvent xmotion;

-	XCrossingEvent xcrossing;

-	XFocusChangeEvent xfocus;

-	XExposeEvent xexpose;

-	XGraphicsExposeEvent xgraphicsexpose;

-	XNoExposeEvent xnoexpose;

-	XVisibilityEvent xvisibility;

-	XCreateWindowEvent xcreatewindow;

-	XDestroyWindowEvent xdestroywindow;

-	XUnmapEvent xunmap;

-	XMapEvent xmap;

-	XMapRequestEvent xmaprequest;

-	XReparentEvent xreparent;

-	XConfigureEvent xconfigure;

-	XGravityEvent xgravity;

-	XResizeRequestEvent xresizerequest;

-	XConfigureRequestEvent xconfigurerequest;

-	XCirculateEvent xcirculate;

-	XCirculateRequestEvent xcirculaterequest;

-	XPropertyEvent xproperty;

-	XSelectionClearEvent xselectionclear;

-	XSelectionRequestEvent xselectionrequest;

-	XSelectionEvent xselection;

-	XColormapEvent xcolormap;

-	XClientMessageEvent xclient;

-	XMappingEvent xmapping;

-	XErrorEvent xerror;

-	XKeymapEvent xkeymap;

-	long pad[24];

-} XEvent;

-.De

-.LP

-An

-.ZN XEvent

-structure's first entry always is the type member,

-which is set to the event type.

-The second member always is the serial number of the protocol request

-that generated the event.

-The third member always is send_event,

-which is a

-.ZN Bool

-that indicates if the event was sent by a different client.

-The fourth member always is a display,

-which is the display that the event was read from.

-Except for keymap events,

-the fifth member always is a window,

-which has been carefully selected to be useful to toolkit dispatchers.

-To avoid breaking toolkits,

-the order of these first five entries is not to change.

-Most events also contain a time member,

-which is the time at which an event occurred.

-In addition, a pointer to the generic event must be cast before it

-is used to access any other information in the structure.

-.SH "SEE ALSO"

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XAnyEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XAnyEvent, XEvent \- generic X event structures
+.SH STRUCTURES
+All the event structures declared in 
+.Pn < X11/Xlib.h >
+have the following common members:
+.Ds 0
+typedef struct {
+        int type;
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+} XAnyEvent;
+.De
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The
+.ZN XEvent
+structure is a union of the individual structures declared for each event type:
+.Ds 0
+typedef union _XEvent {
+        int type;       /\&* must not be changed */
+        XAnyEvent xany;
+        XKeyEvent xkey;
+        XButtonEvent xbutton;
+        XMotionEvent xmotion;
+        XCrossingEvent xcrossing;
+        XFocusChangeEvent xfocus;
+        XExposeEvent xexpose;
+        XGraphicsExposeEvent xgraphicsexpose;
+        XNoExposeEvent xnoexpose;
+        XVisibilityEvent xvisibility;
+        XCreateWindowEvent xcreatewindow;
+        XDestroyWindowEvent xdestroywindow;
+        XUnmapEvent xunmap;
+        XMapEvent xmap;
+        XMapRequestEvent xmaprequest;
+        XReparentEvent xreparent;
+        XConfigureEvent xconfigure;
+        XGravityEvent xgravity;
+        XResizeRequestEvent xresizerequest;
+        XConfigureRequestEvent xconfigurerequest;
+        XCirculateEvent xcirculate;
+        XCirculateRequestEvent xcirculaterequest;
+        XPropertyEvent xproperty;
+        XSelectionClearEvent xselectionclear;
+        XSelectionRequestEvent xselectionrequest;
+        XSelectionEvent xselection;
+        XColormapEvent xcolormap;
+        XClientMessageEvent xclient;
+        XMappingEvent xmapping;
+        XErrorEvent xerror;
+        XKeymapEvent xkeymap;
+        long pad[24];
+} XEvent;
+.De
+.LP
+An
+.ZN XEvent
+structure's first entry always is the type member,
+which is set to the event type.
+The second member always is the serial number of the protocol request
+that generated the event.
+The third member always is send_event,
+which is a
+.ZN Bool
+that indicates if the event was sent by a different client.
+The fourth member always is a display,
+which is the display that the event was read from.
+Except for keymap events,
+the fifth member always is a window,
+which has been carefully selected to be useful to toolkit dispatchers.
+To avoid breaking toolkits,
+the order of these first five entries is not to change.
+Most events also contain a time member,
+which is the time at which an event occurred.
+In addition, a pointer to the generic event must be cast before it
+is used to access any other information in the structure.
+.SH "SEE ALSO"
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XButtonEvent.man b/libX11/man/XButtonEvent.man
index b115c7ef7..14a8bc6a7 100644
--- a/libX11/man/XButtonEvent.man
+++ b/libX11/man/XButtonEvent.man
@@ -1,355 +1,288 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XButtonEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XButtonEvent, XKeyEvent, XMotionEvent \- KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify event structures

-.SH STRUCTURES

-The structures for

-.ZN KeyPress ,

-.ZN KeyRelease ,

-.ZN ButtonPress ,

-.ZN ButtonRelease ,

-and

-.ZN MotionNotify

-events contain:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ButtonPress or ButtonRelease */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* ``event'' window it is reported relative to */

-	Window root;	/\&* root window that the event occurred on */

-	Window subwindow;	/\&* child window */

-	Time time;	/\&* milliseconds */

-	int x, y;	/\&* pointer x, y coordinates in event window */

-	int x_root, y_root;	/\&* coordinates relative to root */

-	unsigned int state;	/\&* key or button mask */

-	unsigned int button;	/\&* detail */

-	Bool same_screen;	/\&* same screen flag */

-} XButtonEvent;

-typedef XButtonEvent XButtonPressedEvent;

-typedef XButtonEvent XButtonReleasedEvent;

-.De

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* KeyPress or KeyRelease */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* ``event'' window it is reported relative to */

-	Window root;	/\&* root window that the event occurred on */

-	Window subwindow;	/\&* child window */

-	Time time;	/\&* milliseconds */

-	int x, y;	/\&* pointer x, y coordinates in event window */

-	int x_root, y_root;	/\&* coordinates relative to root */

-	unsigned int state;	/\&* key or button mask */

-	unsigned int keycode;	/\&* detail */

-	Bool same_screen;	/\&* same screen flag */

-} XKeyEvent;

-typedef XKeyEvent XKeyPressedEvent;

-typedef XKeyEvent XKeyReleasedEvent;

-.De

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* MotionNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* ``event'' window reported relative to */

-	Window root;	/\&* root window that the event occurred on */

-	Window subwindow;	/\&* child window */

-	Time time;	/\&* milliseconds */

-	int x, y;	/\&* pointer x, y coordinates in event window */

-	int x_root, y_root;	/\&* coordinates relative to root */

-	unsigned int state;	/\&* key or button mask */

-	char is_hint;	/\&* detail */

-	Bool same_screen;	/\&* same screen flag */

-} XMotionEvent;

-typedef XMotionEvent XPointerMovedEvent;

-.De

-.LP

-When you receive these events,

-their structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-These structures have the following common members:

-window, root, subwindow, time, x, y, x_root, y_root, state, and same_screen.

-The window member is set to the window on which the

-event was generated and is referred to as the event window. 

-As long as the conditions previously discussed are met,

-this is the window used by the X server to report the event.

-The root member is set to the source window's root window.

-The x_root and y_root members are set to the pointer's coordinates

-relative to the root window's origin at the time of the event.

-.LP

-The same_screen member is set to indicate whether the event 

-window is on the same screen

-as the root window and can be either

-.ZN True 

-or

-.ZN False .

-If

-.ZN True ,

-the event and root windows are on the same screen.

-If

-.ZN False ,

-the event and root windows are not on the same screen.

-.LP

-If the source window is an inferior of the event window, 

-the subwindow member of the structure is set to the child of the event window

-that is the source window or the child of the event window that is

-an ancestor of the source window.

-Otherwise, the X server sets the subwindow member to

-.ZN None .

-The time member is set to the time when the event was generated 

-and is expressed in milliseconds.

-.LP

-If the event window is on the same screen as the root window, 

-the x and y members

-are set to the coordinates relative to the event window's origin.

-Otherwise, these members are set to zero.

-.LP

-The state member is set to indicate the logical state of the pointer buttons 

-and modifier keys just prior to the event,

-which is the bitwise inclusive OR of one or more of the

-button or modifier key masks:

-.ZN Button1Mask ,

-.ZN Button2Mask ,

-.ZN Button3Mask ,

-.ZN Button4Mask ,

-.ZN Button5Mask ,

-.ZN ShiftMask ,

-.ZN LockMask ,

-.ZN ControlMask ,

-.ZN Mod1Mask ,

-.ZN Mod2Mask ,

-.ZN Mod3Mask ,

-.ZN Mod4Mask ,

-and

-.ZN Mod5Mask .

-.LP

-Each of these structures also has a member that indicates the detail.

-For the

-.ZN XKeyPressedEvent

-and

-.ZN XKeyReleasedEvent

-structures, this member is called a keycode.

-It is set to a number that represents a physical key on the keyboard.

-The keycode is an arbitrary representation for any key on the keyboard

-(see sections 12.7 and 16.1).

-.LP

-For the

-.ZN XButtonPressedEvent

-and

-.ZN XButtonReleasedEvent

-structures, this member is called button.

-It represents the pointer button that changed state and can be the

-.ZN Button1 ,

-.ZN Button2 ,

-.ZN Button3 ,

-.ZN Button4 ,

-or

-.ZN Button5 

-value.

-For the

-.ZN XPointerMovedEvent

-structure, this member is called is_hint.

-It can be set to 

-.ZN NotifyNormal

-or

-.ZN NotifyHint .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XButtonEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XButtonEvent, XKeyEvent, XMotionEvent \- KeyPress, KeyRelease, ButtonPress, ButtonRelease, and MotionNotify event structures
+.SH STRUCTURES
+The structures for
+.ZN KeyPress ,
+.ZN KeyRelease ,
+.ZN ButtonPress ,
+.ZN ButtonRelease ,
+and
+.ZN MotionNotify
+events contain:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ButtonPress or ButtonRelease */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* ``event'' window it is reported relative to */
+        Window root;    /\&* root window that the event occurred on */
+        Window subwindow;       /\&* child window */
+        Time time;      /\&* milliseconds */
+        int x, y;       /\&* pointer x, y coordinates in event window */
+        int x_root, y_root;     /\&* coordinates relative to root */
+        unsigned int state;     /\&* key or button mask */
+        unsigned int button;    /\&* detail */
+        Bool same_screen;       /\&* same screen flag */
+} XButtonEvent;
+typedef XButtonEvent XButtonPressedEvent;
+typedef XButtonEvent XButtonReleasedEvent;
+.De
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* KeyPress or KeyRelease */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* ``event'' window it is reported relative to */
+        Window root;    /\&* root window that the event occurred on */
+        Window subwindow;       /\&* child window */
+        Time time;      /\&* milliseconds */
+        int x, y;       /\&* pointer x, y coordinates in event window */
+        int x_root, y_root;     /\&* coordinates relative to root */
+        unsigned int state;     /\&* key or button mask */
+        unsigned int keycode;   /\&* detail */
+        Bool same_screen;       /\&* same screen flag */
+} XKeyEvent;
+typedef XKeyEvent XKeyPressedEvent;
+typedef XKeyEvent XKeyReleasedEvent;
+.De
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* MotionNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* ``event'' window reported relative to */
+        Window root;    /\&* root window that the event occurred on */
+        Window subwindow;       /\&* child window */
+        Time time;      /\&* milliseconds */
+        int x, y;       /\&* pointer x, y coordinates in event window */
+        int x_root, y_root;     /\&* coordinates relative to root */
+        unsigned int state;     /\&* key or button mask */
+        char is_hint;   /\&* detail */
+        Bool same_screen;       /\&* same screen flag */
+} XMotionEvent;
+typedef XMotionEvent XPointerMovedEvent;
+.De
+.LP
+When you receive these events,
+their structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+These structures have the following common members:
+window, root, subwindow, time, x, y, x_root, y_root, state, and same_screen.
+The window member is set to the window on which the
+event was generated and is referred to as the event window. 
+As long as the conditions previously discussed are met,
+this is the window used by the X server to report the event.
+The root member is set to the source window's root window.
+The x_root and y_root members are set to the pointer's coordinates
+relative to the root window's origin at the time of the event.
+.LP
+The same_screen member is set to indicate whether the event 
+window is on the same screen
+as the root window and can be either
+.ZN True 
+or
+.ZN False .
+If
+.ZN True ,
+the event and root windows are on the same screen.
+If
+.ZN False ,
+the event and root windows are not on the same screen.
+.LP
+If the source window is an inferior of the event window, 
+the subwindow member of the structure is set to the child of the event window
+that is the source window or the child of the event window that is
+an ancestor of the source window.
+Otherwise, the X server sets the subwindow member to
+.ZN None .
+The time member is set to the time when the event was generated 
+and is expressed in milliseconds.
+.LP
+If the event window is on the same screen as the root window, 
+the x and y members
+are set to the coordinates relative to the event window's origin.
+Otherwise, these members are set to zero.
+.LP
+The state member is set to indicate the logical state of the pointer buttons 
+and modifier keys just prior to the event,
+which is the bitwise inclusive OR of one or more of the
+button or modifier key masks:
+.ZN Button1Mask ,
+.ZN Button2Mask ,
+.ZN Button3Mask ,
+.ZN Button4Mask ,
+.ZN Button5Mask ,
+.ZN ShiftMask ,
+.ZN LockMask ,
+.ZN ControlMask ,
+.ZN Mod1Mask ,
+.ZN Mod2Mask ,
+.ZN Mod3Mask ,
+.ZN Mod4Mask ,
+and
+.ZN Mod5Mask .
+.LP
+Each of these structures also has a member that indicates the detail.
+For the
+.ZN XKeyPressedEvent
+and
+.ZN XKeyReleasedEvent
+structures, this member is called a keycode.
+It is set to a number that represents a physical key on the keyboard.
+The keycode is an arbitrary representation for any key on the keyboard
+(see sections 12.7 and 16.1).
+.LP
+For the
+.ZN XButtonPressedEvent
+and
+.ZN XButtonReleasedEvent
+structures, this member is called button.
+It represents the pointer button that changed state and can be the
+.ZN Button1 ,
+.ZN Button2 ,
+.ZN Button3 ,
+.ZN Button4 ,
+or
+.ZN Button5 
+value.
+For the
+.ZN XPointerMovedEvent
+structure, this member is called is_hint.
+It can be set to 
+.ZN NotifyNormal
+or
+.ZN NotifyHint .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XChangeKeyboardControl.man b/libX11/man/XChangeKeyboardControl.man
index 63f939221..efaf0ee41 100644
--- a/libX11/man/XChangeKeyboardControl.man
+++ b/libX11/man/XChangeKeyboardControl.man
@@ -50,7 +50,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -64,43 +64,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -113,32 +78,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 '\" t
 .TH XChangeKeyboardControl __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
@@ -311,20 +250,18 @@ T}
 .TE
 .IN "XKeyboardControl" "" "@DEF@"
 .Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
 /\&* Values */
 
 typedef struct {
-	int key_click_percent;
-	int bell_percent;
-	int bell_pitch;
-	int bell_duration;
-	int led;
-	int led_mode;	/\&* LedModeOn, LedModeOff */
-	int key;
-	int auto_repeat_mode;	/\&* AutoRepeatModeOff, AutoRepeatModeOn, 
-                            	AutoRepeatModeDefault */
+        int key_click_percent;
+        int bell_percent;
+        int bell_pitch;
+        int bell_duration;
+        int led;
+        int led_mode;   /\&* LedModeOn, LedModeOff */
+        int key;
+        int auto_repeat_mode;   /\&* AutoRepeatModeOff, AutoRepeatModeOn, 
+                                AutoRepeatModeDefault */
 } XKeyboardControl;
 .De
 .LP
@@ -405,15 +342,13 @@ The
 structure contains:
 .LP
 .Ds 0
-.TA .5i 
-.ta .5i
 typedef struct {
-	int key_click_percent;
-	int bell_percent;
-	unsigned int bell_pitch, bell_duration;
-	unsigned long led_mask;
-	int global_auto_repeat;
-	char auto_repeats[32];
+        int key_click_percent;
+        int bell_percent;
+        unsigned int bell_pitch, bell_duration;
+        unsigned long led_mask;
+        int global_auto_repeat;
+        char auto_repeats[32];
 } XKeyboardState;
 .De
 .LP
diff --git a/libX11/man/XChangeKeyboardMapping.man b/libX11/man/XChangeKeyboardMapping.man
index b9645488f..3cb809514 100644
--- a/libX11/man/XChangeKeyboardMapping.man
+++ b/libX11/man/XChangeKeyboardMapping.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH XChangeKeyboardMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
@@ -423,11 +362,9 @@ The
 structure contains:
 .LP
 .Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
 typedef struct {
-	int max_keypermod;	/\&* This server's max number of keys per modifier */
-	KeyCode *modifiermap;	/\&* An 8 by max_keypermod array of the modifiers */
+        int max_keypermod;      /\&* This server's max number of keys per modifier */
+        KeyCode *modifiermap;   /\&* An 8 by max_keypermod array of the modifiers */
 } XModifierKeymap;
 .De
 .SH DIAGNOSTICS
diff --git a/libX11/man/XChangePointerControl.man b/libX11/man/XChangePointerControl.man
index 42ccea16d..57d46a328 100644
--- a/libX11/man/XChangePointerControl.man
+++ b/libX11/man/XChangePointerControl.man
@@ -1,214 +1,153 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XChangePointerControl __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XChangePointerControl, XGetPointerControl \- control pointer 

-.SH SYNTAX

-.HP

-int XChangePointerControl\^(\^Display *\fIdisplay\fP\^, Bool \fIdo_accel\fP\^,

-Bool \fIdo_threshold\fP\^, int \fIaccel_numerator\fP\^, int

-\fIaccel_denominator\fP\^, int \fIthreshold\fP\^);

-.HP

-int XGetPointerControl\^(\^Display *\fIdisplay\fP\^, int

-*\fIaccel_numerator_return\fP\^, int *\fIaccel_denominator_return\fP\^, int

-*\fIthreshold_return\fP\^);

-.SH ARGUMENTS

-.IP \fIaccel_denominator\fP 1i

-Specifies the denominator for the acceleration multiplier.

-.IP \fIaccel_denominator_return\fP 1i

-Returns the denominator for the acceleration multiplier.

-.IP \fIaccel_numerator\fP 1i

-Specifies the numerator for the acceleration multiplier.

-.IP \fIaccel_numerator_return\fP 1i

-Returns the numerator for the acceleration multiplier.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIdo_accel\fP 1i

-Specifies a Boolean value that controls whether the values for 

-the accel_numerator or accel_denominator are used.

-.IP \fIdo_threshold\fP 1i

-Specifies a Boolean value that controls whether the value for the 

-threshold is used.

-.IP \fIthreshold\fP 1i

-Specifies the acceleration threshold.

-.IP \fIthreshold_return\fP 1i

-Returns the acceleration threshold.

-.SH DESCRIPTION

-The

-.ZN XChangePointerControl

-function defines how the pointing device moves.

-The acceleration, expressed as a fraction, is a

-multiplier for movement. 

-For example,

-specifying 3/1 means the pointer moves three times as fast as normal.

-The fraction may be rounded arbitrarily by the X server.  

-Acceleration

-only takes effect if the pointer moves more than threshold pixels at

-once and only applies to the amount beyond the value in the threshold argument.

-Setting a value to \-1 restores the default.

-The values of the do_accel and do_threshold arguments must be 

-.ZN True 

-for the pointer values to be set,

-or the parameters are unchanged.

-Negative values (other than \-1) generate a

-.ZN BadValue

-error, as does a zero value

-for the accel_denominator argument.

-.LP

-.ZN XChangePointerControl

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XGetPointerControl

-function returns the pointer's current acceleration multiplier

-and acceleration threshold.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XChangePointerControl __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XChangePointerControl, XGetPointerControl \- control pointer 
+.SH SYNTAX
+.HP
+int XChangePointerControl\^(\^Display *\fIdisplay\fP\^, Bool \fIdo_accel\fP\^,
+Bool \fIdo_threshold\fP\^, int \fIaccel_numerator\fP\^, int
+\fIaccel_denominator\fP\^, int \fIthreshold\fP\^);
+.HP
+int XGetPointerControl\^(\^Display *\fIdisplay\fP\^, int
+*\fIaccel_numerator_return\fP\^, int *\fIaccel_denominator_return\fP\^, int
+*\fIthreshold_return\fP\^);
+.SH ARGUMENTS
+.IP \fIaccel_denominator\fP 1i
+Specifies the denominator for the acceleration multiplier.
+.IP \fIaccel_denominator_return\fP 1i
+Returns the denominator for the acceleration multiplier.
+.IP \fIaccel_numerator\fP 1i
+Specifies the numerator for the acceleration multiplier.
+.IP \fIaccel_numerator_return\fP 1i
+Returns the numerator for the acceleration multiplier.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIdo_accel\fP 1i
+Specifies a Boolean value that controls whether the values for 
+the accel_numerator or accel_denominator are used.
+.IP \fIdo_threshold\fP 1i
+Specifies a Boolean value that controls whether the value for the 
+threshold is used.
+.IP \fIthreshold\fP 1i
+Specifies the acceleration threshold.
+.IP \fIthreshold_return\fP 1i
+Returns the acceleration threshold.
+.SH DESCRIPTION
+The
+.ZN XChangePointerControl
+function defines how the pointing device moves.
+The acceleration, expressed as a fraction, is a
+multiplier for movement. 
+For example,
+specifying 3/1 means the pointer moves three times as fast as normal.
+The fraction may be rounded arbitrarily by the X server.  
+Acceleration
+only takes effect if the pointer moves more than threshold pixels at
+once and only applies to the amount beyond the value in the threshold argument.
+Setting a value to \-1 restores the default.
+The values of the do_accel and do_threshold arguments must be 
+.ZN True 
+for the pointer values to be set,
+or the parameters are unchanged.
+Negative values (other than \-1) generate a
+.ZN BadValue
+error, as does a zero value
+for the accel_denominator argument.
+.LP
+.ZN XChangePointerControl
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XGetPointerControl
+function returns the pointer's current acceleration multiplier
+and acceleration threshold.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XChangeSaveSet.man b/libX11/man/XChangeSaveSet.man
index 5622b0aa1..0858f0e37 100644
--- a/libX11/man/XChangeSaveSet.man
+++ b/libX11/man/XChangeSaveSet.man
@@ -1,227 +1,166 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XChangeSaveSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XChangeSaveSet, XAddToSaveSet, XRemoveFromSaveSet \- change a client's save set

-.SH SYNTAX

-.HP

-int XChangeSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIchange_mode\fP\^);

-.HP

-int XAddToSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);

-.HP

-int XRemoveFromSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);

-.SH ARGUMENTS

-.IP \fIchange_mode\fP 1i

-Specifies the mode.

-You can pass

-.ZN SetModeInsert 

-or

-.ZN SetModeDelete .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Wi that you want to add or delete from the client's save-set

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-Depending on the specified mode,

-.ZN XChangeSaveSet

-either inserts or deletes the specified window from the client's save-set. 

-The specified window must have been created by some other client,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XChangeSaveSet

-can generate

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XAddToSaveSet

-function adds the specified window to the client's save-set.

-The specified window must have been created by some other client,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XAddToSaveSet

-can generate

-.ZN BadMatch 

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XRemoveFromSaveSet

-function removes the specified window from the client's save-set.

-The specified window must have been created by some other client,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XRemoveFromSaveSet

-can generate

-.ZN BadMatch

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XReparentWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XChangeSaveSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XChangeSaveSet, XAddToSaveSet, XRemoveFromSaveSet \- change a client's save set
+.SH SYNTAX
+.HP
+int XChangeSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIchange_mode\fP\^);
+.HP
+int XAddToSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XRemoveFromSaveSet\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.SH ARGUMENTS
+.IP \fIchange_mode\fP 1i
+Specifies the mode.
+You can pass
+.ZN SetModeInsert 
+or
+.ZN SetModeDelete .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Wi that you want to add or delete from the client's save-set
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+Depending on the specified mode,
+.ZN XChangeSaveSet
+either inserts or deletes the specified window from the client's save-set. 
+The specified window must have been created by some other client,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XChangeSaveSet
+can generate
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XAddToSaveSet
+function adds the specified window to the client's save-set.
+The specified window must have been created by some other client,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XAddToSaveSet
+can generate
+.ZN BadMatch 
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XRemoveFromSaveSet
+function removes the specified window from the client's save-set.
+The specified window must have been created by some other client,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XRemoveFromSaveSet
+can generate
+.ZN BadMatch
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XReparentWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XChangeWindowAttributes.man b/libX11/man/XChangeWindowAttributes.man
index 95aace6c8..9075d557c 100644
--- a/libX11/man/XChangeWindowAttributes.man
+++ b/libX11/man/XChangeWindowAttributes.man
@@ -1,405 +1,344 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XChangeWindowAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XChangeWindowAttributes, XSetWindowBackground, XSetWindowBackgroundPixmap, XSetWindowBorder, XSetWindowBorderPixmap, XSetWindowColormap \- change window attributes

-.SH SYNTAX

-.HP

-int XChangeWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^);

-.HP

-int XSetWindowBackground\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIbackground_pixel\fP\^);

-.HP

-int XSetWindowBackgroundPixmap\^(\^Display *\fIdisplay\fP\^, Window

-\fIw\fP\^, Pixmap \fIbackground_pixmap\fP\^);

-.HP 

-int XSetWindowBorder\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIborder_pixel\fP\^);

-.HP

-int XSetWindowBorderPixmap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Pixmap \fIborder_pixmap\fP\^);

-.HP

-int XSetWindowColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Colormap \fIcolormap\fP\^);

-.SH ARGUMENTS

-.IP \fIattributes\fP 1i

-Specifies the structure from which the values (as specified by the value mask)

-are to be taken.

-The value mask should have the appropriate bits

-set to indicate which attributes have been set in the structure.

-.IP \fIbackground_pixel\fP 1i

-Specifies the pixel that is to be used for the background.

-.IP \fIbackground_pixmap\fP 1i

-Specifies the background pixmap,

-.ZN ParentRelative ,

-or

-.ZN None .

-.IP \fIborder_pixel\fP 1i

-Specifies the entry in the colormap. 

-.IP \fIborder_pixmap\fP 1i

-Specifies the border pixmap or

-.ZN CopyFromParent .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIvaluemask\fP 1i

-Specifies which window attributes are defined in the attributes

-argument.

-This mask is the bitwise inclusive OR of the valid attribute mask bits.

-If valuemask is zero,

-the attributes are ignored and are not referenced.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.SH DESCRIPTION

-Depending on the valuemask,

-the

-.ZN XChangeWindowAttributes

-function uses the window attributes in the

-.ZN XSetWindowAttributes

-structure to change the specified window attributes.

-Changing the background does not cause the window contents to be

-changed.

-To repaint the window and its background, use 

-.ZN XClearWindow .

-Setting the border or changing the background such that the

-border tile origin changes causes the border to be repainted.

-Changing the background of a root window to 

-.ZN None 

-or 

-.ZN ParentRelative

-restores the default background pixmap.

-Changing the border of a root window to

-.ZN CopyFromParent

-restores the default border pixmap.

-Changing the win-gravity does not affect the current position of the

-window.

-Changing the backing-store of an obscured window to 

-.ZN WhenMapped 

-or

-.ZN Always , 

-or changing the backing-planes, backing-pixel, or

-save-under of a mapped window may have no immediate effect.

-Changing the colormap of a window (that is, defining a new map, not

-changing the contents of the existing map) generates a 

-.ZN ColormapNotify

-event.

-Changing the colormap of a visible window may have no

-immediate effect on the screen because the map may not be installed

-(see

-.ZN XInstallColormap ).

-Changing the cursor of a root window to 

-.ZN None 

-restores the default

-cursor.

-Whenever possible, you are encouraged to share colormaps.

-.LP

-Multiple clients can select input on the same window. 

-Their event masks are maintained separately.

-When an event is generated, 

-it is reported to all interested clients. 

-However, only one client at a time can select for 

-.ZN SubstructureRedirectMask , 

-.ZN ResizeRedirectMask , 

-and

-.ZN ButtonPressMask .

-If a client attempts to select any of these event masks 

-and some other client has already selected one, 

-a

-.ZN BadAccess

-error results.

-There is only one do-not-propagate-mask for a window, 

-not one per client.

-.LP

-.ZN XChangeWindowAttributes

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-.ZN BadCursor ,

-.ZN BadMatch ,

-.ZN BadPixmap ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XSetWindowBackground

-function sets the background of the window to the specified pixel value.

-Changing the background does not cause the window contents to be changed.

-.ZN XSetWindowBackground

-uses a pixmap of undefined size filled with the pixel value you passed.

-If you try to change the background of an 

-.ZN InputOnly

-window, a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetWindowBackground

-can generate

-.ZN BadMatch

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XSetWindowBackgroundPixmap

-function sets the background pixmap of the window to the specified pixmap.

-The background pixmap can immediately be freed if no further explicit

-references to it are to be made.

-If 

-.ZN ParentRelative

-is specified, 

-the background pixmap of the window's parent is used,

-or on the root window, the default background is restored.

-If you try to change the background of an 

-.ZN InputOnly

-window, a

-.ZN BadMatch

-error results.

-If the background is set to

-.ZN None ,

-the window has no defined background.

-.LP

-.ZN XSetWindowBackgroundPixmap

-can generate

-.ZN BadMatch ,

-.ZN BadPixmap ,

-and

-.ZN BadWindow 

-errors.

-.LP 

-The

-.ZN XSetWindowBorder

-function sets the border of the window to the pixel value you specify.

-If you attempt to perform this on an

-.ZN InputOnly

-window, a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetWindowBorder

-can generate

-.ZN BadMatch

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XSetWindowBorderPixmap

-function sets the border pixmap of the window to the pixmap you specify.

-The border pixmap can be freed immediately if no further explicit

-references to it are to be made.

-If you specify

-.ZN CopyFromParent ,

-a copy of the parent window's border pixmap is used.

-If you attempt to perform this on an

-.ZN InputOnly

-window, a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetWindowBorderPixmap

-can generate

-.ZN BadMatch ,

-.ZN BadPixmap ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XSetWindowColormap

-function sets the specified colormap of the specified window.

-The colormap must have the same visual type as the window,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetWindowColormap

-can generate

-.ZN BadColor ,

-.ZN BadMatch ,

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAccess

-A client attempted

-to free a color map entry that it did not already allocate.

-.TP 1i

-.ZN BadAccess

-A client attempted

-to store into a read-only color map entry.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window locks this attribute.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XInstallColormap(__libmansuffix__),

-XMapWindow(__libmansuffix__),

-XRaiseWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XChangeWindowAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XChangeWindowAttributes, XSetWindowBackground, XSetWindowBackgroundPixmap, XSetWindowBorder, XSetWindowBorderPixmap, XSetWindowColormap \- change window attributes
+.SH SYNTAX
+.HP
+int XChangeWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^);
+.HP
+int XSetWindowBackground\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIbackground_pixel\fP\^);
+.HP
+int XSetWindowBackgroundPixmap\^(\^Display *\fIdisplay\fP\^, Window
+\fIw\fP\^, Pixmap \fIbackground_pixmap\fP\^);
+.HP 
+int XSetWindowBorder\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned long \fIborder_pixel\fP\^);
+.HP
+int XSetWindowBorderPixmap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Pixmap \fIborder_pixmap\fP\^);
+.HP
+int XSetWindowColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Colormap \fIcolormap\fP\^);
+.SH ARGUMENTS
+.IP \fIattributes\fP 1i
+Specifies the structure from which the values (as specified by the value mask)
+are to be taken.
+The value mask should have the appropriate bits
+set to indicate which attributes have been set in the structure.
+.IP \fIbackground_pixel\fP 1i
+Specifies the pixel that is to be used for the background.
+.IP \fIbackground_pixmap\fP 1i
+Specifies the background pixmap,
+.ZN ParentRelative ,
+or
+.ZN None .
+.IP \fIborder_pixel\fP 1i
+Specifies the entry in the colormap. 
+.IP \fIborder_pixmap\fP 1i
+Specifies the border pixmap or
+.ZN CopyFromParent .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIvaluemask\fP 1i
+Specifies which window attributes are defined in the attributes
+argument.
+This mask is the bitwise inclusive OR of the valid attribute mask bits.
+If valuemask is zero,
+the attributes are ignored and are not referenced.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.SH DESCRIPTION
+Depending on the valuemask,
+the
+.ZN XChangeWindowAttributes
+function uses the window attributes in the
+.ZN XSetWindowAttributes
+structure to change the specified window attributes.
+Changing the background does not cause the window contents to be
+changed.
+To repaint the window and its background, use 
+.ZN XClearWindow .
+Setting the border or changing the background such that the
+border tile origin changes causes the border to be repainted.
+Changing the background of a root window to 
+.ZN None 
+or 
+.ZN ParentRelative
+restores the default background pixmap.
+Changing the border of a root window to
+.ZN CopyFromParent
+restores the default border pixmap.
+Changing the win-gravity does not affect the current position of the
+window.
+Changing the backing-store of an obscured window to 
+.ZN WhenMapped 
+or
+.ZN Always , 
+or changing the backing-planes, backing-pixel, or
+save-under of a mapped window may have no immediate effect.
+Changing the colormap of a window (that is, defining a new map, not
+changing the contents of the existing map) generates a 
+.ZN ColormapNotify
+event.
+Changing the colormap of a visible window may have no
+immediate effect on the screen because the map may not be installed
+(see
+.ZN XInstallColormap ).
+Changing the cursor of a root window to 
+.ZN None 
+restores the default
+cursor.
+Whenever possible, you are encouraged to share colormaps.
+.LP
+Multiple clients can select input on the same window. 
+Their event masks are maintained separately.
+When an event is generated, 
+it is reported to all interested clients. 
+However, only one client at a time can select for 
+.ZN SubstructureRedirectMask , 
+.ZN ResizeRedirectMask , 
+and
+.ZN ButtonPressMask .
+If a client attempts to select any of these event masks 
+and some other client has already selected one, 
+a
+.ZN BadAccess
+error results.
+There is only one do-not-propagate-mask for a window, 
+not one per client.
+.LP
+.ZN XChangeWindowAttributes
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+.ZN BadCursor ,
+.ZN BadMatch ,
+.ZN BadPixmap ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XSetWindowBackground
+function sets the background of the window to the specified pixel value.
+Changing the background does not cause the window contents to be changed.
+.ZN XSetWindowBackground
+uses a pixmap of undefined size filled with the pixel value you passed.
+If you try to change the background of an 
+.ZN InputOnly
+window, a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetWindowBackground
+can generate
+.ZN BadMatch
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XSetWindowBackgroundPixmap
+function sets the background pixmap of the window to the specified pixmap.
+The background pixmap can immediately be freed if no further explicit
+references to it are to be made.
+If 
+.ZN ParentRelative
+is specified, 
+the background pixmap of the window's parent is used,
+or on the root window, the default background is restored.
+If you try to change the background of an 
+.ZN InputOnly
+window, a
+.ZN BadMatch
+error results.
+If the background is set to
+.ZN None ,
+the window has no defined background.
+.LP
+.ZN XSetWindowBackgroundPixmap
+can generate
+.ZN BadMatch ,
+.ZN BadPixmap ,
+and
+.ZN BadWindow 
+errors.
+.LP 
+The
+.ZN XSetWindowBorder
+function sets the border of the window to the pixel value you specify.
+If you attempt to perform this on an
+.ZN InputOnly
+window, a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetWindowBorder
+can generate
+.ZN BadMatch
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XSetWindowBorderPixmap
+function sets the border pixmap of the window to the pixmap you specify.
+The border pixmap can be freed immediately if no further explicit
+references to it are to be made.
+If you specify
+.ZN CopyFromParent ,
+a copy of the parent window's border pixmap is used.
+If you attempt to perform this on an
+.ZN InputOnly
+window, a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetWindowBorderPixmap
+can generate
+.ZN BadMatch ,
+.ZN BadPixmap ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XSetWindowColormap
+function sets the specified colormap of the specified window.
+The colormap must have the same visual type as the window,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetWindowColormap
+can generate
+.ZN BadColor ,
+.ZN BadMatch ,
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAccess
+A client attempted
+to free a color map entry that it did not already allocate.
+.TP 1i
+.ZN BadAccess
+A client attempted
+to store into a read-only color map entry.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window locks this attribute.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XInstallColormap(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCirculateEvent.man b/libX11/man/XCirculateEvent.man
index cf505a8fe..e5f41cfea 100644
--- a/libX11/man/XCirculateEvent.man
+++ b/libX11/man/XCirculateEvent.man
@@ -1,231 +1,168 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCirculateEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCirculateEvent \- CirculateNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN CirculateNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* CirculateNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	int place;	/\&* PlaceOnTop, PlaceOnBottom */

-} XCirculateEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the restacked window or to its parent,

-depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected.

-The window member is set to the window that was restacked.

-The place member is set to the window's position after the restack occurs and

-is either

-.ZN PlaceOnTop

-or

-.ZN PlaceOnBottom .

-If it is

-.ZN PlaceOnTop ,

-the window is now on top of all siblings.

-If it is

-.ZN PlaceOnBottom ,

-the window is now below all siblings.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCirculateEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCirculateEvent \- CirculateNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN CirculateNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* CirculateNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        int place;      /\&* PlaceOnTop, PlaceOnBottom */
+} XCirculateEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the restacked window or to its parent,
+depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected.
+The window member is set to the window that was restacked.
+The place member is set to the window's position after the restack occurs and
+is either
+.ZN PlaceOnTop
+or
+.ZN PlaceOnBottom .
+If it is
+.ZN PlaceOnTop ,
+the window is now on top of all siblings.
+If it is
+.ZN PlaceOnBottom ,
+the window is now below all siblings.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCirculateRequestEvent.man b/libX11/man/XCirculateRequestEvent.man
index 88f589442..146a71eea 100644
--- a/libX11/man/XCirculateRequestEvent.man
+++ b/libX11/man/XCirculateRequestEvent.man
@@ -1,226 +1,163 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCirculateRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCirculateRequestEvent \- CirculateRequest event structure

-.SH STRUCTURES

-The structure for

-.ZN CirculateRequest

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* CirculateRequest */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window parent;

-	Window window;

-	int place;	/\&* PlaceOnTop, PlaceOnBottom */

-} XCirculateRequestEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The parent member is set to the parent window.

-The window member is set to the subwindow to be restacked.

-The place member is set to what the new position in the stacking order should be

-and is either

-.ZN PlaceOnTop

-or

-.ZN PlaceOnBottom .

-If it is

-.ZN PlaceOnTop ,

-the subwindow should be on top of all siblings.

-If it is

-.ZN PlaceOnBottom ,

-the subwindow should be below all siblings.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCirculateRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCirculateRequestEvent \- CirculateRequest event structure
+.SH STRUCTURES
+The structure for
+.ZN CirculateRequest
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* CirculateRequest */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window parent;
+        Window window;
+        int place;      /\&* PlaceOnTop, PlaceOnBottom */
+} XCirculateRequestEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The parent member is set to the parent window.
+The window member is set to the subwindow to be restacked.
+The place member is set to what the new position in the stacking order should be
+and is either
+.ZN PlaceOnTop
+or
+.ZN PlaceOnBottom .
+If it is
+.ZN PlaceOnTop ,
+the subwindow should be on top of all siblings.
+If it is
+.ZN PlaceOnBottom ,
+the subwindow should be below all siblings.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XClearArea.man b/libX11/man/XClearArea.man
index cff354090..64f34bd13 100644
--- a/libX11/man/XClearArea.man
+++ b/libX11/man/XClearArea.man
@@ -1,257 +1,196 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XClearArea __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XClearArea, XClearWindow \- clear area or window

-.SH SYNTAX

-.HP

-int XClearArea\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^,

-int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^,

-Bool \fIexposures\fP\^);

-.HP

-int XClearWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIexposures\fP 1i

-Specifies a Boolean value that indicates if

-.ZN Expose

-events are to be generated.

-.IP \fIw\fP 1i

-Specifies the window.

-.ds Wh , which are the dimensions of the rectangle

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which are relative to the origin of the window \

-and specify the upper-left corner of the rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XClearArea

-function paints a rectangular area in the specified window according to the

-specified dimensions with the window's background pixel or pixmap.

-The subwindow-mode effectively is

-.ZN ClipByChildren . 

-If width is zero, it

-is replaced with the current width of the window minus x.

-If height is

-zero, it is replaced with the current height of the window minus y.

-If the window has a defined background tile, 

-the rectangle clipped by any children is filled with this tile.

-If the window has

-background 

-.ZN None , 

-the contents of the window are not changed.  

-In either

-case, if exposures is 

-.ZN True , 

-one or more 

-.ZN Expose 

-events are generated for regions of the rectangle that are either visible or are

-being retained in a backing store.

-If you specify a window whose class is

-.ZN InputOnly ,

-a

-.ZN BadMatch

-error results.

-.LP

-.ZN XClearArea

-can generate

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XClearWindow

-function clears the entire area in the specified window and is

-equivalent to

-.ZN XClearArea

-(display, w, 0, 0, 0, 0, 

-.ZN False ).

-If the window has a defined background tile, the rectangle is tiled with a

-plane-mask of all ones and 

-.ZN GXcopy

-function.

-If the window has

-background 

-.ZN None , 

-the contents of the window are not changed.  

-If you specify a window whose class is

-.ZN InputOnly ,

-a

-.ZN BadMatch

-error results. 

-.LP

-.ZN XClearWindow

-can generate

-.ZN BadMatch

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XCopyArea(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XClearArea __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XClearArea, XClearWindow \- clear area or window
+.SH SYNTAX
+.HP
+int XClearArea\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^,
+int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^,
+Bool \fIexposures\fP\^);
+.HP
+int XClearWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIexposures\fP 1i
+Specifies a Boolean value that indicates if
+.ZN Expose
+events are to be generated.
+.IP \fIw\fP 1i
+Specifies the window.
+.ds Wh , which are the dimensions of the rectangle
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which are relative to the origin of the window \
+and specify the upper-left corner of the rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XClearArea
+function paints a rectangular area in the specified window according to the
+specified dimensions with the window's background pixel or pixmap.
+The subwindow-mode effectively is
+.ZN ClipByChildren . 
+If width is zero, it
+is replaced with the current width of the window minus x.
+If height is
+zero, it is replaced with the current height of the window minus y.
+If the window has a defined background tile, 
+the rectangle clipped by any children is filled with this tile.
+If the window has
+background 
+.ZN None , 
+the contents of the window are not changed.  
+In either
+case, if exposures is 
+.ZN True , 
+one or more 
+.ZN Expose 
+events are generated for regions of the rectangle that are either visible or are
+being retained in a backing store.
+If you specify a window whose class is
+.ZN InputOnly ,
+a
+.ZN BadMatch
+error results.
+.LP
+.ZN XClearArea
+can generate
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XClearWindow
+function clears the entire area in the specified window and is
+equivalent to
+.ZN XClearArea
+(display, w, 0, 0, 0, 0, 
+.ZN False ).
+If the window has a defined background tile, the rectangle is tiled with a
+plane-mask of all ones and 
+.ZN GXcopy
+function.
+If the window has
+background 
+.ZN None , 
+the contents of the window are not changed.  
+If you specify a window whose class is
+.ZN InputOnly ,
+a
+.ZN BadMatch
+error results. 
+.LP
+.ZN XClearWindow
+can generate
+.ZN BadMatch
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XCopyArea(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XClientMessageEvent.man b/libX11/man/XClientMessageEvent.man
index 541a1a634..fc421149a 100644
--- a/libX11/man/XClientMessageEvent.man
+++ b/libX11/man/XClientMessageEvent.man
@@ -1,229 +1,166 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XClientMessageEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XClientMessageEvent \- ClientMessage event structure

-.SH STRUCTURES

-The structure for

-.ZN ClientMessage

-events contains:

-.LP

-.Ds 0

-.TA .5i 1i 3i

-.ta .5i 1i 3i

-typedef struct {

-	int type;	/\&* ClientMessage */

-	unsigned long serial;		/\&* # of last request processed by server */

-	Bool send_event;		/\&* true if this came from a SendEvent request */

-	Display *display;		/\&* Display the event was read from */

-	Window window;

-	Atom message_type;

-	int format;

-	union {

-		char b[20];

-		short s[10];

-		long l[5];

-	        } data;

-} XClientMessageEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The message_type member is set to an atom that indicates how the data 

-should be interpreted by the receiving client.

-The format member is set to 8, 16, or 32 and specifies whether the data

-should be viewed as a list of bytes, shorts, or longs.

-The data member is a union that contains the members b, s, and l.

-The b, s, and l members represent data of twenty 8-bit values, 

-ten 16-bit values, and five 32-bit values.

-Particular message types might not make use of all these values.

-The X server places no interpretation on the values in the window,

-message_type, or data members.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XClientMessageEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XClientMessageEvent \- ClientMessage event structure
+.SH STRUCTURES
+The structure for
+.ZN ClientMessage
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ClientMessage */
+        unsigned long serial;           /\&* # of last request processed by server */
+        Bool send_event;                /\&* true if this came from a SendEvent request */
+        Display *display;               /\&* Display the event was read from */
+        Window window;
+        Atom message_type;
+        int format;
+        union {
+                char b[20];
+                short s[10];
+                long l[5];
+                } data;
+} XClientMessageEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The message_type member is set to an atom that indicates how the data 
+should be interpreted by the receiving client.
+The format member is set to 8, 16, or 32 and specifies whether the data
+should be viewed as a list of bytes, shorts, or longs.
+The data member is a union that contains the members b, s, and l.
+The b, s, and l members represent data of twenty 8-bit values, 
+ten 16-bit values, and five 32-bit values.
+Particular message types might not make use of all these values.
+The X server places no interpretation on the values in the window,
+message_type, or data members.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XColormapEvent.man b/libX11/man/XColormapEvent.man
index 336009ec2..f793ac755 100644
--- a/libX11/man/XColormapEvent.man
+++ b/libX11/man/XColormapEvent.man
@@ -1,240 +1,177 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XColormapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XColormapEvent \- ColormapNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN ColormapNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ColormapNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	Colormap colormap;	/\&* colormap or None */

-	Bool new;

-	int state;	/\&* ColormapInstalled, ColormapUninstalled */

-} XColormapEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window whose associated 

-colormap is changed, installed, or uninstalled.

-For a colormap that is changed, installed, or uninstalled,

-the colormap member is set to the colormap associated with the window. 

-For a colormap that is changed by a call to

-.ZN XFreeColormap ,

-the colormap member is set to

-.ZN None .

-The new member is set to indicate whether the colormap 

-for the specified window was changed or installed or uninstalled

-and can be 

-.ZN True

-or

-.ZN False .

-If it is

-.ZN True ,

-the colormap was changed.

-If it is

-.ZN False ,

-the colormap was installed or uninstalled.

-The state member is always set to indicate whether the colormap is installed or

-uninstalled and can be 

-.ZN ColormapInstalled

-or

-.ZN ColormapUninstalled .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCreateColormap(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XColormapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XColormapEvent \- ColormapNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN ColormapNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ColormapNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        Colormap colormap;      /\&* colormap or None */
+        Bool new;
+        int state;      /\&* ColormapInstalled, ColormapUninstalled */
+} XColormapEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window whose associated 
+colormap is changed, installed, or uninstalled.
+For a colormap that is changed, installed, or uninstalled,
+the colormap member is set to the colormap associated with the window. 
+For a colormap that is changed by a call to
+.ZN XFreeColormap ,
+the colormap member is set to
+.ZN None .
+The new member is set to indicate whether the colormap 
+for the specified window was changed or installed or uninstalled
+and can be 
+.ZN True
+or
+.ZN False .
+If it is
+.ZN True ,
+the colormap was changed.
+If it is
+.ZN False ,
+the colormap was installed or uninstalled.
+The state member is always set to indicate whether the colormap is installed or
+uninstalled and can be 
+.ZN ColormapInstalled
+or
+.ZN ColormapUninstalled .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XConfigureEvent.man b/libX11/man/XConfigureEvent.man
index 8e2cbafa8..103e3da98 100644
--- a/libX11/man/XConfigureEvent.man
+++ b/libX11/man/XConfigureEvent.man
@@ -1,249 +1,186 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XConfigureEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XConfigureEvent \- ConfigureNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN ConfigureNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ConfigureNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	int x, y;

-	int width, height;

-	int border_width;

-	Window above;

-	Bool override_redirect;

-} XConfigureEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the reconfigured window or to its parent,

-depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected.

-The window member is set to the window whose size, position, 

-border, and/or stacking

-order was changed.

-.LP

-The x and y members are set to the coordinates relative to the parent window's 

-origin and indicate the position of the upper-left outside corner of the window.

-The width and height members are set to the inside size of the window, 

-not including

-the border.

-The border_width member is set to the width of the window's border, in pixels.

-.LP

-The above member is set to the sibling window and is used 

-for stacking operations.

-If the X server sets this member to

-.ZN None ,

-the window whose state was changed is on the bottom of the stack

-with respect to sibling windows.

-However, if this member is set to a sibling window, 

-the window whose state was changed is placed on top of this sibling window.

-.LP

-The override_redirect member is set to the override-redirect attribute of the

-window.

-Window manager clients normally should ignore this window if the 

-override_redirect member

-is

-.ZN True .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XConfigureEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XConfigureEvent \- ConfigureNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN ConfigureNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ConfigureNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        int x, y;
+        int width, height;
+        int border_width;
+        Window above;
+        Bool override_redirect;
+} XConfigureEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the reconfigured window or to its parent,
+depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected.
+The window member is set to the window whose size, position, 
+border, and/or stacking
+order was changed.
+.LP
+The x and y members are set to the coordinates relative to the parent window's 
+origin and indicate the position of the upper-left outside corner of the window.
+The width and height members are set to the inside size of the window, 
+not including
+the border.
+The border_width member is set to the width of the window's border, in pixels.
+.LP
+The above member is set to the sibling window and is used 
+for stacking operations.
+If the X server sets this member to
+.ZN None ,
+the window whose state was changed is on the bottom of the stack
+with respect to sibling windows.
+However, if this member is set to a sibling window, 
+the window whose state was changed is placed on top of this sibling window.
+.LP
+The override_redirect member is set to the override-redirect attribute of the
+window.
+Window manager clients normally should ignore this window if the 
+override_redirect member
+is
+.ZN True .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XConfigureRequestEvent.man b/libX11/man/XConfigureRequestEvent.man
index 54a7ca0df..520e3f83b 100644
--- a/libX11/man/XConfigureRequestEvent.man
+++ b/libX11/man/XConfigureRequestEvent.man
@@ -1,232 +1,169 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XConfigureRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XConfigureRequestEvent \- ConfigureRequest event structure

-.SH STRUCTURES

-The structure for

-.ZN ConfigureRequest

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ConfigureRequest */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window parent;

-	Window window;

-	int x, y;

-	int width, height;

-	int border_width;

-	Window above;

-	int detail;	/\&* Above, Below, TopIf, BottomIf, Opposite */

-	unsigned long value_mask;

-} XConfigureRequestEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The parent member is set to the parent window.

-The window member is set to the window whose size, position, border width, 

-and/or stacking order is to be reconfigured.

-The value_mask member indicates which components were specified in the

-.ZN ConfigureWindow 

-protocol request.

-The corresponding values are reported as given in the request.

-The remaining values are filled in from the current geometry of the window,

-except in the case of above (sibling) and detail (stack-mode),

-which are reported as

-.ZN None

-and

-.ZN Above ,

-respectively, if they are not given in the request.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XConfigureRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XConfigureRequestEvent \- ConfigureRequest event structure
+.SH STRUCTURES
+The structure for
+.ZN ConfigureRequest
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ConfigureRequest */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window parent;
+        Window window;
+        int x, y;
+        int width, height;
+        int border_width;
+        Window above;
+        int detail;     /\&* Above, Below, TopIf, BottomIf, Opposite */
+        unsigned long value_mask;
+} XConfigureRequestEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The parent member is set to the parent window.
+The window member is set to the window whose size, position, border width, 
+and/or stacking order is to be reconfigured.
+The value_mask member indicates which components were specified in the
+.ZN ConfigureWindow 
+protocol request.
+The corresponding values are reported as given in the request.
+The remaining values are filled in from the current geometry of the window,
+except in the case of above (sibling) and detail (stack-mode),
+which are reported as
+.ZN None
+and
+.ZN Above ,
+respectively, if they are not given in the request.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XConfigureWindow.man b/libX11/man/XConfigureWindow.man
index cb72c7fd8..156cbec37 100644
--- a/libX11/man/XConfigureWindow.man
+++ b/libX11/man/XConfigureWindow.man
@@ -1,457 +1,394 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XConfigureWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XConfigureWindow, XMoveWindow, XResizeWindow, XMoveResizeWindow, XSetWindowBorderWidth, XWindowChanges \- configure windows and window changes structure

-.SH SYNTAX

-.HP

-int XConfigureWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned \fIvalue_mask\fP\^, \^XWindowChanges *\fIchanges\fP\^);

-.HP

-int XMoveWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^, \fIy\fP\^);

-.HP

-int XResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned

-\fIwidth\fP\^, unsigned \fIheight\fP\^);

-.HP

-int XMoveResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int

-\fIx\fP\^, int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^); 

-.HP

-int XSetWindowBorderWidth\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-unsigned \fIwidth\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIvalue_mask\fP 1i

-Specifies which values are to be set using information in

-the values structure.

-This mask is the bitwise inclusive OR of the valid configure window values bits.

-.IP \fIvalues\fP 1i

-Specifies the 

-.ZN XWindowChanges 

-structure.

-.ds Wi to be reconfigured, moved, or resized.

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.IP \fIwidth\fP 1i

-Specifies the width of the window border.

-.ds Wh , which are the interior dimensions of the window

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which define the new location of the top-left pixel \

-of the window's border or the window itself if it has no border \

-or define the new position of the window relative to its parent

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XConfigureWindow

-function uses the values specified in the

-.ZN XWindowChanges

-structure to reconfigure a window's size, position, border, and stacking order.

-Values not specified are taken from the existing geometry of the window.

-.LP

-If a sibling is specified without a stack_mode or if the window

-is not actually a sibling,

-a

-.ZN BadMatch

-error results. 

-Note that the computations for

-.ZN BottomIf ,

-.ZN TopIf ,

-and

-.ZN Opposite

-are performed with respect to the window's final geometry (as controlled by the

-other arguments passed to

-.ZN XConfigureWindow ),

-not its initial geometry.

-Any backing store contents of the window, its

-inferiors, and other newly visible windows are either discarded or

-changed to reflect the current screen contents 

-(depending on the implementation).

-.LP

-.ZN XConfigureWindow

-can generate

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XMoveWindow

-function moves the specified window to the specified x and y coordinates,

-but it does not change the window's size, raise the window, or

-change the mapping state of the window.

-Moving a mapped window may or may not lose the window's contents 

-depending on if the window is obscured by nonchildren 

-and if no backing store exists.

-If the contents of the window are lost, 

-the X server generates

-.ZN Expose 

-events.

-Moving a mapped window generates

-.ZN Expose 

-events on any formerly obscured windows. 

-.LP

-If the override-redirect flag of the window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates a

-.ZN ConfigureRequest 

-event, and no further processing is

-performed.  

-Otherwise, the window is moved.

-.LP

-.ZN XMoveWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XResizeWindow

-function changes the inside dimensions of the specified window, not including

-its borders.

-This function does not change the window's upper-left coordinate or

-the origin and does not restack the window.

-Changing the size of a mapped window may lose its contents and generate

-.ZN Expose 

-events.

-If a mapped window is made smaller, 

-changing its size generates

-.ZN Expose 

-events on windows that the mapped window formerly obscured.

-.LP

-If the override-redirect flag of the window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates a

-.ZN ConfigureRequest 

-event, and no further processing is performed.  

-If either width or height is zero,

-a

-.ZN BadValue

-error results.

-.LP

-.ZN XResizeWindow

-can generate

-.ZN BadValue

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XMoveResizeWindow

-function changes the size and location of the specified window 

-without raising it.

-Moving and resizing a mapped window may generate an

-.ZN Expose 

-event on the window.

-Depending on the new size and location parameters,

-moving and resizing a window may generate 

-.ZN Expose 

-events on windows that the window formerly obscured. 

-.LP

-If the override-redirect flag of the window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates a

-.ZN ConfigureRequest 

-event, and no further processing is performed.  

-Otherwise, the window size and location are changed.

-.LP

-.ZN XMoveResizeWindow

-can generate

-.ZN BadValue

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XSetWindowBorderWidth

-function sets the specified window's border width to the specified width.

-.LP

-.ZN XSetWindowBorderWidth

-can generate a

-.ZN BadWindow 

-error.

-.SH STRUCTURES

-The

-.ZN XWindowChanges

-structure contains:

-.LP

-.LP

-/\&* Configure window value mask bits */

-.TS

-lw(.5i) lw(2.5i) lw(.8i).

-T{

-\&#define

-T}	T{

-.ZN CWX

-T}	T{

-(1<<0)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWY

-T}	T{

-(1<<1)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWWidth

-T}	T{

-(1<<2)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWHeight

-T}	T{

-(1<<3)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBorderWidth

-T}	T{

-(1<<4)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWSibling

-T}	T{

-(1<<5)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWStackMode

-T}	T{

-(1<<6)

-T}

-.TE

-.IN "XWindowChanges" "" "@DEF@"

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-/\&* Values */

-

-typedef struct {

-	int x, y;

-	int width, height;

-	int border_width;

-	Window sibling;

-	int stack_mode;

-} XWindowChanges;

-.De

-.LP

-The x and y members are used to set the window's x and y coordinates,

-which are relative to the parent's origin

-and indicate the position of the upper-left outer corner of the window.

-The width and height members are used to set the inside size of the window,

-not including the border, and must be nonzero, or a

-.ZN BadValue

-error results.

-Attempts to configure a root window have no effect.

-.LP

-The border_width member is used to set the width of the border in pixels.

-Note that setting just the border width leaves the outer-left corner of the window

-in a fixed position but moves the absolute position of the window's origin.

-If you attempt to set the border-width attribute of an

-.ZN InputOnly

-window nonzero, a

-.ZN BadMatch

-error results. 

-.LP

-The sibling member is used to set the sibling window for stacking operations.

-The stack_mode member is used to set how the window is to be restacked 

-and can be set to

-.ZN Above , 

-.ZN Below , 

-.ZN TopIf , 

-.ZN BottomIf ,

-or 

-.ZN Opposite .

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XMapWindow(__libmansuffix__),

-XRaiseWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XConfigureWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XConfigureWindow, XMoveWindow, XResizeWindow, XMoveResizeWindow, XSetWindowBorderWidth, XWindowChanges \- configure windows and window changes structure
+.SH SYNTAX
+.HP
+int XConfigureWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned \fIvalue_mask\fP\^, \^XWindowChanges *\fIchanges\fP\^);
+.HP
+int XMoveWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int \fIx\fP\^, \fIy\fP\^);
+.HP
+int XResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, unsigned
+\fIwidth\fP\^, unsigned \fIheight\fP\^);
+.HP
+int XMoveResizeWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned \fIwidth\fP\^, unsigned \fIheight\fP\^); 
+.HP
+int XSetWindowBorderWidth\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+unsigned \fIwidth\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIvalue_mask\fP 1i
+Specifies which values are to be set using information in
+the values structure.
+This mask is the bitwise inclusive OR of the valid configure window values bits.
+.IP \fIvalues\fP 1i
+Specifies the 
+.ZN XWindowChanges 
+structure.
+.ds Wi to be reconfigured, moved, or resized.
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.IP \fIwidth\fP 1i
+Specifies the width of the window border.
+.ds Wh , which are the interior dimensions of the window
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which define the new location of the top-left pixel \
+of the window's border or the window itself if it has no border \
+or define the new position of the window relative to its parent
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XConfigureWindow
+function uses the values specified in the
+.ZN XWindowChanges
+structure to reconfigure a window's size, position, border, and stacking order.
+Values not specified are taken from the existing geometry of the window.
+.LP
+If a sibling is specified without a stack_mode or if the window
+is not actually a sibling,
+a
+.ZN BadMatch
+error results. 
+Note that the computations for
+.ZN BottomIf ,
+.ZN TopIf ,
+and
+.ZN Opposite
+are performed with respect to the window's final geometry (as controlled by the
+other arguments passed to
+.ZN XConfigureWindow ),
+not its initial geometry.
+Any backing store contents of the window, its
+inferiors, and other newly visible windows are either discarded or
+changed to reflect the current screen contents 
+(depending on the implementation).
+.LP
+.ZN XConfigureWindow
+can generate
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XMoveWindow
+function moves the specified window to the specified x and y coordinates,
+but it does not change the window's size, raise the window, or
+change the mapping state of the window.
+Moving a mapped window may or may not lose the window's contents 
+depending on if the window is obscured by nonchildren 
+and if no backing store exists.
+If the contents of the window are lost, 
+the X server generates
+.ZN Expose 
+events.
+Moving a mapped window generates
+.ZN Expose 
+events on any formerly obscured windows. 
+.LP
+If the override-redirect flag of the window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates a
+.ZN ConfigureRequest 
+event, and no further processing is
+performed.  
+Otherwise, the window is moved.
+.LP
+.ZN XMoveWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XResizeWindow
+function changes the inside dimensions of the specified window, not including
+its borders.
+This function does not change the window's upper-left coordinate or
+the origin and does not restack the window.
+Changing the size of a mapped window may lose its contents and generate
+.ZN Expose 
+events.
+If a mapped window is made smaller, 
+changing its size generates
+.ZN Expose 
+events on windows that the mapped window formerly obscured.
+.LP
+If the override-redirect flag of the window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates a
+.ZN ConfigureRequest 
+event, and no further processing is performed.  
+If either width or height is zero,
+a
+.ZN BadValue
+error results.
+.LP
+.ZN XResizeWindow
+can generate
+.ZN BadValue
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XMoveResizeWindow
+function changes the size and location of the specified window 
+without raising it.
+Moving and resizing a mapped window may generate an
+.ZN Expose 
+event on the window.
+Depending on the new size and location parameters,
+moving and resizing a window may generate 
+.ZN Expose 
+events on windows that the window formerly obscured. 
+.LP
+If the override-redirect flag of the window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates a
+.ZN ConfigureRequest 
+event, and no further processing is performed.  
+Otherwise, the window size and location are changed.
+.LP
+.ZN XMoveResizeWindow
+can generate
+.ZN BadValue
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XSetWindowBorderWidth
+function sets the specified window's border width to the specified width.
+.LP
+.ZN XSetWindowBorderWidth
+can generate a
+.ZN BadWindow 
+error.
+.SH STRUCTURES
+The
+.ZN XWindowChanges
+structure contains:
+.LP
+.LP
+/\&* Configure window value mask bits */
+.TS
+lw(.5i) lw(2.5i) lw(.8i).
+T{
+\&#define
+T}	T{
+.ZN CWX
+T}	T{
+(1<<0)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWY
+T}	T{
+(1<<1)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWWidth
+T}	T{
+(1<<2)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWHeight
+T}	T{
+(1<<3)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBorderWidth
+T}	T{
+(1<<4)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWSibling
+T}	T{
+(1<<5)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWStackMode
+T}	T{
+(1<<6)
+T}
+.TE
+.IN "XWindowChanges" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        int x, y;
+        int width, height;
+        int border_width;
+        Window sibling;
+        int stack_mode;
+} XWindowChanges;
+.De
+.LP
+The x and y members are used to set the window's x and y coordinates,
+which are relative to the parent's origin
+and indicate the position of the upper-left outer corner of the window.
+The width and height members are used to set the inside size of the window,
+not including the border, and must be nonzero, or a
+.ZN BadValue
+error results.
+Attempts to configure a root window have no effect.
+.LP
+The border_width member is used to set the width of the border in pixels.
+Note that setting just the border width leaves the outer-left corner of the window
+in a fixed position but moves the absolute position of the window's origin.
+If you attempt to set the border-width attribute of an
+.ZN InputOnly
+window nonzero, a
+.ZN BadMatch
+error results. 
+.LP
+The sibling member is used to set the sibling window for stacking operations.
+The stack_mode member is used to set how the window is to be restacked 
+and can be set to
+.ZN Above , 
+.ZN Below , 
+.ZN TopIf , 
+.ZN BottomIf ,
+or 
+.ZN Opposite .
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCopyArea.man b/libX11/man/XCopyArea.man
index 69bf5e630..86e6ff05e 100644
--- a/libX11/man/XCopyArea.man
+++ b/libX11/man/XCopyArea.man
@@ -1,307 +1,246 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCopyArea __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCopyArea, XCopyPlane \- copy areas

-.SH SYNTAX

-.HP

-int XCopyArea\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable

-\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned

-int \fIwidth\fP\^, unsigned \fIheight\fP\^, int \fIdest_x\fP\^, int

-\fIdest_y\fP\^);

-.HP

-int XCopyPlane\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable

-\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned

-\fIwidth\fP\^, int \fIheight\fP\^, int \fIdest_x\fP\^, int \fIdest_y\fP\^,

-unsigned long \fIplane\fP\^); 

-.SH ARGUMENTS

-.ds Dx , which are relative to the origin of the destination rectangle \

-and specify its upper-left corner

-.IP \fIdest_x\fP 1i

-.br

-.ns

-.IP \fIdest_y\fP 1i

-Specify the x and y coordinates\*(Dx. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIplane\fP 1i

-Specifies the bit plane.

-You must set exactly one bit to 1.

-.IP \fIsrc\fP 1i

-.br

-.ns

-.IP \fIdest\fP 1i

-Specify the source and destination rectangles to be combined. 

-.IP \fIsrc_x\fP 1i

-.br

-.ns

-.IP \fIsrc_y\fP 1i

-Specify the x and y coordinates, 

-which are relative to the origin of the source rectangle

-and specify its upper-left corner.

-.ds Wh , which are the dimensions of both the source and destination rectangles

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.SH DESCRIPTION

-The

-.ZN XCopyArea

-function combines the specified rectangle of src with the specified rectangle 

-of dest.

-The drawables must have the same root and depth,

-or a

-.ZN BadMatch

-error results.

-.LP

-If regions of the source rectangle are obscured and have not been

-retained in backing store 

-or if regions outside the boundaries of the source drawable are specified, 

-those regions are not copied. 

-Instead, the 

-following occurs on all corresponding destination regions that are either

-visible or are retained in backing store.  

-If the destination is a window with a background other than 

-.ZN None , 

-corresponding regions

-of the destination are tiled with that background

-(with plane-mask of all ones and

-.ZN GXcopy 

-function).

-Regardless of tiling or whether the destination is a window or a pixmap,

-if graphics-exposures is 

-.ZN True ,

-then

-.ZN GraphicsExpose

-events for all corresponding destination regions are generated.

-If graphics-exposures is 

-.ZN True 

-but no

-.ZN GraphicsExpose

-events are generated, a

-.ZN NoExpose 

-event is generated.

-Note that by default graphics-exposures is

-.ZN True

-in new GCs.

-.LP

-This function uses these GC components: function, plane-mask, 

-subwindow-mode, graphics-exposures, clip-x-origin,

-clip-y-origin, and clip-mask.

-.LP

-.ZN XCopyArea

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.LP

-The

-.ZN XCopyPlane

-function uses a single bit plane of the specified source rectangle

-combined with the specified GC to modify the specified rectangle of dest.

-The drawables must have the same root but need not have the same depth.

-If the drawables do not have the same root, a

-.ZN BadMatch

-error results.

-If plane does not have exactly one bit set to 1 and the value of plane

-is not less than %2 sup n%, where \fIn\fP is the depth of src, a

-.ZN BadValue

-error results.

-.LP

-Effectively, 

-.ZN XCopyPlane

-forms a pixmap of the same depth as the rectangle of dest and with a

-size specified by the source region. 

-It uses the foreground/background pixels in the GC (foreground

-everywhere the bit plane in src contains a bit set to 1,

-background everywhere the bit plane in src contains a bit set to 0)

-and the equivalent of a 

-.ZN CopyArea

-protocol request is performed with all the same exposure semantics.

-This can also be thought of as using the specified region of the source 

-bit plane as a stipple with a fill-style of

-.ZN FillOpaqueStippled

-for filling a rectangular area of the destination.

-.LP

-This function uses these GC components: function, plane-mask, foreground,

-background, subwindow-mode, graphics-exposures, clip-x-origin, clip-y-origin,

-and clip-mask.

-.LP

-.ZN XCopyPlane

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XClearArea(__libmansuffix__)

-.br

-\fIXlib \- C Language X Interface\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCopyArea __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCopyArea, XCopyPlane \- copy areas
+.SH SYNTAX
+.HP
+int XCopyArea\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable
+\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned
+int \fIwidth\fP\^, unsigned \fIheight\fP\^, int \fIdest_x\fP\^, int
+\fIdest_y\fP\^);
+.HP
+int XCopyPlane\^(\^Display *\fIdisplay\fP\^, Drawable \fIsrc\fP\^, Drawable
+\fIdest\fP\^, GC \fIgc\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned
+\fIwidth\fP\^, int \fIheight\fP\^, int \fIdest_x\fP\^, int \fIdest_y\fP\^,
+unsigned long \fIplane\fP\^); 
+.SH ARGUMENTS
+.ds Dx , which are relative to the origin of the destination rectangle \
+and specify its upper-left corner
+.IP \fIdest_x\fP 1i
+.br
+.ns
+.IP \fIdest_y\fP 1i
+Specify the x and y coordinates\*(Dx. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIplane\fP 1i
+Specifies the bit plane.
+You must set exactly one bit to 1.
+.IP \fIsrc\fP 1i
+.br
+.ns
+.IP \fIdest\fP 1i
+Specify the source and destination rectangles to be combined. 
+.IP \fIsrc_x\fP 1i
+.br
+.ns
+.IP \fIsrc_y\fP 1i
+Specify the x and y coordinates, 
+which are relative to the origin of the source rectangle
+and specify its upper-left corner.
+.ds Wh , which are the dimensions of both the source and destination rectangles
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.SH DESCRIPTION
+The
+.ZN XCopyArea
+function combines the specified rectangle of src with the specified rectangle 
+of dest.
+The drawables must have the same root and depth,
+or a
+.ZN BadMatch
+error results.
+.LP
+If regions of the source rectangle are obscured and have not been
+retained in backing store 
+or if regions outside the boundaries of the source drawable are specified, 
+those regions are not copied. 
+Instead, the 
+following occurs on all corresponding destination regions that are either
+visible or are retained in backing store.  
+If the destination is a window with a background other than 
+.ZN None , 
+corresponding regions
+of the destination are tiled with that background
+(with plane-mask of all ones and
+.ZN GXcopy 
+function).
+Regardless of tiling or whether the destination is a window or a pixmap,
+if graphics-exposures is 
+.ZN True ,
+then
+.ZN GraphicsExpose
+events for all corresponding destination regions are generated.
+If graphics-exposures is 
+.ZN True 
+but no
+.ZN GraphicsExpose
+events are generated, a
+.ZN NoExpose 
+event is generated.
+Note that by default graphics-exposures is
+.ZN True
+in new GCs.
+.LP
+This function uses these GC components: function, plane-mask, 
+subwindow-mode, graphics-exposures, clip-x-origin,
+clip-y-origin, and clip-mask.
+.LP
+.ZN XCopyArea
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.LP
+The
+.ZN XCopyPlane
+function uses a single bit plane of the specified source rectangle
+combined with the specified GC to modify the specified rectangle of dest.
+The drawables must have the same root but need not have the same depth.
+If the drawables do not have the same root, a
+.ZN BadMatch
+error results.
+If plane does not have exactly one bit set to 1 and the value of plane
+is not less than %2 sup n%, where \fIn\fP is the depth of src, a
+.ZN BadValue
+error results.
+.LP
+Effectively, 
+.ZN XCopyPlane
+forms a pixmap of the same depth as the rectangle of dest and with a
+size specified by the source region. 
+It uses the foreground/background pixels in the GC (foreground
+everywhere the bit plane in src contains a bit set to 1,
+background everywhere the bit plane in src contains a bit set to 0)
+and the equivalent of a 
+.ZN CopyArea
+protocol request is performed with all the same exposure semantics.
+This can also be thought of as using the specified region of the source 
+bit plane as a stipple with a fill-style of
+.ZN FillOpaqueStippled
+for filling a rectangular area of the destination.
+.LP
+This function uses these GC components: function, plane-mask, foreground,
+background, subwindow-mode, graphics-exposures, clip-x-origin, clip-y-origin,
+and clip-mask.
+.LP
+.ZN XCopyPlane
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XClearArea(__libmansuffix__)
+.br
+\fIXlib \- C Language X Interface\fP
diff --git a/libX11/man/XCreateColormap.man b/libX11/man/XCreateColormap.man
index 3294d3062..9a75b2693 100644
--- a/libX11/man/XCreateColormap.man
+++ b/libX11/man/XCreateColormap.man
@@ -1,367 +1,304 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateColormap, XCopyColormapAndFree, XFreeColormap, XColor \- create, copy, or destroy colormaps and color structure

-.SH SYNTAX

-.HP

-Colormap XCreateColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Visual *\fIvisual\fP\^, int \fIalloc\fP\^);

-.HP

-Colormap XCopyColormapAndFree\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^); 

-.HP

-int XFreeColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^); 

-.SH ARGUMENTS

-.IP \fIalloc\fP 1i

-Specifies the colormap entries to be allocated.

-You can pass 

-.ZN AllocNone 

-or 

-.ZN AllocAll .

-.ds Cm that you want to create, copy, set, or destroy

-.IP \fIcolormap\fP 1i

-Specifies the colormap \*(Cm.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIvisual\fP 1i

-Specifies a visual type supported on the screen.

-If the visual type is not one supported by the screen, 

-a

-.ZN BadMatch

-error results.

-.ds Wi on whose screen you want to create a colormap

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XCreateColormap

-function creates a colormap of the specified visual type for the screen 

-on which the specified window resides and returns the colormap ID 

-associated with it.

-Note that the specified window is only used to determine the screen.

-.LP

-The initial values of the colormap entries are undefined for the 

-visual classes

-.ZN GrayScale ,

-.ZN PseudoColor ,

-and

-.ZN DirectColor .

-For

-.ZN StaticGray ,

-.ZN StaticColor ,

-and

-.ZN TrueColor ,

-the entries have defined values,

-but those values are specific to the visual and are not defined by X.

-For

-.ZN StaticGray ,

-.ZN StaticColor ,

-and

-.ZN TrueColor ,

-alloc must be

-.ZN AllocNone ,

-or a

-.ZN BadMatch

-error results.

-For the other visual classes,

-if alloc is

-.ZN AllocNone ,

-the colormap initially has no allocated entries,

-and clients can allocate them.

-For information about the visual types,

-see section 3.1.

-.LP

-If alloc is

-.ZN AllocAll ,

-the entire colormap is allocated writable.

-The initial values of all allocated entries are undefined.

-For

-.ZN GrayScale

-and

-.ZN PseudoColor ,

-the effect is as if an

-.ZN XAllocColorCells

-call returned all pixel values from zero to N \- 1,

-where N is the colormap entries value in the specified visual.

-For

-.ZN DirectColor ,

-the effect is as if an

-.ZN XAllocColorPlanes

-call returned a pixel value of zero and red_mask, green_mask, 

-and blue_mask values containing the same bits as the corresponding

-masks in the specified visual.

-However, in all cases,

-none of these entries can be freed by using

-.ZN XFreeColors .

-.LP

-.ZN XCreateColormap

-can generate

-.ZN BadAlloc ,

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XCopyColormapAndFree

-function creates a colormap of the same visual type and for the same screen

-as the specified colormap and returns the new colormap ID.

-It also moves all of the client's existing allocation from the specified

-colormap to the new colormap with their color values intact 

-and their read-only or writable characteristics intact and frees those entries 

-in the specified colormap.

-Color values in other entries in the new colormap are undefined.

-If the specified colormap was created by the client with alloc set to

-.ZN AllocAll ,

-the new colormap is also created with 

-.ZN AllocAll ,

-all color values for all entries are copied from the specified colormap,

-and then all entries in the specified colormap are freed.

-If the specified colormap was not created by the client with

-.ZN AllocAll ,

-the allocations to be moved are all those pixels and planes

-that have been allocated by the client using

-.ZN XAllocColor ,

-.ZN XAllocNamedColor ,

-.ZN XAllocColorCells ,

-or

-.ZN XAllocColorPlanes

-and that have not been freed since they were allocated.

-.LP

-.ZN XCopyColormapAndFree

-can generate

-.ZN BadAlloc

-and

-.ZN BadColor 

-errors.

-.LP

-The

-.ZN XFreeColormap

-function deletes the association between the colormap resource ID 

-and the colormap and frees the colormap storage.

-However, this function has no effect on the default colormap for a screen.

-If the specified colormap is an installed map for a screen,

-it is uninstalled (see

-.ZN XUninstallColormap ).

-If the specified colormap is defined as the colormap for a window (by

-.ZN XCreateWindow ,

-.ZN XSetWindowColormap ,

-or

-.ZN XChangeWindowAttributes ),

-.ZN XFreeColormap

-changes the colormap associated with the window to

-.ZN None 

-and generates a

-.ZN ColormapNotify

-event.

-X does not define the colors displayed for a window with a colormap of

-.ZN None .

-.LP

-.ZN XFreeColormap

-can generate a

-.ZN BadColor 

-error.

-.SH STRUCTURES

-The

-.ZN XColor

-structure contains:

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	unsigned long pixel;	/\&* pixel value */

-	unsigned short red, green, blue;	/\&* rgb values */

-	char flags;	/\&* DoRed, DoGreen, DoBlue */	

-	char pad;

-} XColor;

-.De

-.LP

-The red, green, and blue values are always in the range 0 to 65535

-inclusive, independent of the number of bits actually used in the

-display hardware.

-The server scales these values down to the range used by the hardware.

-Black is represented by (0,0,0), 

-and white is represented by (65535,65535,65535).

-.IN "Color"

-In some functions,

-the flags member controls which of the red, green, and blue members is used 

-and can be the inclusive OR of zero or more of

-.ZN DoRed ,

-.ZN DoGreen ,

-and 

-.ZN DoBlue .

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocColor(__libmansuffix__),

-XChangeWindowAttributes(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XQueryColor(__libmansuffix__),

-XStoreColors(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateColormap, XCopyColormapAndFree, XFreeColormap, XColor \- create, copy, or destroy colormaps and color structure
+.SH SYNTAX
+.HP
+Colormap XCreateColormap\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Visual *\fIvisual\fP\^, int \fIalloc\fP\^);
+.HP
+Colormap XCopyColormapAndFree\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^); 
+.HP
+int XFreeColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^); 
+.SH ARGUMENTS
+.IP \fIalloc\fP 1i
+Specifies the colormap entries to be allocated.
+You can pass 
+.ZN AllocNone 
+or 
+.ZN AllocAll .
+.ds Cm that you want to create, copy, set, or destroy
+.IP \fIcolormap\fP 1i
+Specifies the colormap \*(Cm.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIvisual\fP 1i
+Specifies a visual type supported on the screen.
+If the visual type is not one supported by the screen, 
+a
+.ZN BadMatch
+error results.
+.ds Wi on whose screen you want to create a colormap
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XCreateColormap
+function creates a colormap of the specified visual type for the screen 
+on which the specified window resides and returns the colormap ID 
+associated with it.
+Note that the specified window is only used to determine the screen.
+.LP
+The initial values of the colormap entries are undefined for the 
+visual classes
+.ZN GrayScale ,
+.ZN PseudoColor ,
+and
+.ZN DirectColor .
+For
+.ZN StaticGray ,
+.ZN StaticColor ,
+and
+.ZN TrueColor ,
+the entries have defined values,
+but those values are specific to the visual and are not defined by X.
+For
+.ZN StaticGray ,
+.ZN StaticColor ,
+and
+.ZN TrueColor ,
+alloc must be
+.ZN AllocNone ,
+or a
+.ZN BadMatch
+error results.
+For the other visual classes,
+if alloc is
+.ZN AllocNone ,
+the colormap initially has no allocated entries,
+and clients can allocate them.
+For information about the visual types,
+see section 3.1.
+.LP
+If alloc is
+.ZN AllocAll ,
+the entire colormap is allocated writable.
+The initial values of all allocated entries are undefined.
+For
+.ZN GrayScale
+and
+.ZN PseudoColor ,
+the effect is as if an
+.ZN XAllocColorCells
+call returned all pixel values from zero to N \- 1,
+where N is the colormap entries value in the specified visual.
+For
+.ZN DirectColor ,
+the effect is as if an
+.ZN XAllocColorPlanes
+call returned a pixel value of zero and red_mask, green_mask, 
+and blue_mask values containing the same bits as the corresponding
+masks in the specified visual.
+However, in all cases,
+none of these entries can be freed by using
+.ZN XFreeColors .
+.LP
+.ZN XCreateColormap
+can generate
+.ZN BadAlloc ,
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XCopyColormapAndFree
+function creates a colormap of the same visual type and for the same screen
+as the specified colormap and returns the new colormap ID.
+It also moves all of the client's existing allocation from the specified
+colormap to the new colormap with their color values intact 
+and their read-only or writable characteristics intact and frees those entries 
+in the specified colormap.
+Color values in other entries in the new colormap are undefined.
+If the specified colormap was created by the client with alloc set to
+.ZN AllocAll ,
+the new colormap is also created with 
+.ZN AllocAll ,
+all color values for all entries are copied from the specified colormap,
+and then all entries in the specified colormap are freed.
+If the specified colormap was not created by the client with
+.ZN AllocAll ,
+the allocations to be moved are all those pixels and planes
+that have been allocated by the client using
+.ZN XAllocColor ,
+.ZN XAllocNamedColor ,
+.ZN XAllocColorCells ,
+or
+.ZN XAllocColorPlanes
+and that have not been freed since they were allocated.
+.LP
+.ZN XCopyColormapAndFree
+can generate
+.ZN BadAlloc
+and
+.ZN BadColor 
+errors.
+.LP
+The
+.ZN XFreeColormap
+function deletes the association between the colormap resource ID 
+and the colormap and frees the colormap storage.
+However, this function has no effect on the default colormap for a screen.
+If the specified colormap is an installed map for a screen,
+it is uninstalled (see
+.ZN XUninstallColormap ).
+If the specified colormap is defined as the colormap for a window (by
+.ZN XCreateWindow ,
+.ZN XSetWindowColormap ,
+or
+.ZN XChangeWindowAttributes ),
+.ZN XFreeColormap
+changes the colormap associated with the window to
+.ZN None 
+and generates a
+.ZN ColormapNotify
+event.
+X does not define the colors displayed for a window with a colormap of
+.ZN None .
+.LP
+.ZN XFreeColormap
+can generate a
+.ZN BadColor 
+error.
+.SH STRUCTURES
+The
+.ZN XColor
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        unsigned long pixel;    /\&* pixel value */
+        unsigned short red, green, blue;        /\&* rgb values */
+        char flags;     /\&* DoRed, DoGreen, DoBlue */  
+        char pad;
+} XColor;
+.De
+.LP
+The red, green, and blue values are always in the range 0 to 65535
+inclusive, independent of the number of bits actually used in the
+display hardware.
+The server scales these values down to the range used by the hardware.
+Black is represented by (0,0,0), 
+and white is represented by (65535,65535,65535).
+.IN "Color"
+In some functions,
+the flags member controls which of the red, green, and blue members is used 
+and can be the inclusive OR of zero or more of
+.ZN DoRed ,
+.ZN DoGreen ,
+and 
+.ZN DoBlue .
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocColor(__libmansuffix__),
+XChangeWindowAttributes(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XQueryColor(__libmansuffix__),
+XStoreColors(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateFontCursor.man b/libX11/man/XCreateFontCursor.man
index bcd8286a6..637d92658 100644
--- a/libX11/man/XCreateFontCursor.man
+++ b/libX11/man/XCreateFontCursor.man
@@ -1,316 +1,255 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateFontCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateFontCursor, XCreatePixmapCursor, XCreateGlyphCursor \- create cursors

-.SH SYNTAX

-\&#include <X11/cursorfont.h>

-.HP

-Cursor XCreateFontCursor\^(\^Display *\fIdisplay\fP\^, unsigned int

-\fIshape\fP\^); 

-.HP

-Cursor XCreatePixmapCursor\^(\^Display *\fIdisplay\fP\^, Pixmap

-\fIsource\fP\^, Pixmap \fImask\fP\^, XColor *\fIforeground_color\fP\^, XColor

-*\fIbackground_color\fP\^, unsigned int \fIx\fP\^, unsigned int \fIy\fP\^);

-.HP

-Cursor XCreateGlyphCursor\^(\^Display *\fIdisplay\fP\^, Font

-\fIsource_font\fP\^, Font \fImask_font\fP\^, unsigned int \fIsource_char\fP\^,

-unsigned int \fImask_char\fP\^, XColor *\fIforeground_color\fP\^, XColor

-*\fIbackground_color\fP\^); 

-.SH ARGUMENTS

-.IP \fIbackground_color\fP 1i

-Specifies the RGB values for the background of the source.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIforeground_color\fP 1i

-Specifies the RGB values for the foreground of the source. 

-.IP \fImask\fP 1i

-Specifies the cursor's source bits to be displayed or

-.ZN None .

-.IP \fImask_char\fP 1i

-Specifies the glyph character for the mask. 

-.IP \fImask_font\fP 1i

-Specifies the font for the mask glyph or

-.ZN None .

-.IP \fIshape\fP 1i

-Specifies the shape of the cursor.

-.IP \fIsource\fP 1i

-Specifies the shape of the source cursor.

-.\" *** JIM: NEED TO CHECK THIS. ***

-.IP \fIsource_char\fP 1i

-Specifies the character glyph for the source.

-.IP \fIsource_font\fP 1i

-Specifies the font for the source glyph.

-.ds Xy , which indicate the hotspot relative to the source's origin

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-X provides a set of standard cursor shapes in a special font named

-cursor.

-Applications are encouraged to use this interface for their cursors

-because the font can be customized for the individual display type.

-The shape argument specifies which glyph of the standard fonts

-to use.

-.LP

-The hotspot comes from the information stored in the cursor font.

-The initial colors of a cursor are a black foreground and a white

-background (see

-.ZN XRecolorCursor ).

-.LP

-.ZN XCreateFontCursor

-can generate

-.ZN BadAlloc

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XCreatePixmapCursor

-function creates a cursor and returns the cursor ID associated with it.

-The foreground and background RGB values must be specified using

-foreground_color and background_color,

-even if the X server only has a

-.ZN StaticGray

-or

-.ZN GrayScale

-screen.

-The foreground color is used for the pixels set to 1 in the

-source, and the background color is used for the pixels set to 0.

-Both source and mask, if specified, must have depth one (or a 

-.ZN BadMatch

-error results) but can have any root.

-The mask argument defines the shape of the cursor.

-The pixels set to 1 in the mask define which source pixels are displayed,

-and the pixels set to 0 define which pixels are ignored.

-If no mask is given, 

-all pixels of the source are displayed.

-The mask, if present, must be the same size as the pixmap defined by the 

-source argument, or a

-.ZN BadMatch

-error results.

-The hotspot must be a point within the source,

-or a

-.ZN BadMatch

-error results.

-.LP

-The components of the cursor can be transformed arbitrarily to meet

-display limitations.

-The pixmaps can be freed immediately if no further explicit references

-to them are to be made.

-Subsequent drawing in the source or mask pixmap has an undefined effect on the

-cursor.

-The X server might or might not make a copy of the pixmap.

-.LP

-.ZN XCreatePixmapCursor

-can generate

-.ZN BadAlloc

-and

-.ZN BadPixmap 

-errors.

-.LP

-The

-.ZN XCreateGlyphCursor

-function is similar to

-.ZN XCreatePixmapCursor

-except that the source and mask bitmaps are obtained from the specified 

-font glyphs.

-The source_char must be a defined glyph in source_font, 

-or a

-.ZN BadValue

-error results.

-If mask_font is given, 

-mask_char must be a defined glyph in mask_font,

-or a

-.ZN BadValue

-error results.

-The mask_font and character are optional.

-The origins of the source_char and mask_char (if defined) glyphs are

-positioned coincidently and define the hotspot. 

-The source_char and mask_char need not have the same bounding box metrics, 

-and there is no restriction on the placement of the hotspot relative to the bounding

-boxes. 

-If no mask_char is given, all pixels of the source are displayed.

-You can free the fonts immediately by calling

-.ZN XFreeFont

-if no further explicit references to them are to be made. 

-.LP

-For 2-byte matrix fonts, 

-the 16-bit value should be formed with the byte1

-member in the most significant byte and the byte2 member in the 

-least significant byte.

-.LP

-.ZN XCreateGlyphCursor

-can generate

-.ZN BadAlloc ,

-.ZN BadFont ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XDefineCursor(__libmansuffix__),

-XLoadFont(__libmansuffix__),

-XRecolorCursor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateFontCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateFontCursor, XCreatePixmapCursor, XCreateGlyphCursor \- create cursors
+.SH SYNTAX
+\&#include <X11/cursorfont.h>
+.HP
+Cursor XCreateFontCursor\^(\^Display *\fIdisplay\fP\^, unsigned int
+\fIshape\fP\^); 
+.HP
+Cursor XCreatePixmapCursor\^(\^Display *\fIdisplay\fP\^, Pixmap
+\fIsource\fP\^, Pixmap \fImask\fP\^, XColor *\fIforeground_color\fP\^, XColor
+*\fIbackground_color\fP\^, unsigned int \fIx\fP\^, unsigned int \fIy\fP\^);
+.HP
+Cursor XCreateGlyphCursor\^(\^Display *\fIdisplay\fP\^, Font
+\fIsource_font\fP\^, Font \fImask_font\fP\^, unsigned int \fIsource_char\fP\^,
+unsigned int \fImask_char\fP\^, XColor *\fIforeground_color\fP\^, XColor
+*\fIbackground_color\fP\^); 
+.SH ARGUMENTS
+.IP \fIbackground_color\fP 1i
+Specifies the RGB values for the background of the source.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIforeground_color\fP 1i
+Specifies the RGB values for the foreground of the source. 
+.IP \fImask\fP 1i
+Specifies the cursor's source bits to be displayed or
+.ZN None .
+.IP \fImask_char\fP 1i
+Specifies the glyph character for the mask. 
+.IP \fImask_font\fP 1i
+Specifies the font for the mask glyph or
+.ZN None .
+.IP \fIshape\fP 1i
+Specifies the shape of the cursor.
+.IP \fIsource\fP 1i
+Specifies the shape of the source cursor.
+.\" *** JIM: NEED TO CHECK THIS. ***
+.IP \fIsource_char\fP 1i
+Specifies the character glyph for the source.
+.IP \fIsource_font\fP 1i
+Specifies the font for the source glyph.
+.ds Xy , which indicate the hotspot relative to the source's origin
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+X provides a set of standard cursor shapes in a special font named
+cursor.
+Applications are encouraged to use this interface for their cursors
+because the font can be customized for the individual display type.
+The shape argument specifies which glyph of the standard fonts
+to use.
+.LP
+The hotspot comes from the information stored in the cursor font.
+The initial colors of a cursor are a black foreground and a white
+background (see
+.ZN XRecolorCursor ).
+.LP
+.ZN XCreateFontCursor
+can generate
+.ZN BadAlloc
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XCreatePixmapCursor
+function creates a cursor and returns the cursor ID associated with it.
+The foreground and background RGB values must be specified using
+foreground_color and background_color,
+even if the X server only has a
+.ZN StaticGray
+or
+.ZN GrayScale
+screen.
+The foreground color is used for the pixels set to 1 in the
+source, and the background color is used for the pixels set to 0.
+Both source and mask, if specified, must have depth one (or a 
+.ZN BadMatch
+error results) but can have any root.
+The mask argument defines the shape of the cursor.
+The pixels set to 1 in the mask define which source pixels are displayed,
+and the pixels set to 0 define which pixels are ignored.
+If no mask is given, 
+all pixels of the source are displayed.
+The mask, if present, must be the same size as the pixmap defined by the 
+source argument, or a
+.ZN BadMatch
+error results.
+The hotspot must be a point within the source,
+or a
+.ZN BadMatch
+error results.
+.LP
+The components of the cursor can be transformed arbitrarily to meet
+display limitations.
+The pixmaps can be freed immediately if no further explicit references
+to them are to be made.
+Subsequent drawing in the source or mask pixmap has an undefined effect on the
+cursor.
+The X server might or might not make a copy of the pixmap.
+.LP
+.ZN XCreatePixmapCursor
+can generate
+.ZN BadAlloc
+and
+.ZN BadPixmap 
+errors.
+.LP
+The
+.ZN XCreateGlyphCursor
+function is similar to
+.ZN XCreatePixmapCursor
+except that the source and mask bitmaps are obtained from the specified 
+font glyphs.
+The source_char must be a defined glyph in source_font, 
+or a
+.ZN BadValue
+error results.
+If mask_font is given, 
+mask_char must be a defined glyph in mask_font,
+or a
+.ZN BadValue
+error results.
+The mask_font and character are optional.
+The origins of the source_char and mask_char (if defined) glyphs are
+positioned coincidently and define the hotspot. 
+The source_char and mask_char need not have the same bounding box metrics, 
+and there is no restriction on the placement of the hotspot relative to the bounding
+boxes. 
+If no mask_char is given, all pixels of the source are displayed.
+You can free the fonts immediately by calling
+.ZN XFreeFont
+if no further explicit references to them are to be made. 
+.LP
+For 2-byte matrix fonts, 
+the 16-bit value should be formed with the byte1
+member in the most significant byte and the byte2 member in the 
+least significant byte.
+.LP
+.ZN XCreateGlyphCursor
+can generate
+.ZN BadAlloc ,
+.ZN BadFont ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XDefineCursor(__libmansuffix__),
+XLoadFont(__libmansuffix__),
+XRecolorCursor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateFontSet.man b/libX11/man/XCreateFontSet.man
index c2882186c..38cb9f3d6 100644
--- a/libX11/man/XCreateFontSet.man
+++ b/libX11/man/XCreateFontSet.man
@@ -1,375 +1,314 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateFontSet, XFreeFontSet \- create and free an international text drawing font set

-.SH SYNTAX

-.HP

-XFontSet XCreateFontSet\^(\^Display *\fIdisplay\fP\^, char

-*\fIbase_font_name_list\fP\^, char ***\fImissing_charset_list_return\fP\^, int

-*\fImissing_charset_count_return\fP\^, char **\fIdef_string_return\fP\^);

-.HP

-void XFreeFontSet\^(\^Display *\fIdisplay\fP\^, XFontSet \fIfont_set\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIbase_font_name_list\fP 1i

-Specifies the base font names.

-.IP \fIdef_string_return\fP 1i

-Returns the string drawn for missing charsets.

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fImissing_charset_count_return\fP 1i

-Returns the number of missing charsets.

-.IP \fImissing_charset_list_return\fP 1i

-Returns the missing charsets.

-.SH DESCRIPTION

-The 

-.ZN XCreateFontSet

-function creates a font set for the specified display.

-The font set is bound to the current locale when 

-.ZN XCreateFontSet

-is called.

-The font set may be used in subsequent calls to obtain font

-and character information and to image text in the locale of the font set.

-.LP

-The base_font_name_list argument is a list of base font names

-that Xlib uses to load the fonts needed for the locale.

-The base font names are a comma-separated list.

-The string is null-terminated

-and is assumed to be in the Host Portable Character Encoding; 

-otherwise, the result is implementation-dependent.

-White space immediately on either side of a separating comma is ignored.

-.LP

-Use of XLFD font names permits Xlib to obtain the fonts needed for a

-variety of locales from a single locale-independent base font name.

-The single base font name should name a family of fonts whose members

-are encoded in the various charsets needed by the locales of interest.

-.LP

-An XLFD base font name can explicitly name a charset needed for the locale.

-This allows the user to specify an exact font for use with a charset required

-by a locale, fully controlling the font selection.

-.LP

-If a base font name is not an XLFD name,

-Xlib will attempt to obtain an XLFD name from the font properties

-for the font.

-If this action is successful in obtaining an XLFD name, the

-.ZN XBaseFontNameListOfFontSet

-function will return this XLFD name instead of the client-supplied name.

-.LP

-Xlib uses the following algorithm to select the fonts

-that will be used to display text with the 

-.ZN XFontSet .

-.LP

-For each font charset required by the locale,

-the base font name list is searched for the first appearance of one 

-of the following cases that names a set of fonts that exist at the server:

-.IP \(bu 5

-The first XLFD-conforming base font name that specifies the required

-charset or a superset of the required charset in its 

-.ZN CharSetRegistry

-and 

-.ZN CharSetEncoding

-fields.

-The implementation may use a base font name whose specified charset

-is a superset of the required charset, for example,

-an ISO8859-1 font for an ASCII charset.

-.IP \(bu 5

-The first set of one or more XLFD-conforming base font names

-that specify one or more charsets that can be remapped to support the

-required charset.

-The Xlib implementation may recognize various mappings 

-from a required charset to one or more other charsets

-and use the fonts for those charsets.

-For example, JIS Roman is ASCII with tilde and backslash replaced 

-by yen and overbar;

-Xlib may load an ISO8859-1 font to support this character set

-if a JIS Roman font is not available.

-.IP \(bu 5

-The first XLFD-conforming font name or the first non-XLFD font name

-for which an XLFD font name can be obtained, combined with the

-required charset (replacing the 

-.ZN CharSetRegistry

-and

-.ZN CharSetEncoding

-fields in the XLFD font name).

-As in case 1,

-the implementation may use a charset that is a superset

-of the required charset.

-.IP \(bu 5

-The first font name that can be mapped in some implementation-dependent

-manner to one or more fonts that support imaging text in the charset.

-.LP

-For example, assume that a locale required the charsets:

-.LP

-.Ds 0

-ISO8859-1

-JISX0208.1983

-JISX0201.1976

-GB2312-1980.0

-.De

-.LP

-The user could supply a base_font_name_list that explicitly specifies the

-charsets, ensuring that specific fonts are used if they exist.

-For example:

-.LP

-.Ds 0

-"-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-240-JISX0208.1983-0,\\

--JIS-Fixed-Medium-R-Normal--26-180-100-100-C-120-JISX0201.1976-0,\\

--GB-Fixed-Medium-R-Normal--26-180-100-100-C-240-GB2312-1980.0,\\

--Adobe-Courier-Bold-R-Normal--25-180-75-75-M-150-ISO8859-1"

-.De

-.LP

-Alternatively, the user could supply a base_font_name_list

-that omits the charsets,

-letting Xlib select font charsets required for the locale.

-For example:

-.LP

-.Ds 0

-"-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-240,\\

--JIS-Fixed-Medium-R-Normal--26-180-100-100-C-120,\\

--GB-Fixed-Medium-R-Normal--26-180-100-100-C-240,\\

--Adobe-Courier-Bold-R-Normal--25-180-100-100-M-150"

-.De

-.LP

-Alternatively, the user could simply supply a single base font name

-that allows Xlib to select from all available fonts

-that meet certain minimum XLFD property requirements.

-For example:

-.LP

-.Ds 0

-"-*-*-*-R-Normal--*-180-100-100-*-*"

-.De

-.LP

-If 

-.ZN XCreateFontSet

-is unable to create the font set, 

-either because there is insufficient memory or because the current locale

-is not supported,

-.ZN XCreateFontSet

-returns NULL, missing_charset_list_return is set to NULL,

-and missing_charset_count_return

-is set to zero.

-If fonts exist for all of the charsets required by the current locale,

-.ZN XCreateFontSet

-returns a valid

-.ZN XFontSet ,

-missing_charset_list_return is set to NULL,

-and missing_charset_count_return is set to zero.

-.LP

-If no font exists for one or more of the required charsets,

-.ZN XCreateFontSet

-sets missing_charset_list_return to a

-list of one or more null-terminated charset names for which no font exists

-and sets missing_charset_count_return to the number of missing fonts.

-The charsets are from the list of the required charsets for

-the encoding of the locale and do not include any charsets to which Xlib

-may be able to remap a required charset.

-.LP

-If no font exists for any of the required charsets

-or if the locale definition in Xlib requires that a font exist

-for a particular charset and a font is not found for that charset, 

-.ZN XCreateFontSet

-returns NULL.

-Otherwise, 

-.ZN XCreateFontSet

-returns a valid 

-.ZN XFontSet

-to font_set.

-.LP

-When an Xmb/wc drawing or measuring function is called with an

-.ZN XFontSet

-that has missing charsets, some characters in the locale will not be

-drawable.

-If def_string_return is non-NULL,

-.ZN XCreateFontSet

-returns a pointer to a string that represents the glyphs

-that are drawn with this 

-.ZN XFontSet

-when the charsets of the available fonts do not include all font glyphs

-required to draw a codepoint.

-The string does not necessarily consist of valid characters 

-in the current locale and is not necessarily drawn with

-the fonts loaded for the font set,

-but the client can draw and measure the default glyphs

-by including this string in a string being drawn or measured with the 

-.ZN XFontSet .

-.LP

-If the string returned to def_string_return is the empty string ("\^"),

-no glyphs are drawn, and the escapement is zero.

-The returned string is null-terminated.

-It is owned by Xlib and should not be modified or freed by the client.

-It will be freed by a call to 

-.ZN XFreeFontSet

-with the associated 

-.ZN XFontSet .

-Until freed, its contents will not be modified by Xlib.

-.LP

-The client is responsible for constructing an error message from the

-missing charset and default string information and may choose to continue

-operation in the case that some fonts did not exist.

-.LP

-The returned 

-.ZN XFontSet

-and missing charset list should be freed with 

-.ZN XFreeFontSet

-and

-.ZN XFreeStringList ,

-respectively.

-The client-supplied base_font_name_list may be freed 

-by the client after calling 

-.ZN XCreateFontSet .

-.LP

-The

-.ZN XFreeFontSet

-function frees the specified font set.

-The associated base font name list, font name list, 

-.ZN XFontStruct

-list, and 

-.ZN XFontSetExtents , 

-if any, are freed.

-.SH "SEE ALSO"

-XExtentsofFontSet(__libmansuffix__),

-XFontsOfFontSet(__libmansuffix__),

-XFontSetExtents(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateFontSet, XFreeFontSet \- create and free an international text drawing font set
+.SH SYNTAX
+.HP
+XFontSet XCreateFontSet\^(\^Display *\fIdisplay\fP\^, char
+*\fIbase_font_name_list\fP\^, char ***\fImissing_charset_list_return\fP\^, int
+*\fImissing_charset_count_return\fP\^, char **\fIdef_string_return\fP\^);
+.HP
+void XFreeFontSet\^(\^Display *\fIdisplay\fP\^, XFontSet \fIfont_set\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIbase_font_name_list\fP 1i
+Specifies the base font names.
+.IP \fIdef_string_return\fP 1i
+Returns the string drawn for missing charsets.
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fImissing_charset_count_return\fP 1i
+Returns the number of missing charsets.
+.IP \fImissing_charset_list_return\fP 1i
+Returns the missing charsets.
+.SH DESCRIPTION
+The 
+.ZN XCreateFontSet
+function creates a font set for the specified display.
+The font set is bound to the current locale when 
+.ZN XCreateFontSet
+is called.
+The font set may be used in subsequent calls to obtain font
+and character information and to image text in the locale of the font set.
+.LP
+The base_font_name_list argument is a list of base font names
+that Xlib uses to load the fonts needed for the locale.
+The base font names are a comma-separated list.
+The string is null-terminated
+and is assumed to be in the Host Portable Character Encoding; 
+otherwise, the result is implementation-dependent.
+White space immediately on either side of a separating comma is ignored.
+.LP
+Use of XLFD font names permits Xlib to obtain the fonts needed for a
+variety of locales from a single locale-independent base font name.
+The single base font name should name a family of fonts whose members
+are encoded in the various charsets needed by the locales of interest.
+.LP
+An XLFD base font name can explicitly name a charset needed for the locale.
+This allows the user to specify an exact font for use with a charset required
+by a locale, fully controlling the font selection.
+.LP
+If a base font name is not an XLFD name,
+Xlib will attempt to obtain an XLFD name from the font properties
+for the font.
+If this action is successful in obtaining an XLFD name, the
+.ZN XBaseFontNameListOfFontSet
+function will return this XLFD name instead of the client-supplied name.
+.LP
+Xlib uses the following algorithm to select the fonts
+that will be used to display text with the 
+.ZN XFontSet .
+.LP
+For each font charset required by the locale,
+the base font name list is searched for the first appearance of one 
+of the following cases that names a set of fonts that exist at the server:
+.IP \(bu 5
+The first XLFD-conforming base font name that specifies the required
+charset or a superset of the required charset in its 
+.ZN CharSetRegistry
+and 
+.ZN CharSetEncoding
+fields.
+The implementation may use a base font name whose specified charset
+is a superset of the required charset, for example,
+an ISO8859-1 font for an ASCII charset.
+.IP \(bu 5
+The first set of one or more XLFD-conforming base font names
+that specify one or more charsets that can be remapped to support the
+required charset.
+The Xlib implementation may recognize various mappings 
+from a required charset to one or more other charsets
+and use the fonts for those charsets.
+For example, JIS Roman is ASCII with tilde and backslash replaced 
+by yen and overbar;
+Xlib may load an ISO8859-1 font to support this character set
+if a JIS Roman font is not available.
+.IP \(bu 5
+The first XLFD-conforming font name or the first non-XLFD font name
+for which an XLFD font name can be obtained, combined with the
+required charset (replacing the 
+.ZN CharSetRegistry
+and
+.ZN CharSetEncoding
+fields in the XLFD font name).
+As in case 1,
+the implementation may use a charset that is a superset
+of the required charset.
+.IP \(bu 5
+The first font name that can be mapped in some implementation-dependent
+manner to one or more fonts that support imaging text in the charset.
+.LP
+For example, assume that a locale required the charsets:
+.LP
+.Ds 0
+ISO8859-1
+JISX0208.1983
+JISX0201.1976
+GB2312-1980.0
+.De
+.LP
+The user could supply a base_font_name_list that explicitly specifies the
+charsets, ensuring that specific fonts are used if they exist.
+For example:
+.LP
+.Ds 0
+"-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-240-JISX0208.1983-0,\\
+-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-120-JISX0201.1976-0,\\
+-GB-Fixed-Medium-R-Normal--26-180-100-100-C-240-GB2312-1980.0,\\
+-Adobe-Courier-Bold-R-Normal--25-180-75-75-M-150-ISO8859-1"
+.De
+.LP
+Alternatively, the user could supply a base_font_name_list
+that omits the charsets,
+letting Xlib select font charsets required for the locale.
+For example:
+.LP
+.Ds 0
+"-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-240,\\
+-JIS-Fixed-Medium-R-Normal--26-180-100-100-C-120,\\
+-GB-Fixed-Medium-R-Normal--26-180-100-100-C-240,\\
+-Adobe-Courier-Bold-R-Normal--25-180-100-100-M-150"
+.De
+.LP
+Alternatively, the user could simply supply a single base font name
+that allows Xlib to select from all available fonts
+that meet certain minimum XLFD property requirements.
+For example:
+.LP
+.Ds 0
+"-*-*-*-R-Normal--*-180-100-100-*-*"
+.De
+.LP
+If 
+.ZN XCreateFontSet
+is unable to create the font set, 
+either because there is insufficient memory or because the current locale
+is not supported,
+.ZN XCreateFontSet
+returns NULL, missing_charset_list_return is set to NULL,
+and missing_charset_count_return
+is set to zero.
+If fonts exist for all of the charsets required by the current locale,
+.ZN XCreateFontSet
+returns a valid
+.ZN XFontSet ,
+missing_charset_list_return is set to NULL,
+and missing_charset_count_return is set to zero.
+.LP
+If no font exists for one or more of the required charsets,
+.ZN XCreateFontSet
+sets missing_charset_list_return to a
+list of one or more null-terminated charset names for which no font exists
+and sets missing_charset_count_return to the number of missing fonts.
+The charsets are from the list of the required charsets for
+the encoding of the locale and do not include any charsets to which Xlib
+may be able to remap a required charset.
+.LP
+If no font exists for any of the required charsets
+or if the locale definition in Xlib requires that a font exist
+for a particular charset and a font is not found for that charset, 
+.ZN XCreateFontSet
+returns NULL.
+Otherwise, 
+.ZN XCreateFontSet
+returns a valid 
+.ZN XFontSet
+to font_set.
+.LP
+When an Xmb/wc drawing or measuring function is called with an
+.ZN XFontSet
+that has missing charsets, some characters in the locale will not be
+drawable.
+If def_string_return is non-NULL,
+.ZN XCreateFontSet
+returns a pointer to a string that represents the glyphs
+that are drawn with this 
+.ZN XFontSet
+when the charsets of the available fonts do not include all font glyphs
+required to draw a codepoint.
+The string does not necessarily consist of valid characters 
+in the current locale and is not necessarily drawn with
+the fonts loaded for the font set,
+but the client can draw and measure the default glyphs
+by including this string in a string being drawn or measured with the 
+.ZN XFontSet .
+.LP
+If the string returned to def_string_return is the empty string ("\^"),
+no glyphs are drawn, and the escapement is zero.
+The returned string is null-terminated.
+It is owned by Xlib and should not be modified or freed by the client.
+It will be freed by a call to 
+.ZN XFreeFontSet
+with the associated 
+.ZN XFontSet .
+Until freed, its contents will not be modified by Xlib.
+.LP
+The client is responsible for constructing an error message from the
+missing charset and default string information and may choose to continue
+operation in the case that some fonts did not exist.
+.LP
+The returned 
+.ZN XFontSet
+and missing charset list should be freed with 
+.ZN XFreeFontSet
+and
+.ZN XFreeStringList ,
+respectively.
+The client-supplied base_font_name_list may be freed 
+by the client after calling 
+.ZN XCreateFontSet .
+.LP
+The
+.ZN XFreeFontSet
+function frees the specified font set.
+The associated base font name list, font name list, 
+.ZN XFontStruct
+list, and 
+.ZN XFontSetExtents , 
+if any, are freed.
+.SH "SEE ALSO"
+XExtentsofFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateGC.man b/libX11/man/XCreateGC.man
index c55c4c9c7..62a2f00c1 100644
--- a/libX11/man/XCreateGC.man
+++ b/libX11/man/XCreateGC.man
@@ -1,1203 +1,1138 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XCreateGC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateGC, XCopyGC, XChangeGC, XGetGCValues, XFreeGC, XGContextFromGC, XGCValues \- create or free graphics contexts and graphics context structure

-.SH SYNTAX

-.HP

-GC XCreateGC\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, unsigned long

-\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 

-.HP

-int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^,

-unsigned long \fIvaluemask\fP\^, GC \fIdest\fP\^); 

-.HP

-int XChangeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 

-.HP

-Status XGetGCValues\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIvaluemask\fP\^, XGCValues *\fIvalues_return\fP\^); 

-.HP

-int XFreeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^); 

-.HP

-GContext XGContextFromGC\^(\^GC \fIgc\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdest\fP 1i

-Specifies the destination GC.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIsrc\fP 1i

-Specifies the components of the source GC.

-.ds Vm set, copied, changed, or returned 

-.IP \fIvaluemask\fP 1i

-Specifies which components in the GC are to be \*(Vm. 

-This argument is the bitwise inclusive OR of zero or more of the valid

-GC component mask bits.

-.IP \fIvalues\fP 1i

-Specifies any values as specified by the valuemask.

-.IP \fIvalues_return\fP 1i

-Returns the GC values in the specified

-.ZN XGCValues 

-structure.

-.SH DESCRIPTION

-The

-.ZN XCreateGC

-function creates a graphics context and returns a GC.

-The GC can be used with any destination drawable having the same root

-and depth as the specified drawable.

-Use with other drawables results in a

-.ZN BadMatch

-error.

-.LP

-.ZN XCreateGC

-can generate

-.ZN BadAlloc ,

-.ZN BadDrawable ,

-.ZN BadFont ,

-.ZN BadMatch ,

-.ZN BadPixmap ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XCopyGC

-function copies the specified components from the source GC

-to the destination GC.

-The source and destination GCs must have the same root and depth,

-or a

-.ZN BadMatch

-error results.

-The valuemask specifies which component to copy, as for

-.ZN XCreateGC .

-.LP

-.ZN XCopyGC

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadMatch

-errors.

-.LP

-The

-.ZN XChangeGC

-function changes the components specified by valuemask for

-the specified GC.

-The values argument contains the values to be set.

-The values and restrictions are the same as for 

-.ZN XCreateGC .

-Changing the clip-mask overrides any previous 

-.ZN XSetClipRectangles

-request on the context. 

-Changing the dash-offset or dash-list

-overrides any previous 

-.ZN XSetDashes

-request on the context.

-The order in which components are verified and altered is server dependent.

-If an error is generated, a subset of the components may have been altered.

-.LP

-.ZN XChangeGC

-can generate

-.ZN BadAlloc ,

-.ZN BadFont ,

-.ZN BadGC ,

-.ZN BadMatch ,

-.ZN BadPixmap ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XGetGCValues

-function returns the components specified by valuemask for the specified GC.

-If the valuemask contains a valid set of GC mask bits

-.Pn ( GCFunction ,

-.ZN GCPlaneMask ,

-.ZN GCForeground ,

-.ZN GCBackground ,

-.ZN GCLineWidth ,

-.ZN GCLineStyle ,

-.ZN GCCapStyle ,

-.ZN GCJoinStyle ,

-.ZN GCFillStyle ,

-.ZN GCFillRule ,

-.ZN GCTile ,

-.ZN GCStipple ,

-.ZN GCTileStipXOrigin ,

-.ZN GCTileStipYOrigin ,

-.ZN GCFont ,

-.ZN GCSubwindowMode ,

-.ZN GCGraphicsExposures ,

-.ZN GCClipXOrigin ,

-.ZN GCCLipYOrigin ,

-.ZN GCDashOffset ,

-or

-.ZN GCArcMode )

-and no error occurs,

-.ZN XGetGCValues

-sets the requested components in values_return and returns a nonzero status.

-Otherwise, it returns a zero status.

-Note that the clip-mask and dash-list (represented by the

-.ZN GCClipMask

-and 

-.ZN GCDashList

-bits, respectively, in the valuemask)

-cannot be requested.

-Also note that an invalid resource ID (with one or more of the three

-most significant bits set to 1) will be returned for

-.ZN GCFont ,

-.ZN GCTile ,

-and

-.ZN GCStipple

-if the component has never been explicitly set by the client.

-.LP

-The

-.ZN XFreeGC

-function destroys the specified GC as well as all the associated storage.

-.LP

-.ZN XFreeGC

-can generate a

-.ZN BadGC 

-error.

-.SH STRUCTURES

-The

-.ZN XGCValues

-structure contains:

-.LP

-.LP

-/\&* GC attribute value mask bits */

-.TS

-lw(.5i) lw(2.5i) lw(.75i).

-T{

-\&#define

-T}	T{

-.ZN GCFunction

-T}	T{

-(1L<<0)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCPlaneMask

-T}	T{

-(1L<<1)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCForeground

-T}	T{

-(1L<<2)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCBackground

-T}	T{

-(1L<<3)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCLineWidth

-T}	T{

-(1L<<4)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCLineStyle

-T}	T{

-(1L<<5)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCCapStyle

-T}	T{

-(1L<<6)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCJoinStyle

-T}	T{

-(1L<<7)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCFillStyle

-T}	T{

-(1L<<8)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCFillRule

-T}	T{

-(1L<<9)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCTile

-T}	T{

-(1L<<10)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCStipple

-T}	T{

-(1L<<11)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCTileStipXOrigin

-T}	T{

-(1L<<12)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCTileStipYOrigin

-T}	T{

-(1L<<13)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCFont

-T}	T{

-(1L<<14)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCSubwindowMode

-T}	T{

-(1L<<15)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCGraphicsExposures

-T}	T{

-(1L<<16)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCClipXOrigin

-T}	T{

-(1L<<17)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCClipYOrigin

-T}	T{

-(1L<<18)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCClipMask

-T}	T{

-(1L<<19)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCDashOffset

-T}	T{

-(1L<<20)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCDashList

-T}	T{

-(1L<<21)

-T}

-T{

-\&#define

-T}	T{

-.ZN GCArcMode

-T}	T{

-(1L<<22)

-T}

-.TE

-.IN "XGCValues" "" "@DEF@"

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-/\&* Values */

-

-typedef struct {

-	int function;	/\&* logical operation */

-	unsigned long plane_mask;	/\&* plane mask */

-	unsigned long foreground;	/\&* foreground pixel */

-	unsigned long background;	/\&* background pixel */

-	int line_width;	/\&* line width (in pixels) */

-	int line_style;	/\&* LineSolid, LineOnOffDash, LineDoubleDash */

-	int cap_style;	/\&* CapNotLast, CapButt, CapRound, CapProjecting */

-	int join_style;	/\&* JoinMiter, JoinRound, JoinBevel */

-	int fill_style;	/\&* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/

-	int fill_rule;	/\&* EvenOddRule, WindingRule */

-	int arc_mode;	/\&* ArcChord, ArcPieSlice */

-	Pixmap tile;	/\&* tile pixmap for tiling operations */

-	Pixmap stipple;	/\&* stipple 1 plane pixmap for stippling */

-	int ts_x_origin;	/\&* offset for tile or stipple operations */

-	int ts_y_origin;

-	Font font;	/\&* default text font for text operations */

-	int subwindow_mode;	/\&* ClipByChildren, IncludeInferiors */

-	Bool graphics_exposures;	/\&* boolean, should exposures be generated */

-	int clip_x_origin;	/\&* origin for clipping */

-	int clip_y_origin;

-	Pixmap clip_mask;	/\&* bitmap clipping; other calls for rects */

-	int dash_offset;	/\&* patterned/dashed line information */

-	char dashes;

-} XGCValues;

-.De

-.LP

-The function attributes of a GC are used when you update a section of

-a drawable (the destination) with bits from somewhere else (the source).  

-The function in a GC defines how the new destination bits are to be

-computed from the source bits and the old destination bits.

-.ZN GXcopy

-is typically the most useful because it will work on a color display,

-but special applications may use other functions,

-particularly in concert with particular planes of a color display.

-The 16 GC functions, defined in 

-.hN X11/X.h ,

-are:

-.\" are listed in Table 5-1 along with the 

-.\"the associated hexadecimal code

-.\" and operation.

-.\".CP T 1

-.\"Display Functions

-.TS H

-lw(1.5i) cw(.5i) lw(2i).

-_

-.sp 6p

-.B

-Function Name	Value	Operation

-.sp 6p

-_

-.sp 6p

-.TH

-T{

-.ZN GXclear

-T}	T{

-0x0

-T}	T{

-0

-T}

-T{

-.ZN GXand

-T}	T{

-0x1

-T}	T{

-src AND dst

-T}

-T{

-.ZN GXandReverse

-T}	T{

-0x2

-T}	T{

-src AND NOT dst

-T}

-T{

-.ZN GXcopy

-T}	T{

-0x3

-T}	T{

-src

-T}

-T{

-.ZN GXandInverted

-T}	T{

-0x4

-T}	T{

-(NOT src) AND dst

-T}

-T{

-.ZN GXnoop

-T}	T{

-0x5

-T}	T{

-dst

-T}

-T{

-.ZN GXxor

-T}	T{

-0x6

-T}	T{

-src XOR dst

-T}

-T{

-.ZN GXor

-T}	T{

-0x7

-T}	T{

-src OR dst

-T}

-T{

-.ZN GXnor

-T}	T{

-0x8

-T}	T{

-(NOT src) AND (NOT dst)

-T}

-T{

-.ZN GXequiv

-T}	T{

-0x9

-T}	T{

-(NOT src) XOR dst

-T}

-T{

-.ZN GXinvert

-T}	T{

-0xa

-T}	T{

-NOT dst

-T}

-T{

-.ZN GXorReverse

-T}	T{

-0xb

-T}	T{

-src OR (NOT dst)

-T}

-T{

-.ZN GXcopyInverted

-T}	T{

-0xc

-T}	T{

-NOT src

-T}

-T{

-.ZN GXorInverted

-T}	T{

-0xd

-T}	T{

-(NOT src) OR dst

-T}

-T{

-.ZN GXnand

-T}	T{

-0xe

-T}	T{

-(NOT src) OR (NOT dst)

-T}

-T{

-.ZN GXset

-T}	T{

-0xf

-T}	T{

-1

-T}

-.sp 6p

-_

-.TE

-.LP

-Many graphics operations depend on either pixel values or planes in a GC.

-.IN "Pixel value"

-The planes attribute is of type long, and it specifies which planes of the

-destination are to be modified, one bit per plane.

-.IN "Plane" "mask"

-A monochrome display has only one plane and

-will be the least significant bit of the word.

-As planes are added to the display hardware, they will occupy more

-significant bits in the plane mask.

-.LP

-In graphics operations, given a source and destination pixel, 

-the result is computed bitwise on corresponding bits of the pixels.

-That is, a Boolean operation is performed in each bit plane.  

-The plane_mask restricts the operation to a subset of planes.

-A macro constant

-.ZN AllPlanes

-can be used to refer to all planes of the screen simultaneously.

-The result is computed by the following:

-.LP

-.Ds 

-((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask))

-.De

-.LP

-Range checking is not performed on the values for foreground,

-background, or plane_mask.

-They are simply truncated to the appropriate

-number of bits.

-The line-width is measured in pixels and either can be greater than or equal to

-one (wide line) or can be the special value zero (thin line).

-.LP

-Wide lines are drawn centered on the path described by the graphics request.

-Unless otherwise specified by the join-style or cap-style,

-the bounding box of a wide line with endpoints [x1, y1], [x2, y2] and

-width w is a rectangle with vertices at the following real coordinates:

-.LP

-.Ds

-.TA .5i 2.5i

-.ta .5i 2.5i

-[x1-(w*sn/2), y1+(w*cs/2)], [x1+(w*sn/2), y1-(w*cs/2)],

-[x2-(w*sn/2), y2+(w*cs/2)], [x2+(w*sn/2), y2-(w*cs/2)]

-.De

-.LP

-Here sn is the sine of the angle of the line,

-and cs is the cosine of the angle of the line.

-A pixel is part of the line and so is drawn

-if the center of the pixel is fully inside the bounding box

-(which is viewed as having infinitely thin edges).

-If the center of the pixel is exactly on the bounding box,

-it is part of the line if and only if the interior is immediately to its right

-(x increasing direction).

-Pixels with centers on a horizontal edge are a special case and are part of

-the line if and only if the interior or the boundary is immediately below 

-(y increasing direction) and the interior or the boundary is immediately

-to the right (x increasing direction).

-.LP

-Thin lines (zero line-width) are one-pixel-wide lines drawn using an

-unspecified, device-dependent algorithm.

-There are only two constraints on this algorithm. 

-.IP 1. 5

-If a line is drawn unclipped from [x1,y1] to [x2,y2] and

-if another line is drawn unclipped from [x1+dx,y1+dy] to [x2+dx,y2+dy],

-a point [x,y] is touched by drawing the first line 

-if and only if the point [x+dx,y+dy] is touched by drawing the second line.

-.IP 2. 5

-The effective set of points comprising a line cannot be affected by clipping.

-That is, a point is touched in a clipped line if and only if the point 

-lies inside the clipping region and the point would be touched

-by the line when drawn unclipped.

-.LP

-A wide line drawn from [x1,y1] to [x2,y2] always draws the same pixels 

-as a wide line drawn from [x2,y2] to [x1,y1], not counting cap-style 

-and join-style.

-It is recommended that this property be true for thin lines, 

-but this is not required.

-A line-width of zero may differ from a line-width of one in which pixels are

-drawn.

-This permits the use of many manufacturers' line drawing hardware,

-which may run many times faster than the more precisely specified

-wide lines.

-.LP

-In general, 

-drawing a thin line will be faster than drawing a wide line of width one.

-However, because of their different drawing algorithms,

-thin lines may not mix well aesthetically with wide lines.

-If it is desirable to obtain precise and uniform results across all displays,

-a client should always use a line-width of one rather than a line-width of zero.

-.LP

-The line-style defines which sections of a line are drawn:

-.TS

-lw(1.3i) lw(4.5i).

-T{

-.ZN LineSolid

-T}	T{

-The full path of the line is drawn.

-T}

-.sp 6p

-T{

-.ZN LineDoubleDash

-T}	T{

-The full path of the line is drawn, 

-but the even dashes are filled differently 

-from the odd dashes (see fill-style) with

-.ZN CapButt 

-style used where even and odd dashes meet.

-T}

-.sp 6p

-T{

-.ZN LineOnOffDash

-T}	T{

-Only the even dashes are drawn,

-and cap-style applies to 

-all internal ends of the individual dashes,

-except 

-.ZN CapNotLast

-is treated as 

-.ZN CapButt . 

-T}

-.TE

-.LP

-The cap-style defines how the endpoints of a path are drawn:

-.IN "Graphics context" "path"

-.TS

-lw(1.3i) lw(4.5i).

-T{

-.ZN CapNotLast

-T}	T{

-This is equivalent to 

-.ZN CapButt  

-except that for a line-width of zero the final endpoint is not drawn.

-T}

-.sp 6p

-T{

-.ZN CapButt

-T}	T{

-The line is square at the endpoint (perpendicular to the slope of the line)

-with no projection beyond.

-T}

-.sp 6p

-T{

-.ZN CapRound

-T}	T{

-The line has a circular arc with the diameter equal to the line-width,

-centered on the endpoint.

-(This is equivalent to 

-.ZN CapButt 

-for line-width of zero).

-T}

-.sp 6p

-T{

-.ZN CapProjecting

-T}	T{

-The line is square at the end, but the path continues beyond the endpoint 

-for a distance equal to half the line-width.

-(This is equivalent to 

-.ZN CapButt 

-for line-width of zero).

-T}

-.TE

-.LP

-The join-style defines how corners are drawn for wide lines:

-.TS

-lw(1.3i) lw(4.5i).

-T{

-.ZN JoinMiter

-T}	T{

-The outer edges of two lines extend to meet at an angle.

-However, if the angle is less than 11 degrees,

-then a

-.ZN JoinBevel

-join-style is used instead.

-T}

-.sp 6p

-T{

-.ZN JoinRound

-T}	T{

-The corner is a circular arc with the diameter equal to the line-width, 

-centered on the joinpoint.

-T}

-.sp 6p

-T{

-.ZN JoinBevel

-T}	T{

-The corner has

-.ZN CapButt 

-endpoint styles with the triangular notch filled.

-T}

-.TE

-.LP

-For a line with coincident endpoints (x1=x2, y1=y2), 

-when the cap-style is applied to both endpoints, 

-the semantics depends on the line-width and the cap-style:

-.TS

-lw(1.3i) lw(.5i) lw(4i).

-T{

-.ZN CapNotLast

-T}	T{

-thin

-T}	T{

-The results are device dependent, 

-but the desired effect is that nothing is drawn.

-T}

-.sp 6p

-T{

-.ZN CapButt

-T}	T{

-thin

-T}	T{

-The results are device dependent, 

-but the desired effect is that a single pixel is drawn.

-T}

-.sp 6p

-T{

-.ZN CapRound

-T}	T{

-thin

-T}	T{

-The results are the same as for

-.ZN CapButt /thin.

-T}

-.sp 6p

-T{

-.ZN CapProjecting

-T}	T{

-thin

-T}	T{

-The results are the same as for

-.ZN CapButt /thin.

-T}

-.sp 6p

-T{

-.ZN CapButt

-T}	T{

-wide

-T}	T{

-Nothing is drawn.

-T}

-.sp 6p

-T{

-.ZN CapRound

-T}	T{

-wide

-T}	T{

-The closed path is a circle, centered at the endpoint, and

-with the diameter equal to the line-width.

-T}

-.sp 6p

-T{

-.ZN CapProjecting

-T}	T{

-wide

-T}	T{

-The closed path is a square, aligned with the coordinate axes, centered at the

-endpoint, and with the sides equal to the line-width.

-T}

-.TE

-.LP

-For a line with coincident endpoints (x1=x2, y1=y2), 

-when the join-style is applied at one or both endpoints, 

-the effect is as if the line was removed from the overall path.

-However, if the total path consists of or is reduced to a single point joined

-with itself, the effect is the same as when the cap-style is applied at both

-endpoints.

-.LP

-The tile/stipple represents an infinite two-dimensional plane,

-with the tile/stipple replicated in all dimensions.

-When that plane is superimposed on the drawable

-for use in a graphics operation, the upper-left corner

-of some instance of the tile/stipple is at the coordinates within

-the drawable specified by the tile/stipple origin.

-The tile/stipple and clip origins are interpreted relative to the

-origin of whatever destination drawable is specified in a graphics

-request.

-The tile pixmap must have the same root and depth as the GC,

-or a

-.ZN BadMatch 

-error results.

-The stipple pixmap must have depth one and must have the same root as the

-GC, or a 

-.ZN BadMatch 

-error results.  

-For stipple operations where the fill-style is

-.ZN FillStippled

-but not 

-.ZN FillOpaqueStippled ,

-the stipple pattern is tiled in a

-single plane and acts as an additional clip mask to be ANDed with the clip-mask.

-Although some sizes may be faster to use than others,

-any size pixmap can be used for tiling or stippling.

-.LP

-The fill-style defines the contents of the source for line, text, and

-fill requests.  

-For all text and fill requests (for example,

-.ZN XDrawText , 

-.ZN XDrawText16 ,

-.ZN XFillRectangle , 

-.ZN XFillPolygon , 

-and

-.ZN XFillArc );

-for line requests 

-with line-style 

-.ZN LineSolid 

-(for example,

-.ZN XDrawLine ,

-.ZN XDrawSegments , 

-.ZN XDrawRectangle ,

-.ZN XDrawArc );

-and for the even dashes for line requests with line-style 

-.ZN LineOnOffDash 

-or 

-.ZN LineDoubleDash ,

-the following apply:

-.TS

-lw(1.8i) lw(4i).

-T{

-.ZN FillSolid

-T}	T{

-Foreground

-T}

-.sp 6p

-T{

-.ZN FillTiled

-T}	T{

-Tile

-T}

-.sp 6p

-T{

-.ZN FillOpaqueStippled

-T}	T{

-A tile with the same width and height as stipple,

-but with background everywhere stipple has a zero

-and with foreground everywhere stipple has a one

-T}

-.sp 6p

-T{

-.ZN FillStippled

-T}	T{

-Foreground masked by stipple

-T}

-.TE

-.LP

-When drawing lines with line-style

-.ZN LineDoubleDash ,

-the odd dashes are controlled by the fill-style in the following manner:

-.TS

-lw(1.8i) lw(4i).

-T{

-.ZN FillSolid

-T}	T{

-Background

-T}

-.sp 6p

-T{

-.ZN FillTiled

-T}	T{

-Same as for even dashes

-T}

-.sp 6p

-T{

-.ZN FillOpaqueStippled

-T}	T{

-Same as for even dashes

-T}

-.sp 6p

-T{

-.ZN FillStippled

-T}	T{

-Background masked by stipple

-T}

-.TE

-.LP

-Storing a pixmap in a GC might or might not result in a copy

-being made.

-If the pixmap is later used as the destination for a graphics request,

-the change might or might not be reflected in the GC.

-If the pixmap is used simultaneously in a graphics request both as

-a destination and as a tile or stipple,

-the results are undefined.

-.LP

-For optimum performance,

-you should draw as much as possible with the same GC 

-(without changing its components).

-The costs of changing GC components relative to using different GCs

-depend on the display hardware and the server implementation.

-It is quite likely that some amount of GC information will be

-cached in display hardware and that such hardware can only cache a small number

-of GCs.

-.LP

-The dashes value is actually a simplified form of the

-more general patterns that can be set with 

-.ZN XSetDashes .  

-Specifying a

-value of N is equivalent to specifying the two-element list [N, N] in 

-.ZN XSetDashes . 

-The value must be nonzero,

-or a

-.ZN BadValue

-error results.

-.LP

-The clip-mask restricts writes to the destination drawable.  

-If the clip-mask is set to a pixmap,

-it must have depth one and have the same root as the GC,

-or a

-.ZN BadMatch 

-error results.

-If clip-mask is set to

-.ZN None ,

-the pixels are always drawn regardless of the clip origin.

-The clip-mask also can be set by calling the

-.ZN XSetClipRectangles

-or

-.ZN XSetRegion

-functions.

-Only pixels where the clip-mask has a bit set to 1 are drawn.  

-Pixels are not drawn outside the area covered by the clip-mask 

-or where the clip-mask has a bit set to 0.

-The clip-mask affects all graphics requests.

-The clip-mask does not clip sources.

-The clip-mask origin is interpreted relative to the origin of whatever

-destination drawable is specified in a graphics request.

-.LP

-You can set the subwindow-mode to

-.ZN ClipByChildren

-or

-.ZN IncludeInferiors .

-For 

-.ZN ClipByChildren , 

-both source and destination windows are

-additionally clipped by all viewable 

-.ZN InputOutput

-children.  

-For 

-.ZN IncludeInferiors ,

-neither source nor destination window is clipped by inferiors. 

-This will result in including subwindow contents in the source

-and drawing through subwindow boundaries of the destination.

-The use of 

-.ZN IncludeInferiors 

-on a window of one depth with mapped

-inferiors of differing depth is not illegal, but the semantics are

-undefined by the core protocol.

-.LP

-The fill-rule defines what pixels are inside (drawn) for

-paths given in 

-.ZN XFillPolygon 

-requests and can be set to 

-.ZN EvenOddRule 

-or

-.ZN WindingRule .

-For

-.ZN EvenOddRule ,

-a point is inside if

-an infinite ray with the point as origin crosses the path an odd number

-of times.  

-For 

-.ZN WindingRule , 

-a point is inside if an infinite ray with the

-point as origin crosses an unequal number of clockwise and

-counterclockwise directed path segments.

-A clockwise directed path segment is one that crosses the ray from left to

-right as observed from the point.

-A counterclockwise segment is one that crosses the ray from right to left

-as observed from the point.

-The case where a directed line segment is coincident with the ray is

-uninteresting because you can simply choose a different ray that is not

-coincident with a segment.

-.LP

-For both 

-.ZN EvenOddRule

-and

-.ZN WindingRule ,

-a point is infinitely small, 

-and the path is an infinitely thin line.  

-A pixel is inside if the center point of the pixel is inside

-and the center point is not on the boundary.  

-If the center point is on the boundary,

-the pixel is inside if and only if the polygon interior is immediately to

-its right (x increasing direction).  

-Pixels with centers on a horizontal edge are a special case 

-and are inside if and only if the polygon interior is immediately below 

-(y increasing direction).

-.LP

-The arc-mode controls filling in the 

-.ZN XFillArcs

-function and can be set to

-.ZN ArcPieSlice

-or

-.ZN ArcChord .

-For

-.ZN ArcPieSlice ,

-the arcs are pie-slice filled.

-For

-.ZN ArcChord ,

-the arcs are chord filled.

-.LP

-The graphics-exposure flag controls 

-.ZN GraphicsExpose 

-event generation

-for 

-.ZN XCopyArea 

-and 

-.ZN XCopyPlane

-requests (and any similar requests defined by extensions).

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-XCopyArea(__libmansuffix__),

-XCreateRegion(__libmansuffix__),

-XDrawArc(__libmansuffix__),

-XDrawLine(__libmansuffix__),

-XDrawRectangle(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XFillRectangle(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XCreateGC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateGC, XCopyGC, XChangeGC, XGetGCValues, XFreeGC, XGContextFromGC, XGCValues \- create or free graphics contexts and graphics context structure
+.SH SYNTAX
+.HP
+GC XCreateGC\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+.HP
+int XCopyGC\^(\^Display *\fIdisplay\fP\^, GC \fIsrc\fP\^,
+unsigned long \fIvaluemask\fP\^, GC \fIdest\fP\^); 
+.HP
+int XChangeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\^\fIvalues\fP\^); 
+.HP
+Status XGetGCValues\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIvaluemask\fP\^, XGCValues *\fIvalues_return\fP\^); 
+.HP
+int XFreeGC\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^); 
+.HP
+GContext XGContextFromGC\^(\^GC \fIgc\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdest\fP 1i
+Specifies the destination GC.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIsrc\fP 1i
+Specifies the components of the source GC.
+.ds Vm set, copied, changed, or returned 
+.IP \fIvaluemask\fP 1i
+Specifies which components in the GC are to be \*(Vm. 
+This argument is the bitwise inclusive OR of zero or more of the valid
+GC component mask bits.
+.IP \fIvalues\fP 1i
+Specifies any values as specified by the valuemask.
+.IP \fIvalues_return\fP 1i
+Returns the GC values in the specified
+.ZN XGCValues 
+structure.
+.SH DESCRIPTION
+The
+.ZN XCreateGC
+function creates a graphics context and returns a GC.
+The GC can be used with any destination drawable having the same root
+and depth as the specified drawable.
+Use with other drawables results in a
+.ZN BadMatch
+error.
+.LP
+.ZN XCreateGC
+can generate
+.ZN BadAlloc ,
+.ZN BadDrawable ,
+.ZN BadFont ,
+.ZN BadMatch ,
+.ZN BadPixmap ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XCopyGC
+function copies the specified components from the source GC
+to the destination GC.
+The source and destination GCs must have the same root and depth,
+or a
+.ZN BadMatch
+error results.
+The valuemask specifies which component to copy, as for
+.ZN XCreateGC .
+.LP
+.ZN XCopyGC
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadMatch
+errors.
+.LP
+The
+.ZN XChangeGC
+function changes the components specified by valuemask for
+the specified GC.
+The values argument contains the values to be set.
+The values and restrictions are the same as for 
+.ZN XCreateGC .
+Changing the clip-mask overrides any previous 
+.ZN XSetClipRectangles
+request on the context. 
+Changing the dash-offset or dash-list
+overrides any previous 
+.ZN XSetDashes
+request on the context.
+The order in which components are verified and altered is server dependent.
+If an error is generated, a subset of the components may have been altered.
+.LP
+.ZN XChangeGC
+can generate
+.ZN BadAlloc ,
+.ZN BadFont ,
+.ZN BadGC ,
+.ZN BadMatch ,
+.ZN BadPixmap ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XGetGCValues
+function returns the components specified by valuemask for the specified GC.
+If the valuemask contains a valid set of GC mask bits
+.Pn ( GCFunction ,
+.ZN GCPlaneMask ,
+.ZN GCForeground ,
+.ZN GCBackground ,
+.ZN GCLineWidth ,
+.ZN GCLineStyle ,
+.ZN GCCapStyle ,
+.ZN GCJoinStyle ,
+.ZN GCFillStyle ,
+.ZN GCFillRule ,
+.ZN GCTile ,
+.ZN GCStipple ,
+.ZN GCTileStipXOrigin ,
+.ZN GCTileStipYOrigin ,
+.ZN GCFont ,
+.ZN GCSubwindowMode ,
+.ZN GCGraphicsExposures ,
+.ZN GCClipXOrigin ,
+.ZN GCCLipYOrigin ,
+.ZN GCDashOffset ,
+or
+.ZN GCArcMode )
+and no error occurs,
+.ZN XGetGCValues
+sets the requested components in values_return and returns a nonzero status.
+Otherwise, it returns a zero status.
+Note that the clip-mask and dash-list (represented by the
+.ZN GCClipMask
+and 
+.ZN GCDashList
+bits, respectively, in the valuemask)
+cannot be requested.
+Also note that an invalid resource ID (with one or more of the three
+most significant bits set to 1) will be returned for
+.ZN GCFont ,
+.ZN GCTile ,
+and
+.ZN GCStipple
+if the component has never been explicitly set by the client.
+.LP
+The
+.ZN XFreeGC
+function destroys the specified GC as well as all the associated storage.
+.LP
+.ZN XFreeGC
+can generate a
+.ZN BadGC 
+error.
+.SH STRUCTURES
+The
+.ZN XGCValues
+structure contains:
+.LP
+.LP
+/\&* GC attribute value mask bits */
+.TS
+lw(.5i) lw(2.5i) lw(.75i).
+T{
+\&#define
+T}	T{
+.ZN GCFunction
+T}	T{
+(1L<<0)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCPlaneMask
+T}	T{
+(1L<<1)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCForeground
+T}	T{
+(1L<<2)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCBackground
+T}	T{
+(1L<<3)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCLineWidth
+T}	T{
+(1L<<4)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCLineStyle
+T}	T{
+(1L<<5)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCCapStyle
+T}	T{
+(1L<<6)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCJoinStyle
+T}	T{
+(1L<<7)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCFillStyle
+T}	T{
+(1L<<8)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCFillRule
+T}	T{
+(1L<<9)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCTile
+T}	T{
+(1L<<10)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCStipple
+T}	T{
+(1L<<11)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCTileStipXOrigin
+T}	T{
+(1L<<12)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCTileStipYOrigin
+T}	T{
+(1L<<13)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCFont
+T}	T{
+(1L<<14)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCSubwindowMode
+T}	T{
+(1L<<15)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCGraphicsExposures
+T}	T{
+(1L<<16)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCClipXOrigin
+T}	T{
+(1L<<17)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCClipYOrigin
+T}	T{
+(1L<<18)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCClipMask
+T}	T{
+(1L<<19)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCDashOffset
+T}	T{
+(1L<<20)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCDashList
+T}	T{
+(1L<<21)
+T}
+T{
+\&#define
+T}	T{
+.ZN GCArcMode
+T}	T{
+(1L<<22)
+T}
+.TE
+.IN "XGCValues" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        int function;   /\&* logical operation */
+        unsigned long plane_mask;       /\&* plane mask */
+        unsigned long foreground;       /\&* foreground pixel */
+        unsigned long background;       /\&* background pixel */
+        int line_width; /\&* line width (in pixels) */
+        int line_style; /\&* LineSolid, LineOnOffDash, LineDoubleDash */
+        int cap_style;  /\&* CapNotLast, CapButt, CapRound, CapProjecting */
+        int join_style; /\&* JoinMiter, JoinRound, JoinBevel */
+        int fill_style; /\&* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
+        int fill_rule;  /\&* EvenOddRule, WindingRule */
+        int arc_mode;   /\&* ArcChord, ArcPieSlice */
+        Pixmap tile;    /\&* tile pixmap for tiling operations */
+        Pixmap stipple; /\&* stipple 1 plane pixmap for stippling */
+        int ts_x_origin;        /\&* offset for tile or stipple operations */
+        int ts_y_origin;
+        Font font;      /\&* default text font for text operations */
+        int subwindow_mode;     /\&* ClipByChildren, IncludeInferiors */
+        Bool graphics_exposures;        /\&* boolean, should exposures be generated */
+        int clip_x_origin;      /\&* origin for clipping */
+        int clip_y_origin;
+        Pixmap clip_mask;       /\&* bitmap clipping; other calls for rects */
+        int dash_offset;        /\&* patterned/dashed line information */
+        char dashes;
+} XGCValues;
+.De
+.LP
+The function attributes of a GC are used when you update a section of
+a drawable (the destination) with bits from somewhere else (the source).  
+The function in a GC defines how the new destination bits are to be
+computed from the source bits and the old destination bits.
+.ZN GXcopy
+is typically the most useful because it will work on a color display,
+but special applications may use other functions,
+particularly in concert with particular planes of a color display.
+The 16 GC functions, defined in 
+.hN X11/X.h ,
+are:
+.\" are listed in Table 5-1 along with the 
+.\"the associated hexadecimal code
+.\" and operation.
+.\".CP T 1
+.\"Display Functions
+.TS H
+lw(1.5i) cw(.5i) lw(2i).
+_
+.sp 6p
+.B
+Function Name	Value	Operation
+.sp 6p
+_
+.sp 6p
+.TH
+T{
+.ZN GXclear
+T}	T{
+0x0
+T}	T{
+0
+T}
+T{
+.ZN GXand
+T}	T{
+0x1
+T}	T{
+src AND dst
+T}
+T{
+.ZN GXandReverse
+T}	T{
+0x2
+T}	T{
+src AND NOT dst
+T}
+T{
+.ZN GXcopy
+T}	T{
+0x3
+T}	T{
+src
+T}
+T{
+.ZN GXandInverted
+T}	T{
+0x4
+T}	T{
+(NOT src) AND dst
+T}
+T{
+.ZN GXnoop
+T}	T{
+0x5
+T}	T{
+dst
+T}
+T{
+.ZN GXxor
+T}	T{
+0x6
+T}	T{
+src XOR dst
+T}
+T{
+.ZN GXor
+T}	T{
+0x7
+T}	T{
+src OR dst
+T}
+T{
+.ZN GXnor
+T}	T{
+0x8
+T}	T{
+(NOT src) AND (NOT dst)
+T}
+T{
+.ZN GXequiv
+T}	T{
+0x9
+T}	T{
+(NOT src) XOR dst
+T}
+T{
+.ZN GXinvert
+T}	T{
+0xa
+T}	T{
+NOT dst
+T}
+T{
+.ZN GXorReverse
+T}	T{
+0xb
+T}	T{
+src OR (NOT dst)
+T}
+T{
+.ZN GXcopyInverted
+T}	T{
+0xc
+T}	T{
+NOT src
+T}
+T{
+.ZN GXorInverted
+T}	T{
+0xd
+T}	T{
+(NOT src) OR dst
+T}
+T{
+.ZN GXnand
+T}	T{
+0xe
+T}	T{
+(NOT src) OR (NOT dst)
+T}
+T{
+.ZN GXset
+T}	T{
+0xf
+T}	T{
+1
+T}
+.sp 6p
+_
+.TE
+.LP
+Many graphics operations depend on either pixel values or planes in a GC.
+.IN "Pixel value"
+The planes attribute is of type long, and it specifies which planes of the
+destination are to be modified, one bit per plane.
+.IN "Plane" "mask"
+A monochrome display has only one plane and
+will be the least significant bit of the word.
+As planes are added to the display hardware, they will occupy more
+significant bits in the plane mask.
+.LP
+In graphics operations, given a source and destination pixel, 
+the result is computed bitwise on corresponding bits of the pixels.
+That is, a Boolean operation is performed in each bit plane.  
+The plane_mask restricts the operation to a subset of planes.
+A macro constant
+.ZN AllPlanes
+can be used to refer to all planes of the screen simultaneously.
+The result is computed by the following:
+.LP
+.Ds 
+((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask))
+.De
+.LP
+Range checking is not performed on the values for foreground,
+background, or plane_mask.
+They are simply truncated to the appropriate
+number of bits.
+The line-width is measured in pixels and either can be greater than or equal to
+one (wide line) or can be the special value zero (thin line).
+.LP
+Wide lines are drawn centered on the path described by the graphics request.
+Unless otherwise specified by the join-style or cap-style,
+the bounding box of a wide line with endpoints [x1, y1], [x2, y2] and
+width w is a rectangle with vertices at the following real coordinates:
+.LP
+.Ds
+[x1-(w*sn/2), y1+(w*cs/2)], [x1+(w*sn/2), y1-(w*cs/2)],
+[x2-(w*sn/2), y2+(w*cs/2)], [x2+(w*sn/2), y2-(w*cs/2)]
+.De
+.LP
+Here sn is the sine of the angle of the line,
+and cs is the cosine of the angle of the line.
+A pixel is part of the line and so is drawn
+if the center of the pixel is fully inside the bounding box
+(which is viewed as having infinitely thin edges).
+If the center of the pixel is exactly on the bounding box,
+it is part of the line if and only if the interior is immediately to its right
+(x increasing direction).
+Pixels with centers on a horizontal edge are a special case and are part of
+the line if and only if the interior or the boundary is immediately below 
+(y increasing direction) and the interior or the boundary is immediately
+to the right (x increasing direction).
+.LP
+Thin lines (zero line-width) are one-pixel-wide lines drawn using an
+unspecified, device-dependent algorithm.
+There are only two constraints on this algorithm. 
+.IP 1. 5
+If a line is drawn unclipped from [x1,y1] to [x2,y2] and
+if another line is drawn unclipped from [x1+dx,y1+dy] to [x2+dx,y2+dy],
+a point [x,y] is touched by drawing the first line 
+if and only if the point [x+dx,y+dy] is touched by drawing the second line.
+.IP 2. 5
+The effective set of points comprising a line cannot be affected by clipping.
+That is, a point is touched in a clipped line if and only if the point 
+lies inside the clipping region and the point would be touched
+by the line when drawn unclipped.
+.LP
+A wide line drawn from [x1,y1] to [x2,y2] always draws the same pixels 
+as a wide line drawn from [x2,y2] to [x1,y1], not counting cap-style 
+and join-style.
+It is recommended that this property be true for thin lines, 
+but this is not required.
+A line-width of zero may differ from a line-width of one in which pixels are
+drawn.
+This permits the use of many manufacturers' line drawing hardware,
+which may run many times faster than the more precisely specified
+wide lines.
+.LP
+In general, 
+drawing a thin line will be faster than drawing a wide line of width one.
+However, because of their different drawing algorithms,
+thin lines may not mix well aesthetically with wide lines.
+If it is desirable to obtain precise and uniform results across all displays,
+a client should always use a line-width of one rather than a line-width of zero.
+.LP
+The line-style defines which sections of a line are drawn:
+.TS
+lw(1.3i) lw(4.5i).
+T{
+.ZN LineSolid
+T}	T{
+The full path of the line is drawn.
+T}
+.sp 6p
+T{
+.ZN LineDoubleDash
+T}	T{
+The full path of the line is drawn, 
+but the even dashes are filled differently 
+from the odd dashes (see fill-style) with
+.ZN CapButt 
+style used where even and odd dashes meet.
+T}
+.sp 6p
+T{
+.ZN LineOnOffDash
+T}	T{
+Only the even dashes are drawn,
+and cap-style applies to 
+all internal ends of the individual dashes,
+except 
+.ZN CapNotLast
+is treated as 
+.ZN CapButt . 
+T}
+.TE
+.LP
+The cap-style defines how the endpoints of a path are drawn:
+.IN "Graphics context" "path"
+.TS
+lw(1.3i) lw(4.5i).
+T{
+.ZN CapNotLast
+T}	T{
+This is equivalent to 
+.ZN CapButt  
+except that for a line-width of zero the final endpoint is not drawn.
+T}
+.sp 6p
+T{
+.ZN CapButt
+T}	T{
+The line is square at the endpoint (perpendicular to the slope of the line)
+with no projection beyond.
+T}
+.sp 6p
+T{
+.ZN CapRound
+T}	T{
+The line has a circular arc with the diameter equal to the line-width,
+centered on the endpoint.
+(This is equivalent to 
+.ZN CapButt 
+for line-width of zero).
+T}
+.sp 6p
+T{
+.ZN CapProjecting
+T}	T{
+The line is square at the end, but the path continues beyond the endpoint 
+for a distance equal to half the line-width.
+(This is equivalent to 
+.ZN CapButt 
+for line-width of zero).
+T}
+.TE
+.LP
+The join-style defines how corners are drawn for wide lines:
+.TS
+lw(1.3i) lw(4.5i).
+T{
+.ZN JoinMiter
+T}	T{
+The outer edges of two lines extend to meet at an angle.
+However, if the angle is less than 11 degrees,
+then a
+.ZN JoinBevel
+join-style is used instead.
+T}
+.sp 6p
+T{
+.ZN JoinRound
+T}	T{
+The corner is a circular arc with the diameter equal to the line-width, 
+centered on the joinpoint.
+T}
+.sp 6p
+T{
+.ZN JoinBevel
+T}	T{
+The corner has
+.ZN CapButt 
+endpoint styles with the triangular notch filled.
+T}
+.TE
+.LP
+For a line with coincident endpoints (x1=x2, y1=y2), 
+when the cap-style is applied to both endpoints, 
+the semantics depends on the line-width and the cap-style:
+.TS
+lw(1.3i) lw(.5i) lw(4i).
+T{
+.ZN CapNotLast
+T}	T{
+thin
+T}	T{
+The results are device dependent, 
+but the desired effect is that nothing is drawn.
+T}
+.sp 6p
+T{
+.ZN CapButt
+T}	T{
+thin
+T}	T{
+The results are device dependent, 
+but the desired effect is that a single pixel is drawn.
+T}
+.sp 6p
+T{
+.ZN CapRound
+T}	T{
+thin
+T}	T{
+The results are the same as for
+.ZN CapButt /thin.
+T}
+.sp 6p
+T{
+.ZN CapProjecting
+T}	T{
+thin
+T}	T{
+The results are the same as for
+.ZN CapButt /thin.
+T}
+.sp 6p
+T{
+.ZN CapButt
+T}	T{
+wide
+T}	T{
+Nothing is drawn.
+T}
+.sp 6p
+T{
+.ZN CapRound
+T}	T{
+wide
+T}	T{
+The closed path is a circle, centered at the endpoint, and
+with the diameter equal to the line-width.
+T}
+.sp 6p
+T{
+.ZN CapProjecting
+T}	T{
+wide
+T}	T{
+The closed path is a square, aligned with the coordinate axes, centered at the
+endpoint, and with the sides equal to the line-width.
+T}
+.TE
+.LP
+For a line with coincident endpoints (x1=x2, y1=y2), 
+when the join-style is applied at one or both endpoints, 
+the effect is as if the line was removed from the overall path.
+However, if the total path consists of or is reduced to a single point joined
+with itself, the effect is the same as when the cap-style is applied at both
+endpoints.
+.LP
+The tile/stipple represents an infinite two-dimensional plane,
+with the tile/stipple replicated in all dimensions.
+When that plane is superimposed on the drawable
+for use in a graphics operation, the upper-left corner
+of some instance of the tile/stipple is at the coordinates within
+the drawable specified by the tile/stipple origin.
+The tile/stipple and clip origins are interpreted relative to the
+origin of whatever destination drawable is specified in a graphics
+request.
+The tile pixmap must have the same root and depth as the GC,
+or a
+.ZN BadMatch 
+error results.
+The stipple pixmap must have depth one and must have the same root as the
+GC, or a 
+.ZN BadMatch 
+error results.  
+For stipple operations where the fill-style is
+.ZN FillStippled
+but not 
+.ZN FillOpaqueStippled ,
+the stipple pattern is tiled in a
+single plane and acts as an additional clip mask to be ANDed with the clip-mask.
+Although some sizes may be faster to use than others,
+any size pixmap can be used for tiling or stippling.
+.LP
+The fill-style defines the contents of the source for line, text, and
+fill requests.  
+For all text and fill requests (for example,
+.ZN XDrawText , 
+.ZN XDrawText16 ,
+.ZN XFillRectangle , 
+.ZN XFillPolygon , 
+and
+.ZN XFillArc );
+for line requests 
+with line-style 
+.ZN LineSolid 
+(for example,
+.ZN XDrawLine ,
+.ZN XDrawSegments , 
+.ZN XDrawRectangle ,
+.ZN XDrawArc );
+and for the even dashes for line requests with line-style 
+.ZN LineOnOffDash 
+or 
+.ZN LineDoubleDash ,
+the following apply:
+.TS
+lw(1.8i) lw(4i).
+T{
+.ZN FillSolid
+T}	T{
+Foreground
+T}
+.sp 6p
+T{
+.ZN FillTiled
+T}	T{
+Tile
+T}
+.sp 6p
+T{
+.ZN FillOpaqueStippled
+T}	T{
+A tile with the same width and height as stipple,
+but with background everywhere stipple has a zero
+and with foreground everywhere stipple has a one
+T}
+.sp 6p
+T{
+.ZN FillStippled
+T}	T{
+Foreground masked by stipple
+T}
+.TE
+.LP
+When drawing lines with line-style
+.ZN LineDoubleDash ,
+the odd dashes are controlled by the fill-style in the following manner:
+.TS
+lw(1.8i) lw(4i).
+T{
+.ZN FillSolid
+T}	T{
+Background
+T}
+.sp 6p
+T{
+.ZN FillTiled
+T}	T{
+Same as for even dashes
+T}
+.sp 6p
+T{
+.ZN FillOpaqueStippled
+T}	T{
+Same as for even dashes
+T}
+.sp 6p
+T{
+.ZN FillStippled
+T}	T{
+Background masked by stipple
+T}
+.TE
+.LP
+Storing a pixmap in a GC might or might not result in a copy
+being made.
+If the pixmap is later used as the destination for a graphics request,
+the change might or might not be reflected in the GC.
+If the pixmap is used simultaneously in a graphics request both as
+a destination and as a tile or stipple,
+the results are undefined.
+.LP
+For optimum performance,
+you should draw as much as possible with the same GC 
+(without changing its components).
+The costs of changing GC components relative to using different GCs
+depend on the display hardware and the server implementation.
+It is quite likely that some amount of GC information will be
+cached in display hardware and that such hardware can only cache a small number
+of GCs.
+.LP
+The dashes value is actually a simplified form of the
+more general patterns that can be set with 
+.ZN XSetDashes .  
+Specifying a
+value of N is equivalent to specifying the two-element list [N, N] in 
+.ZN XSetDashes . 
+The value must be nonzero,
+or a
+.ZN BadValue
+error results.
+.LP
+The clip-mask restricts writes to the destination drawable.  
+If the clip-mask is set to a pixmap,
+it must have depth one and have the same root as the GC,
+or a
+.ZN BadMatch 
+error results.
+If clip-mask is set to
+.ZN None ,
+the pixels are always drawn regardless of the clip origin.
+The clip-mask also can be set by calling the
+.ZN XSetClipRectangles
+or
+.ZN XSetRegion
+functions.
+Only pixels where the clip-mask has a bit set to 1 are drawn.  
+Pixels are not drawn outside the area covered by the clip-mask 
+or where the clip-mask has a bit set to 0.
+The clip-mask affects all graphics requests.
+The clip-mask does not clip sources.
+The clip-mask origin is interpreted relative to the origin of whatever
+destination drawable is specified in a graphics request.
+.LP
+You can set the subwindow-mode to
+.ZN ClipByChildren
+or
+.ZN IncludeInferiors .
+For 
+.ZN ClipByChildren , 
+both source and destination windows are
+additionally clipped by all viewable 
+.ZN InputOutput
+children.  
+For 
+.ZN IncludeInferiors ,
+neither source nor destination window is clipped by inferiors. 
+This will result in including subwindow contents in the source
+and drawing through subwindow boundaries of the destination.
+The use of 
+.ZN IncludeInferiors 
+on a window of one depth with mapped
+inferiors of differing depth is not illegal, but the semantics are
+undefined by the core protocol.
+.LP
+The fill-rule defines what pixels are inside (drawn) for
+paths given in 
+.ZN XFillPolygon 
+requests and can be set to 
+.ZN EvenOddRule 
+or
+.ZN WindingRule .
+For
+.ZN EvenOddRule ,
+a point is inside if
+an infinite ray with the point as origin crosses the path an odd number
+of times.  
+For 
+.ZN WindingRule , 
+a point is inside if an infinite ray with the
+point as origin crosses an unequal number of clockwise and
+counterclockwise directed path segments.
+A clockwise directed path segment is one that crosses the ray from left to
+right as observed from the point.
+A counterclockwise segment is one that crosses the ray from right to left
+as observed from the point.
+The case where a directed line segment is coincident with the ray is
+uninteresting because you can simply choose a different ray that is not
+coincident with a segment.
+.LP
+For both 
+.ZN EvenOddRule
+and
+.ZN WindingRule ,
+a point is infinitely small, 
+and the path is an infinitely thin line.  
+A pixel is inside if the center point of the pixel is inside
+and the center point is not on the boundary.  
+If the center point is on the boundary,
+the pixel is inside if and only if the polygon interior is immediately to
+its right (x increasing direction).  
+Pixels with centers on a horizontal edge are a special case 
+and are inside if and only if the polygon interior is immediately below 
+(y increasing direction).
+.LP
+The arc-mode controls filling in the 
+.ZN XFillArcs
+function and can be set to
+.ZN ArcPieSlice
+or
+.ZN ArcChord .
+For
+.ZN ArcPieSlice ,
+the arcs are pie-slice filled.
+For
+.ZN ArcChord ,
+the arcs are chord filled.
+.LP
+The graphics-exposure flag controls 
+.ZN GraphicsExpose 
+event generation
+for 
+.ZN XCopyArea 
+and 
+.ZN XCopyPlane
+requests (and any similar requests defined by extensions).
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+XCopyArea(__libmansuffix__),
+XCreateRegion(__libmansuffix__),
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XFillRectangle(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateIC.man b/libX11/man/XCreateIC.man
index 37f49e1a9..290ea3d8c 100644
--- a/libX11/man/XCreateIC.man
+++ b/libX11/man/XCreateIC.man
@@ -1,219 +1,158 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateIC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateIC, XDestroyIC, XIMOfIC \- create, destroy, and obtain the input method of an input context

-.SH SYNTAX

-.HP

-XIC XCreateIC\^(\^XIM \fIim\fP\^, ...\^); 

-.HP

-void XDestroyIC\^(\^XIC \fIic\fP\^); 

-.HP

-XIM XIMOfIC\^(\^XIC \fIic\fP\^);

-.SH ARGUMENTS

-.IP \fIic\fP 1i

-Specifies the input context.

-.IP \fIim\fP 1i

-Specifies the input method.

-.ds Al \ to set XIC values

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XCreateIC 

-function creates a context within the specified input method.

-.LP

-Some of the arguments are mandatory at creation time, and

-the input context will not be created if those arguments are not provided.

-The mandatory arguments are the input style and the set of text callbacks

-(if the input style selected requires callbacks).

-All other input context values can be set later.

-.LP

-.ZN XCreateIC

-returns a NULL value if no input context could be created.

-A NULL value could be returned for any of the following reasons:

-.IP \(bu 5

-A required argument was not set.

-.IP \(bu 5

-A read-only argument was set (for example,

-.ZN XNFilterEvents ).

-.IP \(bu 5

-The argument name is not recognized.

-.IP \(bu 5

-The input method encountered an input method implementation-dependent error.

-.LP

-The

-.ZN XCreateIC

-can generate

-.ZN BadAtom ,

-.ZN BadColor ,

-.ZN BadPixmap ,

-and

-.ZN BadWindow

-errors.

-.LP

-.ZN XDestroyIC

-destroys the specified input context.

-.LP

-The

-.ZN XIMOfIC

-function returns the input method associated with the specified input context.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XOpenIM(__libmansuffix__),

-XSetICFocus(__libmansuffix__),

-XSetICValues(__libmansuffix__),

-XmbResetIC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateIC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateIC, XDestroyIC, XIMOfIC \- create, destroy, and obtain the input method of an input context
+.SH SYNTAX
+.HP
+XIC XCreateIC\^(\^XIM \fIim\fP\^, ...\^); 
+.HP
+void XDestroyIC\^(\^XIC \fIic\fP\^); 
+.HP
+XIM XIMOfIC\^(\^XIC \fIic\fP\^);
+.SH ARGUMENTS
+.IP \fIic\fP 1i
+Specifies the input context.
+.IP \fIim\fP 1i
+Specifies the input method.
+.ds Al \ to set XIC values
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XCreateIC 
+function creates a context within the specified input method.
+.LP
+Some of the arguments are mandatory at creation time, and
+the input context will not be created if those arguments are not provided.
+The mandatory arguments are the input style and the set of text callbacks
+(if the input style selected requires callbacks).
+All other input context values can be set later.
+.LP
+.ZN XCreateIC
+returns a NULL value if no input context could be created.
+A NULL value could be returned for any of the following reasons:
+.IP \(bu 5
+A required argument was not set.
+.IP \(bu 5
+A read-only argument was set (for example,
+.ZN XNFilterEvents ).
+.IP \(bu 5
+The argument name is not recognized.
+.IP \(bu 5
+The input method encountered an input method implementation-dependent error.
+.LP
+The
+.ZN XCreateIC
+can generate
+.ZN BadAtom ,
+.ZN BadColor ,
+.ZN BadPixmap ,
+and
+.ZN BadWindow
+errors.
+.LP
+.ZN XDestroyIC
+destroys the specified input context.
+.LP
+The
+.ZN XIMOfIC
+function returns the input method associated with the specified input context.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateOC.man b/libX11/man/XCreateOC.man
index 27d683a49..e04a1ef82 100644
--- a/libX11/man/XCreateOC.man
+++ b/libX11/man/XCreateOC.man
@@ -1,226 +1,165 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateOC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateOC, XDestroyOC, XSetOCValues, XGetOCValues, XOMOfOC \- create output contexts

-.SH SYNTAX

-.HP

-XOC XCreateOC\^(\^XOM \fIom\fP\^); 

-.HP

-void XDestroyOC\^(\^XOC \fIoc\fP\^); 

-.HP

-char * XSetOCValues\^(\^XOC \fIoc\fP\^, ...); 

-.HP

-char * XGetOCValues\^(\^XOC \fIoc\fP\^, ...); 

-.HP

-XOM XOMOfOC\^(\^XOC \fIoc\fP\^); 

-.SH ARGUMENTS

-.IP \fIoc\fP 1i

-Specifies the output context.

-.IP \fIom\fP 1i

-Specifies the output method.

-.ds Al \ to set or get XOC values

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XCreateOC 

-function creates an output context within the specified output method.

-.LP

-The base font names argument is mandatory at creation time, and

-the output context will not be created unless it is provided.

-All other output context values can be set later.

-.LP

-.ZN XCreateOC

-returns NULL if no output context could be created.

-NULL can be returned for any of the following reasons:

-.IP \(bu 5

-A required argument was not set.

-.IP \(bu 5

-A read-only argument was set.

-.IP \(bu 5

-An argument name is not recognized.

-.IP \(bu 5

-The output method encountered an output method implementation-dependent error.

-.LP

-The

-.ZN XDestroyOC

-function destroys the specified output context.

-.LP

-The

-.ZN XSetOCValues

-function returns NULL if no error occurred; 

-otherwise,

-it returns the name of the first argument that could not be set.

-An argument might not be set for any of the following reasons:

-.IP \(bu 5

-The argument is read-only.

-.IP \(bu 5

-The argument name is not recognized.

-.IP \(bu 5

-An implementation-dependent error occurs.

-.LP

-Each value to be set must be an appropriate datum,

-matching the data type imposed by the semantics of the argument.

-.LP

-The

-.ZN XGetOCValues

-function returns NULL if no error occurred; otherwise,

-it returns the name of the first argument that could not be obtained.

-An argument might not be obtained for any of the following reasons:

-.IP \(bu 5

-The argument name is not recognized.

-.IP \(bu 5

-An implementation-dependent error occurs.

-.LP

-Each argument value

-following a name must point to a location where the value is to be stored.

-.LP

-The

-.ZN XOMOfOC

-function returns the output method associated with the

-specified output context.

-.SH "SEE ALSO"

-XCreateOM(__libmansuffix__),

-XCreateFontSet(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateOC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateOC, XDestroyOC, XSetOCValues, XGetOCValues, XOMOfOC \- create output contexts
+.SH SYNTAX
+.HP
+XOC XCreateOC\^(\^XOM \fIom\fP\^); 
+.HP
+void XDestroyOC\^(\^XOC \fIoc\fP\^); 
+.HP
+char * XSetOCValues\^(\^XOC \fIoc\fP\^, ...); 
+.HP
+char * XGetOCValues\^(\^XOC \fIoc\fP\^, ...); 
+.HP
+XOM XOMOfOC\^(\^XOC \fIoc\fP\^); 
+.SH ARGUMENTS
+.IP \fIoc\fP 1i
+Specifies the output context.
+.IP \fIom\fP 1i
+Specifies the output method.
+.ds Al \ to set or get XOC values
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XCreateOC 
+function creates an output context within the specified output method.
+.LP
+The base font names argument is mandatory at creation time, and
+the output context will not be created unless it is provided.
+All other output context values can be set later.
+.LP
+.ZN XCreateOC
+returns NULL if no output context could be created.
+NULL can be returned for any of the following reasons:
+.IP \(bu 5
+A required argument was not set.
+.IP \(bu 5
+A read-only argument was set.
+.IP \(bu 5
+An argument name is not recognized.
+.IP \(bu 5
+The output method encountered an output method implementation-dependent error.
+.LP
+The
+.ZN XDestroyOC
+function destroys the specified output context.
+.LP
+The
+.ZN XSetOCValues
+function returns NULL if no error occurred; 
+otherwise,
+it returns the name of the first argument that could not be set.
+An argument might not be set for any of the following reasons:
+.IP \(bu 5
+The argument is read-only.
+.IP \(bu 5
+The argument name is not recognized.
+.IP \(bu 5
+An implementation-dependent error occurs.
+.LP
+Each value to be set must be an appropriate datum,
+matching the data type imposed by the semantics of the argument.
+.LP
+The
+.ZN XGetOCValues
+function returns NULL if no error occurred; otherwise,
+it returns the name of the first argument that could not be obtained.
+An argument might not be obtained for any of the following reasons:
+.IP \(bu 5
+The argument name is not recognized.
+.IP \(bu 5
+An implementation-dependent error occurs.
+.LP
+Each argument value
+following a name must point to a location where the value is to be stored.
+.LP
+The
+.ZN XOMOfOC
+function returns the output method associated with the
+specified output context.
+.SH "SEE ALSO"
+XCreateOM(__libmansuffix__),
+XCreateFontSet(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreatePixmap.man b/libX11/man/XCreatePixmap.man
index 0b1eb1e5d..d9d64225f 100644
--- a/libX11/man/XCreatePixmap.man
+++ b/libX11/man/XCreatePixmap.man
@@ -1,230 +1,169 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreatePixmap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreatePixmap, XFreePixmap \- create or destroy pixmaps

-.SH SYNTAX

-.HP

-Pixmap XCreatePixmap\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int

-\fIdepth\fP\^); 

-.HP

-int XFreePixmap\^(\^Display *\fIdisplay\fP\^, Pixmap \fIpixmap\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies which screen the pixmap is created on. 

-.IP \fIdepth\fP 1i

-Specifies the depth of the pixmap.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIpixmap\fP 1i

-Specifies the pixmap.

-.ds Wh , which define the dimensions of the pixmap

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.SH DESCRIPTION

-The

-.ZN XCreatePixmap

-function creates a pixmap of the width, height, and depth you specified

-and returns a pixmap ID that identifies it.

-It is valid to pass an 

-.ZN InputOnly

-window to the drawable argument.

-The width and height arguments must be nonzero,

-or a 

-.ZN BadValue

-error results.

-The depth argument must be one of the depths supported by the screen

-of the specified drawable,

-or a

-.ZN BadValue

-error results.

-.LP

-The server uses the specified drawable to determine on which screen

-to create the pixmap.

-The pixmap can be used only on this screen

-and only with other drawables of the same depth (see

-.ZN XCopyPlane

-for an exception to this rule).

-The initial contents of the pixmap are undefined.

-.LP

-.ZN XCreatePixmap

-can generate

-.ZN BadAlloc ,

-.ZN BadDrawable ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XFreePixmap

-function first deletes the association between the pixmap ID and the pixmap.

-Then, the X server frees the pixmap storage when there are no references to it.

-The pixmap should never be referenced again.

-.LP

-.ZN XFreePixmap

-can generate a

-.ZN BadPixmap 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCopyArea(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreatePixmap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreatePixmap, XFreePixmap \- create or destroy pixmaps
+.SH SYNTAX
+.HP
+Pixmap XCreatePixmap\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int
+\fIdepth\fP\^); 
+.HP
+int XFreePixmap\^(\^Display *\fIdisplay\fP\^, Pixmap \fIpixmap\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies which screen the pixmap is created on. 
+.IP \fIdepth\fP 1i
+Specifies the depth of the pixmap.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIpixmap\fP 1i
+Specifies the pixmap.
+.ds Wh , which define the dimensions of the pixmap
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.SH DESCRIPTION
+The
+.ZN XCreatePixmap
+function creates a pixmap of the width, height, and depth you specified
+and returns a pixmap ID that identifies it.
+It is valid to pass an 
+.ZN InputOnly
+window to the drawable argument.
+The width and height arguments must be nonzero,
+or a 
+.ZN BadValue
+error results.
+The depth argument must be one of the depths supported by the screen
+of the specified drawable,
+or a
+.ZN BadValue
+error results.
+.LP
+The server uses the specified drawable to determine on which screen
+to create the pixmap.
+The pixmap can be used only on this screen
+and only with other drawables of the same depth (see
+.ZN XCopyPlane
+for an exception to this rule).
+The initial contents of the pixmap are undefined.
+.LP
+.ZN XCreatePixmap
+can generate
+.ZN BadAlloc ,
+.ZN BadDrawable ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XFreePixmap
+function first deletes the association between the pixmap ID and the pixmap.
+Then, the X server frees the pixmap storage when there are no references to it.
+The pixmap should never be referenced again.
+.LP
+.ZN XFreePixmap
+can generate a
+.ZN BadPixmap 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCopyArea(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateRegion.man b/libX11/man/XCreateRegion.man
index 9e3852157..7759035ba 100644
--- a/libX11/man/XCreateRegion.man
+++ b/libX11/man/XCreateRegion.man
@@ -1,179 +1,118 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateRegion, XSetRegion, XDestroyRegion \- create or destroy regions

-.SH SYNTAX

-.HP

-Region XCreateRegion\^(void\^); 

-.HP

-int XSetRegion\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Region \fIr\fP\^);

-.HP

-int XDestroyRegion\^(\^Region \fIr\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIr\fP 1i

-Specifies the region.

-.SH DESCRIPTION

-The

-.ZN XCreateRegion

-function creates a new empty region.

-.LP

-The

-.ZN XSetRegion

-function sets the clip-mask in the GC to the specified region.

-The region is specified relative to the drawable's origin.

-The resulting GC clip origin is implementation-dependent.

-Once it is set in the GC,

-the region can be destroyed.

-.LP

-The

-.ZN XDestroyRegion

-function deallocates the storage associated with a specified region.

-.SH "SEE ALSO"

-XEmptyRegion(__libmansuffix__),

-XIntersectRegion(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateRegion, XSetRegion, XDestroyRegion \- create or destroy regions
+.SH SYNTAX
+.HP
+Region XCreateRegion\^(void\^); 
+.HP
+int XSetRegion\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Region \fIr\fP\^);
+.HP
+int XDestroyRegion\^(\^Region \fIr\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIr\fP 1i
+Specifies the region.
+.SH DESCRIPTION
+The
+.ZN XCreateRegion
+function creates a new empty region.
+.LP
+The
+.ZN XSetRegion
+function sets the clip-mask in the GC to the specified region.
+The region is specified relative to the drawable's origin.
+The resulting GC clip origin is implementation-dependent.
+Once it is set in the GC,
+the region can be destroyed.
+.LP
+The
+.ZN XDestroyRegion
+function deallocates the storage associated with a specified region.
+.SH "SEE ALSO"
+XEmptyRegion(__libmansuffix__),
+XIntersectRegion(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateWindow.man b/libX11/man/XCreateWindow.man
index 3f3b5b2cd..16cc7455f 100644
--- a/libX11/man/XCreateWindow.man
+++ b/libX11/man/XCreateWindow.man
@@ -1,496 +1,433 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XCreateWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateWindow, XCreateSimpleWindow, XSetWindowAttributes \- create windows and window attributes structure

-.SH SYNTAX

-.HP

-Window XCreateWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, int \fIdepth\fP\^, unsigned int \fIclass\fP\^, Visual *\fIvisual\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^); 

-.HP

-Window XCreateSimpleWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, unsigned long \fIborder\fP\^, unsigned long \fIbackground\fP\^); 

-.SH ARGUMENTS

-.IP \fIattributes\fP 1i

-Specifies the structure from which the values (as specified by the value mask)

-are to be taken.

-The value mask should have the appropriate bits

-set to indicate which attributes have been set in the structure.

-.IP \fIbackground\fP 1i

-Specifies the background pixel value of the window.

-

-.IP \fIborder\fP 1i

-Specifies the border pixel value of the window.

-.IP \fIborder_width\fP 1i

-Specifies the width of the created window's border in pixels.

-.IP \fIclass\fP 1i

-Specifies the created window's class.

-You can pass

-.ZN InputOutput , 

-.ZN InputOnly , 

-or 

-.ZN CopyFromParent .

-A class of 

-.ZN CopyFromParent

-means the class

-is taken from the parent.

-.IP \fIdepth\fP 1i

-Specifies the window's depth.

-A depth of 

-.ZN CopyFromParent

-means the depth is taken from the parent.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIparent\fP 1i

-Specifies the parent window.

-.IP \fIvaluemask\fP 1i

-Specifies which window attributes are defined in the attributes

-argument.

-This mask is the bitwise inclusive OR of the valid attribute mask bits.

-If valuemask is zero,

-the attributes are ignored and are not referenced.

-.IP \fIvisual\fP 1i

-Specifies the visual type.

-A visual of 

-.ZN CopyFromParent 

-means the visual type is taken from the 

-parent.

-.ds Wh , which are the created window's inside dimensions \

-and do not include the created window's borders

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which are the top-left outside corner of the window's \

-borders and are relative to the inside of the parent window's borders

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XCreateWindow

-function creates an unmapped subwindow for a specified parent window, 

-returns the window ID of the created window, 

-and causes the X server to generate a

-.ZN CreateNotify

-event.

-The created window is placed on top in the stacking order 

-with respect to siblings.

-.LP

-The coordinate system has the X axis horizontal and the Y axis vertical

-with the origin [0, 0] at the upper-left corner.

-Coordinates are integral,

-in terms of pixels,

-and coincide with pixel centers.

-Each window and pixmap has its own coordinate system.

-For a window, 

-the origin is inside the border at the inside, upper-left corner.

-.LP

-The border_width for an

-.ZN InputOnly

-window must be zero, or a

-.ZN BadMatch

-error results.

-For class

-.ZN InputOutput ,

-the visual type and depth must be a combination supported for the screen,

-or a

-.ZN BadMatch

-error results.

-The depth need not be the same as the parent,

-but the parent must not be a window of class 

-.ZN InputOnly ,

-or a

-.ZN BadMatch

-error results.

-For an

-.ZN InputOnly

-window,

-the depth must be zero, and the visual must be one supported by the screen.

-If either condition is not met,

-a

-.ZN BadMatch

-error results.

-The parent window, however, may have any depth and class.

-If you specify any invalid window attribute for a window, a

-.ZN BadMatch

-error results.

-.LP

-The created window is not yet displayed (mapped) on the user's display.

-To display the window, call

-.ZN XMapWindow .

-The new window initially uses the same cursor as

-its parent. 

-A new cursor can be defined for the new window by calling

-.ZN XDefineCursor .

-.IN "Cursor" "Initial State"

-.IN "XDefineCursor" 

-The window will not be visible on the screen unless it and all of its

-ancestors are mapped and it is not obscured by any of its ancestors.

-.LP

-.ZN XCreateWindow

-can generate

-.ZN BadAlloc

-.ZN BadColor ,

-.ZN BadCursor ,

-.ZN BadMatch ,

-.ZN BadPixmap ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XCreateSimpleWindow

-function creates an unmapped

-.ZN InputOutput

-subwindow for a specified parent window, returns the

-window ID of the created window, and causes the X server to generate a

-.ZN CreateNotify

-event.

-The created window is placed on top in the stacking order with respect to 

-siblings.

-Any part of the window that extends outside its parent window is clipped.

-The border_width for an

-.ZN InputOnly

-window must be zero, or a

-.ZN BadMatch

-error results.

-.ZN XCreateSimpleWindow

-inherits its depth, class, and visual from its parent.

-All other window attributes, except background and border, 

-have their default values.

-.LP

-.ZN XCreateSimpleWindow

-can generate

-.ZN BadAlloc ,

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.SH STRUCTURES

-The

-.ZN XSetWindow Attributes

-structure contains:

-.LP

-.LP

-/\&* Window attribute value mask bits */

-.TS

-lw(.5i) lw(2.5i) lw(.8i).

-T{

-\&#define

-T}	T{

-.ZN CWBackPixmap

-T}	T{

-(1L<<0)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBackPixel

-T}	T{

-(1L<<1)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBorderPixmap

-T}	T{

-(1L<<2)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBorderPixel

-T}	T{

-(1L<<3)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBitGravity

-T}	T{

-(1L<<4)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWWinGravity

-T}	T{

-(1L<<5)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBackingStore

-T}	T{

-(1L<<6)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBackingPlanes

-T}	T{

-(1L<<7)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWBackingPixel

-T}	T{

-(1L<<8)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWOverrideRedirect

-T}	T{

-(1L<<9)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWSaveUnder

-T}	T{

-(1L<<10)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWEventMask

-T}	T{

-(1L<<11)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWDontPropagate

-T}	T{

-(1L<<12)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWColormap

-T}	T{

-(1L<<13)

-T}

-T{

-\&#define

-T}	T{

-.ZN CWCursor

-T}	T{

-(1L<<14)

-T}

-.TE

-.IN "XSetWindowAttributes" "" "@DEF@"

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-/\&* Values */

-

-typedef struct {

-	Pixmap background_pixmap;	/\&* background, None, or ParentRelative */

-	unsigned long background_pixel;	/\&* background pixel */

-	Pixmap border_pixmap;		/\&* border of the window or CopyFromParent */

-	unsigned long border_pixel;	/\&* border pixel value */

-	int bit_gravity;	/\&* one of bit gravity values */

-	int win_gravity;	/\&* one of the window gravity values */

-	int backing_store;	/\&* NotUseful, WhenMapped, Always */

-	unsigned long backing_planes;	/\&* planes to be preserved if possible */

-	unsigned long backing_pixel;	/\&* value to use in restoring planes */

-	Bool save_under;	/\&* should bits under be saved? (popups) */

-	long event_mask;	/\&* set of events that should be saved */

-	long do_not_propagate_mask;	/\&* set of events that should not propagate */

-	Bool override_redirect;	/\&* boolean value for override_redirect */

-	Colormap colormap;	/\&* color map to be associated with window */

-	Cursor cursor;		/\&* cursor to be displayed (or None) */

-} XSetWindowAttributes;

-.De

-.LP

-For a detailed explanation of the members of this structure,

-see \fI\*(xL\fP\^.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadMatch

-The values do not exist for an

-.ZN InputOnly

-window.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__), 

-XDefineCursor(__libmansuffix__),

-XDestroyWindow(__libmansuffix__), 

-XMapWindow(__libmansuffix__), 

-XRaiseWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XCreateWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateWindow, XCreateSimpleWindow, XSetWindowAttributes \- create windows and window attributes structure
+.SH SYNTAX
+.HP
+Window XCreateWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, int \fIdepth\fP\^, unsigned int \fIclass\fP\^, Visual *\fIvisual\fP\^, unsigned long \fIvaluemask\fP\^, XSetWindowAttributes *\fIattributes\fP\^); 
+.HP
+Window XCreateSimpleWindow\^(\^Display *\fIdisplay\fP\^, Window \fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int \fIborder_width\fP\^, unsigned long \fIborder\fP\^, unsigned long \fIbackground\fP\^); 
+.SH ARGUMENTS
+.IP \fIattributes\fP 1i
+Specifies the structure from which the values (as specified by the value mask)
+are to be taken.
+The value mask should have the appropriate bits
+set to indicate which attributes have been set in the structure.
+.IP \fIbackground\fP 1i
+Specifies the background pixel value of the window.
+
+.IP \fIborder\fP 1i
+Specifies the border pixel value of the window.
+.IP \fIborder_width\fP 1i
+Specifies the width of the created window's border in pixels.
+.IP \fIclass\fP 1i
+Specifies the created window's class.
+You can pass
+.ZN InputOutput , 
+.ZN InputOnly , 
+or 
+.ZN CopyFromParent .
+A class of 
+.ZN CopyFromParent
+means the class
+is taken from the parent.
+.IP \fIdepth\fP 1i
+Specifies the window's depth.
+A depth of 
+.ZN CopyFromParent
+means the depth is taken from the parent.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIparent\fP 1i
+Specifies the parent window.
+.IP \fIvaluemask\fP 1i
+Specifies which window attributes are defined in the attributes
+argument.
+This mask is the bitwise inclusive OR of the valid attribute mask bits.
+If valuemask is zero,
+the attributes are ignored and are not referenced.
+.IP \fIvisual\fP 1i
+Specifies the visual type.
+A visual of 
+.ZN CopyFromParent 
+means the visual type is taken from the 
+parent.
+.ds Wh , which are the created window's inside dimensions \
+and do not include the created window's borders
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which are the top-left outside corner of the window's \
+borders and are relative to the inside of the parent window's borders
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XCreateWindow
+function creates an unmapped subwindow for a specified parent window, 
+returns the window ID of the created window, 
+and causes the X server to generate a
+.ZN CreateNotify
+event.
+The created window is placed on top in the stacking order 
+with respect to siblings.
+.LP
+The coordinate system has the X axis horizontal and the Y axis vertical
+with the origin [0, 0] at the upper-left corner.
+Coordinates are integral,
+in terms of pixels,
+and coincide with pixel centers.
+Each window and pixmap has its own coordinate system.
+For a window, 
+the origin is inside the border at the inside, upper-left corner.
+.LP
+The border_width for an
+.ZN InputOnly
+window must be zero, or a
+.ZN BadMatch
+error results.
+For class
+.ZN InputOutput ,
+the visual type and depth must be a combination supported for the screen,
+or a
+.ZN BadMatch
+error results.
+The depth need not be the same as the parent,
+but the parent must not be a window of class 
+.ZN InputOnly ,
+or a
+.ZN BadMatch
+error results.
+For an
+.ZN InputOnly
+window,
+the depth must be zero, and the visual must be one supported by the screen.
+If either condition is not met,
+a
+.ZN BadMatch
+error results.
+The parent window, however, may have any depth and class.
+If you specify any invalid window attribute for a window, a
+.ZN BadMatch
+error results.
+.LP
+The created window is not yet displayed (mapped) on the user's display.
+To display the window, call
+.ZN XMapWindow .
+The new window initially uses the same cursor as
+its parent. 
+A new cursor can be defined for the new window by calling
+.ZN XDefineCursor .
+.IN "Cursor" "Initial State"
+.IN "XDefineCursor" 
+The window will not be visible on the screen unless it and all of its
+ancestors are mapped and it is not obscured by any of its ancestors.
+.LP
+.ZN XCreateWindow
+can generate
+.ZN BadAlloc
+.ZN BadColor ,
+.ZN BadCursor ,
+.ZN BadMatch ,
+.ZN BadPixmap ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XCreateSimpleWindow
+function creates an unmapped
+.ZN InputOutput
+subwindow for a specified parent window, returns the
+window ID of the created window, and causes the X server to generate a
+.ZN CreateNotify
+event.
+The created window is placed on top in the stacking order with respect to 
+siblings.
+Any part of the window that extends outside its parent window is clipped.
+The border_width for an
+.ZN InputOnly
+window must be zero, or a
+.ZN BadMatch
+error results.
+.ZN XCreateSimpleWindow
+inherits its depth, class, and visual from its parent.
+All other window attributes, except background and border, 
+have their default values.
+.LP
+.ZN XCreateSimpleWindow
+can generate
+.ZN BadAlloc ,
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.SH STRUCTURES
+The
+.ZN XSetWindow Attributes
+structure contains:
+.LP
+.LP
+/\&* Window attribute value mask bits */
+.TS
+lw(.5i) lw(2.5i) lw(.8i).
+T{
+\&#define
+T}	T{
+.ZN CWBackPixmap
+T}	T{
+(1L<<0)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBackPixel
+T}	T{
+(1L<<1)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBorderPixmap
+T}	T{
+(1L<<2)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBorderPixel
+T}	T{
+(1L<<3)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBitGravity
+T}	T{
+(1L<<4)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWWinGravity
+T}	T{
+(1L<<5)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBackingStore
+T}	T{
+(1L<<6)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBackingPlanes
+T}	T{
+(1L<<7)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWBackingPixel
+T}	T{
+(1L<<8)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWOverrideRedirect
+T}	T{
+(1L<<9)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWSaveUnder
+T}	T{
+(1L<<10)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWEventMask
+T}	T{
+(1L<<11)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWDontPropagate
+T}	T{
+(1L<<12)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWColormap
+T}	T{
+(1L<<13)
+T}
+T{
+\&#define
+T}	T{
+.ZN CWCursor
+T}	T{
+(1L<<14)
+T}
+.TE
+.IN "XSetWindowAttributes" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        Pixmap background_pixmap;       /\&* background, None, or ParentRelative */
+        unsigned long background_pixel; /\&* background pixel */
+        Pixmap border_pixmap;           /\&* border of the window or CopyFromParent */
+        unsigned long border_pixel;     /\&* border pixel value */
+        int bit_gravity;        /\&* one of bit gravity values */
+        int win_gravity;        /\&* one of the window gravity values */
+        int backing_store;      /\&* NotUseful, WhenMapped, Always */
+        unsigned long backing_planes;   /\&* planes to be preserved if possible */
+        unsigned long backing_pixel;    /\&* value to use in restoring planes */
+        Bool save_under;        /\&* should bits under be saved? (popups) */
+        long event_mask;        /\&* set of events that should be saved */
+        long do_not_propagate_mask;     /\&* set of events that should not propagate */
+        Bool override_redirect; /\&* boolean value for override_redirect */
+        Colormap colormap;      /\&* color map to be associated with window */
+        Cursor cursor;          /\&* cursor to be displayed (or None) */
+} XSetWindowAttributes;
+.De
+.LP
+For a detailed explanation of the members of this structure,
+see \fI\*(xL\fP\^.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadMatch
+The values do not exist for an
+.ZN InputOnly
+window.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__), 
+XDefineCursor(__libmansuffix__),
+XDestroyWindow(__libmansuffix__), 
+XMapWindow(__libmansuffix__), 
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCreateWindowEvent.man b/libX11/man/XCreateWindowEvent.man
index 1c32b7def..9322bb57b 100644
--- a/libX11/man/XCreateWindowEvent.man
+++ b/libX11/man/XCreateWindowEvent.man
@@ -1,229 +1,166 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateWindowEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCreateWindowEvent \- CreateNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN CreateNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* CreateNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window parent;	/\&* parent of the window */

-	Window window;	/\&* window id of window created */

-	int x, y;	/\&* window location */

-	int width, height;	/\&* size of window */

-	int border_width;	/\&* border width */

-	Bool override_redirect;	/\&* creation should be overridden */

-} XCreateWindowEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The parent member is set to the created window's parent.

-The window member specifies the created window.

-The x and y members are set to the created window's coordinates relative 

-to the parent window's origin and indicate the position of the upper-left 

-outside corner of the created window.

-The width and height members are set to the inside size of the created window 

-(not including the border) and are always nonzero.

-The border_width member is set to the width of the created window's border, in pixels.

-The override_redirect member is set to the override-redirect attribute of the

-window.

-Window manager clients normally should ignore this window 

-if the override_redirect member is

-.ZN True .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateWindowEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCreateWindowEvent \- CreateNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN CreateNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* CreateNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window parent;  /\&* parent of the window */
+        Window window;  /\&* window id of window created */
+        int x, y;       /\&* window location */
+        int width, height;      /\&* size of window */
+        int border_width;       /\&* border width */
+        Bool override_redirect; /\&* creation should be overridden */
+} XCreateWindowEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The parent member is set to the created window's parent.
+The window member specifies the created window.
+The x and y members are set to the created window's coordinates relative 
+to the parent window's origin and indicate the position of the upper-left 
+outside corner of the created window.
+The width and height members are set to the inside size of the created window 
+(not including the border) and are always nonzero.
+The border_width member is set to the width of the created window's border, in pixels.
+The override_redirect member is set to the override-redirect attribute of the
+window.
+Window manager clients normally should ignore this window 
+if the override_redirect member is
+.ZN True .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XCrossingEvent.man b/libX11/man/XCrossingEvent.man
index d7603a00a..98eaf5542 100644
--- a/libX11/man/XCrossingEvent.man
+++ b/libX11/man/XCrossingEvent.man
@@ -1,326 +1,263 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCrossingEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XCrossingEvent \- EnterNotify and LeaveNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN EnterNotify 

-and

-.ZN LeaveNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* EnterNotify or LeaveNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* ``event'' window reported relative to */

-	Window root;	/\&* root window that the event occurred on */

-	Window subwindow;	/\&* child window */

-	Time time;	/\&* milliseconds */

-	int x, y;	/\&* pointer x, y coordinates in event window */

-	int x_root, y_root;	/\&* coordinates relative to root */

-	int mode;	/\&* NotifyNormal, NotifyGrab, NotifyUngrab */

-	int detail;

-		/\&*

-	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 

-	 	* NotifyNonlinear,NotifyNonlinearVirtual

-	 	*/

-	Bool same_screen;	/\&* same screen flag */

-	Bool focus;	/\&* boolean focus */

-	unsigned int state;	/\&* key or button mask */

-} XCrossingEvent;

-typedef XCrossingEvent XEnterWindowEvent;

-typedef XCrossingEvent XLeaveWindowEvent;

-.De

-.LP

-When you receive these events,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window on which the

-.ZN EnterNotify

-or

-.ZN LeaveNotify

-event was generated and is referred to as the event window. 

-This is the window used by the X server to report the event, 

-and is relative to the root

-window on which the event occurred. 

-The root member is set to the root window of the screen

-on which the event occurred.

-.LP

-For a

-.ZN LeaveNotify 

-event,

-if a child of the event window contains the initial position of the pointer,

-the subwindow component is set to that child.

-Otherwise, the X server sets the subwindow member to

-.ZN None .

-For an

-.ZN EnterNotify 

-event, if a child of the event window contains the final pointer position, 

-the subwindow component is set to that child or

-.ZN None .

-.LP

-The time member is set to the time when the event was generated

-and is expressed in milliseconds.

-The x and y members are set to the coordinates of the pointer position in 

-the event window.

-This position is always the pointer's final position,

-not its initial position.

-If the event window is on the same

-screen as the root window, x and y are the pointer coordinates

-relative to the event window's origin. 

-Otherwise, x and y are set to zero.

-The x_root and y_root members are set to the pointer's coordinates relative to the

-root window's origin at the time of the event.

-.LP

-The same_screen member is set to indicate whether the event window is on the same screen

-as the root window and can be either

-.ZN True 

-or

-.ZN False .

-If

-.ZN True ,

-the event and root windows are on the same screen.

-If

-.ZN False ,

-the event and root windows are not on the same screen.

-.LP

-The focus member is set to indicate whether the event window is the focus window or an

-inferior of the focus window.

-The X server can set this member to either

-.ZN True 

-or

-.ZN False .

-If

-.ZN True ,

-the event window is the focus window or an inferior of the focus window.

-If

-.ZN False ,

-the event window is not the focus window or an inferior of the focus window.

-.LP

-The state member is set to indicate the state of the pointer buttons and

-modifier keys just prior to the

-event.

-The X server can set this member to the bitwise inclusive OR of one 

-or more of the button or modifier key masks:

-.ZN Button1Mask ,

-.ZN Button2Mask ,

-.ZN Button3Mask ,

-.ZN Button4Mask ,

-.ZN Button5Mask ,

-.ZN ShiftMask ,

-.ZN LockMask ,

-.ZN ControlMask ,

-.ZN Mod1Mask ,

-.ZN Mod2Mask ,

-.ZN Mod3Mask ,

-.ZN Mod4Mask ,

-.ZN Mod5Mask .

-.LP

-The mode member is set to indicate whether the events are normal events, 

-pseudo-motion events

-when a grab activates, or pseudo-motion events when a grab deactivates.

-The X server can set this member to 

-.ZN NotifyNormal ,

-.ZN NotifyGrab ,

-or

-.ZN NotifyUngrab .

-.LP

-The detail member is set to indicate the notify detail and can be

-.ZN NotifyAncestor ,

-.ZN NotifyVirtual ,

-.ZN NotifyInferior ,

-.ZN NotifyNonlinear ,

-or

-.ZN NotifyNonlinearVirtual .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCrossingEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XCrossingEvent \- EnterNotify and LeaveNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN EnterNotify 
+and
+.ZN LeaveNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* EnterNotify or LeaveNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* ``event'' window reported relative to */
+        Window root;    /\&* root window that the event occurred on */
+        Window subwindow;       /\&* child window */
+        Time time;      /\&* milliseconds */
+        int x, y;       /\&* pointer x, y coordinates in event window */
+        int x_root, y_root;     /\&* coordinates relative to root */
+        int mode;       /\&* NotifyNormal, NotifyGrab, NotifyUngrab */
+        int detail;
+                /\&*
+                * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+                * NotifyNonlinear,NotifyNonlinearVirtual
+                */
+        Bool same_screen;       /\&* same screen flag */
+        Bool focus;     /\&* boolean focus */
+        unsigned int state;     /\&* key or button mask */
+} XCrossingEvent;
+typedef XCrossingEvent XEnterWindowEvent;
+typedef XCrossingEvent XLeaveWindowEvent;
+.De
+.LP
+When you receive these events,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window on which the
+.ZN EnterNotify
+or
+.ZN LeaveNotify
+event was generated and is referred to as the event window. 
+This is the window used by the X server to report the event, 
+and is relative to the root
+window on which the event occurred. 
+The root member is set to the root window of the screen
+on which the event occurred.
+.LP
+For a
+.ZN LeaveNotify 
+event,
+if a child of the event window contains the initial position of the pointer,
+the subwindow component is set to that child.
+Otherwise, the X server sets the subwindow member to
+.ZN None .
+For an
+.ZN EnterNotify 
+event, if a child of the event window contains the final pointer position, 
+the subwindow component is set to that child or
+.ZN None .
+.LP
+The time member is set to the time when the event was generated
+and is expressed in milliseconds.
+The x and y members are set to the coordinates of the pointer position in 
+the event window.
+This position is always the pointer's final position,
+not its initial position.
+If the event window is on the same
+screen as the root window, x and y are the pointer coordinates
+relative to the event window's origin. 
+Otherwise, x and y are set to zero.
+The x_root and y_root members are set to the pointer's coordinates relative to the
+root window's origin at the time of the event.
+.LP
+The same_screen member is set to indicate whether the event window is on the same screen
+as the root window and can be either
+.ZN True 
+or
+.ZN False .
+If
+.ZN True ,
+the event and root windows are on the same screen.
+If
+.ZN False ,
+the event and root windows are not on the same screen.
+.LP
+The focus member is set to indicate whether the event window is the focus window or an
+inferior of the focus window.
+The X server can set this member to either
+.ZN True 
+or
+.ZN False .
+If
+.ZN True ,
+the event window is the focus window or an inferior of the focus window.
+If
+.ZN False ,
+the event window is not the focus window or an inferior of the focus window.
+.LP
+The state member is set to indicate the state of the pointer buttons and
+modifier keys just prior to the
+event.
+The X server can set this member to the bitwise inclusive OR of one 
+or more of the button or modifier key masks:
+.ZN Button1Mask ,
+.ZN Button2Mask ,
+.ZN Button3Mask ,
+.ZN Button4Mask ,
+.ZN Button5Mask ,
+.ZN ShiftMask ,
+.ZN LockMask ,
+.ZN ControlMask ,
+.ZN Mod1Mask ,
+.ZN Mod2Mask ,
+.ZN Mod3Mask ,
+.ZN Mod4Mask ,
+.ZN Mod5Mask .
+.LP
+The mode member is set to indicate whether the events are normal events, 
+pseudo-motion events
+when a grab activates, or pseudo-motion events when a grab deactivates.
+The X server can set this member to 
+.ZN NotifyNormal ,
+.ZN NotifyGrab ,
+or
+.ZN NotifyUngrab .
+.LP
+The detail member is set to indicate the notify detail and can be
+.ZN NotifyAncestor ,
+.ZN NotifyVirtual ,
+.ZN NotifyInferior ,
+.ZN NotifyNonlinear ,
+or
+.ZN NotifyNonlinearVirtual .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDefineCursor.man b/libX11/man/XDefineCursor.man
index 00166e5ca..4f003cc1b 100644
--- a/libX11/man/XDefineCursor.man
+++ b/libX11/man/XDefineCursor.man
@@ -1,201 +1,140 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDefineCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDefineCursor, XUndefineCursor \- define cursors

-.SH SYNTAX

-.HP

-int XDefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Cursor

-\fIcursor\fP\^);

-.HP

-int XUndefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.SH ARGUMENTS

-.IP \fIcursor\fP 1i

-Specifies the cursor that is to be displayed or

-.ZN None .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-If a cursor is set, it will be used when the pointer is in the window.

-If the cursor is

-.ZN None ,

-it is equivalent to

-.ZN XUndefineCursor .

-.LP

-.ZN XDefineCursor

-can generate

-.ZN BadCursor

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XUndefineCursor

-function undoes the effect of a previous

-.ZN XDefineCursor

-for this window.

-When the pointer is in the window,

-the parent's cursor will now be used.

-On the root window,

-the default cursor is restored.

-.LP

-.ZN XUndefineCursor

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XCreateFontCursor(__libmansuffix__),

-XRecolorCursor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDefineCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDefineCursor, XUndefineCursor \- define cursors
+.SH SYNTAX
+.HP
+int XDefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Cursor
+\fIcursor\fP\^);
+.HP
+int XUndefineCursor\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.SH ARGUMENTS
+.IP \fIcursor\fP 1i
+Specifies the cursor that is to be displayed or
+.ZN None .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+If a cursor is set, it will be used when the pointer is in the window.
+If the cursor is
+.ZN None ,
+it is equivalent to
+.ZN XUndefineCursor .
+.LP
+.ZN XDefineCursor
+can generate
+.ZN BadCursor
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XUndefineCursor
+function undoes the effect of a previous
+.ZN XDefineCursor
+for this window.
+When the pointer is in the window,
+the parent's cursor will now be used.
+On the root window,
+the default cursor is restored.
+.LP
+.ZN XUndefineCursor
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XCreateFontCursor(__libmansuffix__),
+XRecolorCursor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDestroyWindow.man b/libX11/man/XDestroyWindow.man
index e448405d5..c2bffb3ba 100644
--- a/libX11/man/XDestroyWindow.man
+++ b/libX11/man/XDestroyWindow.man
@@ -1,217 +1,156 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDestroyWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDestroyWindow, XDestroySubwindows \- destroy windows

-.SH SYNTAX

-.HP

-int XDestroyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XDestroySubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XDestroyWindow

-function destroys the specified window as well as all of its subwindows and causes

-the X server to generate a

-.ZN DestroyNotify

-event for each window.

-The window should never be referenced again.

-If the window specified by the w argument is mapped,

-it is unmapped automatically.

-The ordering of the

-.ZN DestroyNotify

-events is such that for any given window being destroyed,

-.ZN DestroyNotify

-is generated on any inferiors of the window before being generated on

-the window itself.

-The ordering among siblings and across subhierarchies is not otherwise

-constrained.

-If the window you specified is a root window, no windows are destroyed.

-Destroying a mapped window will generate 

-.ZN Expose 

-events on other windows that were obscured by the window being destroyed.

-.LP

-.ZN XDestroyWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XDestroySubwindows

-function destroys all inferior windows of the specified window, 

-in bottom-to-top stacking order.

-It causes the X server to generate a

-.ZN DestroyNotify

-event for each window.

-If any mapped

-subwindows were actually destroyed,

-.ZN XDestroySubwindows

-causes the X server to generate 

-.ZN Expose 

-events on the specified window.

-This is much more efficient than deleting many windows

-one at a time because much of the work need be performed only once for all

-of the windows, rather than for each window.

-The subwindows should never be referenced again.  

-.LP

-.ZN XDestroySubwindows

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XMapWindow(__libmansuffix__),

-XRaiseWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDestroyWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDestroyWindow, XDestroySubwindows \- destroy windows
+.SH SYNTAX
+.HP
+int XDestroyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XDestroySubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XDestroyWindow
+function destroys the specified window as well as all of its subwindows and causes
+the X server to generate a
+.ZN DestroyNotify
+event for each window.
+The window should never be referenced again.
+If the window specified by the w argument is mapped,
+it is unmapped automatically.
+The ordering of the
+.ZN DestroyNotify
+events is such that for any given window being destroyed,
+.ZN DestroyNotify
+is generated on any inferiors of the window before being generated on
+the window itself.
+The ordering among siblings and across subhierarchies is not otherwise
+constrained.
+If the window you specified is a root window, no windows are destroyed.
+Destroying a mapped window will generate 
+.ZN Expose 
+events on other windows that were obscured by the window being destroyed.
+.LP
+.ZN XDestroyWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XDestroySubwindows
+function destroys all inferior windows of the specified window, 
+in bottom-to-top stacking order.
+It causes the X server to generate a
+.ZN DestroyNotify
+event for each window.
+If any mapped
+subwindows were actually destroyed,
+.ZN XDestroySubwindows
+causes the X server to generate 
+.ZN Expose 
+events on the specified window.
+This is much more efficient than deleting many windows
+one at a time because much of the work need be performed only once for all
+of the windows, rather than for each window.
+The subwindows should never be referenced again.  
+.LP
+.ZN XDestroySubwindows
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDestroyWindowEvent.man b/libX11/man/XDestroyWindowEvent.man
index e9f2d15ed..7d6753be3 100644
--- a/libX11/man/XDestroyWindowEvent.man
+++ b/libX11/man/XDestroyWindowEvent.man
@@ -1,219 +1,156 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDestroyWindowEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDestroyWindowEvent \- DestroyNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN DestroyNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* DestroyNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-} XDestroyWindowEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the destroyed window or to its parent,

-depending on whether

-.ZN StructureNotify

-or 

-.ZN SubstructureNotify

-was selected.

-The window member is set to the window that is destroyed.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDestroyWindowEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDestroyWindowEvent \- DestroyNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN DestroyNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* DestroyNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+} XDestroyWindowEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the destroyed window or to its parent,
+depending on whether
+.ZN StructureNotify
+or 
+.ZN SubstructureNotify
+was selected.
+The window member is set to the window that is destroyed.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawArc.man b/libX11/man/XDrawArc.man
index e20692ddc..e916187bf 100644
--- a/libX11/man/XDrawArc.man
+++ b/libX11/man/XDrawArc.man
@@ -1,339 +1,278 @@
-'\" e

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.de EX

-.sp

-.nf

-.ft CW

-..

-.de EE

-.ft R

-.fi

-.sp

-..

-'\" e

-.TH XDrawArc __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawArc, XDrawArcs, XArc \- draw arcs and arc structure

-.SH SYNTAX

-.HP

-int XDrawArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int

-\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 

-.HP

-int XDrawArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 

-.SH ARGUMENTS

-.IP \fIangle1\fP 1i

-Specifies the start of the arc relative to the three-o'clock position

-from the center, in units of degrees * 64.

-.IP \fIangle2\fP 1i

-Specifies the path and extent of the arc relative to the start of the

-arc, in units of degrees * 64.

-.IP \fIarcs\fP 1i

-Specifies an array of arcs.

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fInarcs\fP 1i

-Specifies the number of arcs in the array.

-.ds Wh , which are the major and minor axes of the arc

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which are relative to the origin of the drawable \

-and specify the upper-left corner of the bounding rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-.EQ

-delim %%

-.EN

-.ZN XDrawArc

-draws a single circular or elliptical arc, and 

-.ZN XDrawArcs

-draws multiple circular or elliptical arcs.

-Each arc is specified by a rectangle and two angles.  

-The center of the circle or ellipse is the center of the

-rectangle, and the major and minor axes are specified by the width and height.

-Positive angles indicate counterclockwise motion, 

-and negative angles indicate clockwise motion.  

-If the magnitude of angle2 is greater than 360 degrees, 

-.ZN XDrawArc

-or 

-.ZN XDrawArcs

-truncates it to 360 degrees.

-.LP

-For an arc specified as %[ ~x, ~y, ~width , ~height, ~angle1, ~angle2 ]%, 

-the origin of the major and minor axes is at 

-% [ x +^ {width over 2} , ~y +^ {height over 2}  ]%, 

-and the infinitely thin path describing the entire circle or ellipse 

-intersects the horizontal axis at % [ x, ~y +^ {height over 2}  ]% and 

-% [ x +^ width , ~y +^ { height over 2 }] %

-and intersects the vertical axis at % [ x +^ { width over 2 } , ~y ]% and 

-% [ x +^ { width over 2 }, ~y +^ height ]%.

-These coordinates can be fractional

-and so are not truncated to discrete coordinates.

-The path should be defined by the ideal mathematical path.  

-For a wide line with line-width lw, 

-the bounding outlines for filling are given        

-by the two infinitely thin paths consisting of all points whose perpendicular

-distance from the path of the circle/ellipse is equal to lw/2

-(which may be a fractional value).

-The cap-style and join-style are applied the same as for a line

-corresponding to the tangent of the circle/ellipse at the endpoint.

-.LP

-For an arc specified as % [ ~x, ~y, ~width, ~height, ~angle1, ~angle2  ]%,

-the angles must be specified

-in the effectively skewed coordinate system of the ellipse (for a

-circle, the angles and coordinate systems are identical).  The

-relationship between these angles and angles expressed in the normal

-coordinate system of the screen (as measured with a protractor) is as

-follows:

-.LP

-.Ds

-% roman "skewed-angle" ~ = ~ atan left ( tan ( roman "normal-angle" )

- * width over height right ) +^ adjust%

-.De

-.LP

-The skewed-angle and normal-angle are expressed in radians (rather

-than in degrees scaled by 64) in the range % [ 0 , ~2 pi  ]% and where atan

-returns a value in the range % [ - pi over 2 , ~pi over 2  ] %

-and adjust is:

-.LP

-.TS

-l l.

-%0%	for normal-angle in the range % [ 0 , ~pi over 2  ]%

-%pi%	for normal-angle in the range % [ pi over 2 , ~{3 pi} over 2  ]%

-%2 pi%	for normal-angle in the range % [ {3 pi} over 2 , ~2 pi  ]%

-.TE

-.LP

-For any given arc, 

-.ZN XDrawArc

-and

-.ZN XDrawArcs

-do not draw a pixel more than once.  

-If two arcs join correctly and if the line-width is greater than zero 

-and the arcs intersect, 

-.ZN XDrawArc

-and

-.ZN XDrawArcs

-do not draw a pixel more than once.

-Otherwise, 

-the intersecting pixels of intersecting arcs are drawn multiple times.

-Specifying an arc with one endpoint and a clockwise extent draws the same pixels

-as specifying the other endpoint and an equivalent counterclockwise extent,

-except as it affects joins.

-.LP

-If the last point in one arc coincides with the first point in the following 

-arc, the two arcs will join correctly.  

-If the first point in the first arc coincides with the last point in the last 

-arc, the two arcs will join correctly.

-By specifying one axis to be zero, a horizontal or vertical line can be

-drawn.

-Angles are computed based solely on the coordinate system and ignore the

-aspect ratio.

-.LP

-Both functions use these GC components: 

-function, plane-mask, line-width, line-style, cap-style, join-style, 

-fill-style, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-tile-stipple-y-origin, dash-offset, and dash-list.

-.LP

-.ZN XDrawArc

-and

-.ZN XDrawArcs

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH STRUCTURES

-The

-.ZN XArc

-structure contains:

-.LP

-.EX

-typedef struct {

-	short x, y;

-	unsigned short width, height;

-	short angle1, angle2;             /\&* Degrees * 64 */

-} XArc;

-.EE

-.LP

-All x and y members are signed integers.

-The width and height members are 16-bit unsigned integers.

-You should be careful not to generate coordinates and sizes

-out of the 16-bit ranges, because the protocol only has 16-bit fields

-for these values.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.SH "SEE ALSO"

-XDrawLine(__libmansuffix__),

-XDrawPoint(__libmansuffix__),

-XDrawRectangle(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" e
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
+'\" e
+.TH XDrawArc __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawArc, XDrawArcs, XArc \- draw arcs and arc structure
+.SH SYNTAX
+.HP
+int XDrawArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 
+.HP
+int XDrawArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 
+.SH ARGUMENTS
+.IP \fIangle1\fP 1i
+Specifies the start of the arc relative to the three-o'clock position
+from the center, in units of degrees * 64.
+.IP \fIangle2\fP 1i
+Specifies the path and extent of the arc relative to the start of the
+arc, in units of degrees * 64.
+.IP \fIarcs\fP 1i
+Specifies an array of arcs.
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fInarcs\fP 1i
+Specifies the number of arcs in the array.
+.ds Wh , which are the major and minor axes of the arc
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which are relative to the origin of the drawable \
+and specify the upper-left corner of the bounding rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+.EQ
+delim %%
+.EN
+.ZN XDrawArc
+draws a single circular or elliptical arc, and 
+.ZN XDrawArcs
+draws multiple circular or elliptical arcs.
+Each arc is specified by a rectangle and two angles.  
+The center of the circle or ellipse is the center of the
+rectangle, and the major and minor axes are specified by the width and height.
+Positive angles indicate counterclockwise motion, 
+and negative angles indicate clockwise motion.  
+If the magnitude of angle2 is greater than 360 degrees, 
+.ZN XDrawArc
+or 
+.ZN XDrawArcs
+truncates it to 360 degrees.
+.LP
+For an arc specified as %[ ~x, ~y, ~width , ~height, ~angle1, ~angle2 ]%, 
+the origin of the major and minor axes is at 
+% [ x +^ {width over 2} , ~y +^ {height over 2}  ]%, 
+and the infinitely thin path describing the entire circle or ellipse 
+intersects the horizontal axis at % [ x, ~y +^ {height over 2}  ]% and 
+% [ x +^ width , ~y +^ { height over 2 }] %
+and intersects the vertical axis at % [ x +^ { width over 2 } , ~y ]% and 
+% [ x +^ { width over 2 }, ~y +^ height ]%.
+These coordinates can be fractional
+and so are not truncated to discrete coordinates.
+The path should be defined by the ideal mathematical path.  
+For a wide line with line-width lw, 
+the bounding outlines for filling are given        
+by the two infinitely thin paths consisting of all points whose perpendicular
+distance from the path of the circle/ellipse is equal to lw/2
+(which may be a fractional value).
+The cap-style and join-style are applied the same as for a line
+corresponding to the tangent of the circle/ellipse at the endpoint.
+.LP
+For an arc specified as % [ ~x, ~y, ~width, ~height, ~angle1, ~angle2  ]%,
+the angles must be specified
+in the effectively skewed coordinate system of the ellipse (for a
+circle, the angles and coordinate systems are identical).  The
+relationship between these angles and angles expressed in the normal
+coordinate system of the screen (as measured with a protractor) is as
+follows:
+.LP
+.Ds
+% roman "skewed-angle" ~ = ~ atan left ( tan ( roman "normal-angle" )
+ * width over height right ) +^ adjust%
+.De
+.LP
+The skewed-angle and normal-angle are expressed in radians (rather
+than in degrees scaled by 64) in the range % [ 0 , ~2 pi  ]% and where atan
+returns a value in the range % [ - pi over 2 , ~pi over 2  ] %
+and adjust is:
+.LP
+.TS
+l l.
+%0%	for normal-angle in the range % [ 0 , ~pi over 2  ]%
+%pi%	for normal-angle in the range % [ pi over 2 , ~{3 pi} over 2  ]%
+%2 pi%	for normal-angle in the range % [ {3 pi} over 2 , ~2 pi  ]%
+.TE
+.LP
+For any given arc, 
+.ZN XDrawArc
+and
+.ZN XDrawArcs
+do not draw a pixel more than once.  
+If two arcs join correctly and if the line-width is greater than zero 
+and the arcs intersect, 
+.ZN XDrawArc
+and
+.ZN XDrawArcs
+do not draw a pixel more than once.
+Otherwise, 
+the intersecting pixels of intersecting arcs are drawn multiple times.
+Specifying an arc with one endpoint and a clockwise extent draws the same pixels
+as specifying the other endpoint and an equivalent counterclockwise extent,
+except as it affects joins.
+.LP
+If the last point in one arc coincides with the first point in the following 
+arc, the two arcs will join correctly.  
+If the first point in the first arc coincides with the last point in the last 
+arc, the two arcs will join correctly.
+By specifying one axis to be zero, a horizontal or vertical line can be
+drawn.
+Angles are computed based solely on the coordinate system and ignore the
+aspect ratio.
+.LP
+Both functions use these GC components: 
+function, plane-mask, line-width, line-style, cap-style, join-style, 
+fill-style, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+tile-stipple-y-origin, dash-offset, and dash-list.
+.LP
+.ZN XDrawArc
+and
+.ZN XDrawArcs
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH STRUCTURES
+The
+.ZN XArc
+structure contains:
+.LP
+.EX
+typedef struct {
+	short x, y;
+	unsigned short width, height;
+	short angle1, angle2;             /\&* Degrees * 64 */
+} XArc;
+.EE
+.LP
+All x and y members are signed integers.
+The width and height members are 16-bit unsigned integers.
+You should be careful not to generate coordinates and sizes
+out of the 16-bit ranges, because the protocol only has 16-bit fields
+for these values.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.SH "SEE ALSO"
+XDrawLine(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawImageString.man b/libX11/man/XDrawImageString.man
index 43329baf4..15d6b24ea 100644
--- a/libX11/man/XDrawImageString.man
+++ b/libX11/man/XDrawImageString.man
@@ -1,252 +1,191 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawImageString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawImageString, XDrawImageString16 \- draw image text

-.SH SYNTAX

-.HP

-int XDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int

-\fIlength\fP\^); 

-.HP

-int XDrawImageString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int

-\fIlength\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIlength\fP 1i

-Specifies the number of characters in the string argument.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.ds Xy , which are relative to the origin of the specified drawable \

-and define the origin of the first character

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XDrawImageString16

-function is similar to

-.ZN XDrawImageString 

-except that it uses 2-byte or 16-bit characters.

-Both functions also use both the foreground and background pixels 

-of the GC in the destination.

-.LP

-The effect is first to fill a

-destination rectangle with the background pixel defined in the GC and then

-to paint the text with the foreground pixel.

-The upper-left corner of the filled rectangle is at:

-.LP

-.Ds

-[x, y \- font-ascent]

-.De

-.LP

-The width is:

-.LP

-.Ds

-overall-width

-.De

-.LP

-The height is:

-.LP

-.Ds

-font-ascent + font-descent

-.De

-.LP

-The overall-width, font-ascent, and font-descent

-are as would be returned by 

-.ZN XQueryTextExtents 

-using gc and string.

-The function and fill-style defined in the GC are ignored for these functions. 

-The effective function is 

-.ZN GXcopy ,

-and the effective fill-style is

-.ZN FillSolid .

-.LP

-For fonts defined with 2-byte matrix indexing

-and used with

-.ZN XDrawImageString ,

-each byte is used as a byte2 with a byte1 of zero.

-.LP

-Both functions use these GC components: 

-plane-mask, foreground, background, font, subwindow-mode, clip-x-origin, 

-clip-y-origin, and clip-mask.

-.LP

-.ZN XDrawImageString

-and

-.ZN XDrawImageString16

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.SH "SEE ALSO"

-XDrawString(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XLoadFont(__libmansuffix__),

-XTextExtents(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawImageString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawImageString, XDrawImageString16 \- draw image text
+.SH SYNTAX
+.HP
+int XDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.HP
+int XDrawImageString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIlength\fP 1i
+Specifies the number of characters in the string argument.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.ds Xy , which are relative to the origin of the specified drawable \
+and define the origin of the first character
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XDrawImageString16
+function is similar to
+.ZN XDrawImageString 
+except that it uses 2-byte or 16-bit characters.
+Both functions also use both the foreground and background pixels 
+of the GC in the destination.
+.LP
+The effect is first to fill a
+destination rectangle with the background pixel defined in the GC and then
+to paint the text with the foreground pixel.
+The upper-left corner of the filled rectangle is at:
+.LP
+.Ds
+[x, y \- font-ascent]
+.De
+.LP
+The width is:
+.LP
+.Ds
+overall-width
+.De
+.LP
+The height is:
+.LP
+.Ds
+font-ascent + font-descent
+.De
+.LP
+The overall-width, font-ascent, and font-descent
+are as would be returned by 
+.ZN XQueryTextExtents 
+using gc and string.
+The function and fill-style defined in the GC are ignored for these functions. 
+The effective function is 
+.ZN GXcopy ,
+and the effective fill-style is
+.ZN FillSolid .
+.LP
+For fonts defined with 2-byte matrix indexing
+and used with
+.ZN XDrawImageString ,
+each byte is used as a byte2 with a byte1 of zero.
+.LP
+Both functions use these GC components: 
+plane-mask, foreground, background, font, subwindow-mode, clip-x-origin, 
+clip-y-origin, and clip-mask.
+.LP
+.ZN XDrawImageString
+and
+.ZN XDrawImageString16
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.SH "SEE ALSO"
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XLoadFont(__libmansuffix__),
+XTextExtents(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawLine.man b/libX11/man/XDrawLine.man
index 2cc293bdf..03433aac5 100644
--- a/libX11/man/XDrawLine.man
+++ b/libX11/man/XDrawLine.man
@@ -1,308 +1,245 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawLine __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawLine, XDrawLines, XDrawSegments, XSegment \- draw lines, polygons, and line structure

-.SH SYNTAX

-.HP

-int XDrawLine\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-int \fIx1\fP\^, int \fIy1\fP\^, int \fIx2\fP\^, int \fIy2\fP\^); 

-.HP 

-int XDrawLines\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 

-.HP 

-int XDrawSegments\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XSegment *\fIsegments\fP\^, int \fInsegments\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fImode\fP 1i

-Specifies the coordinate mode. 

-You can pass

-.ZN CoordModeOrigin

-or

-.ZN CoordModePrevious .

-.IP \fInpoints\fP 1i

-Specifies the number of points in the array.

-.IP \fInsegments\fP 1i

-Specifies the number of segments in the array.

-.IP \fIpoints\fP 1i

-Specifies an array of points.

-.IP \fIsegments\fP 1i

-Specifies an array of segments.

-.IP \fIx1\fP 1i

-.br

-.ns

-.IP \fIy1\fP 1i

-.br

-.ns

-.IP \fIx2\fP 1i

-.br

-.ns

-.IP \fIy2\fP 1i

-Specify the points (x1, y1) and (x2, y2) to be connected.

-.SH DESCRIPTION

-The

-.ZN XDrawLine

-function uses the components of the specified GC to

-draw a line between the specified set of points (x1, y1) and (x2, y2).

-It does not perform joining at coincident endpoints.

-For any given line, 

-.ZN XDrawLine 

-does not draw a pixel more than once.

-If lines intersect, the intersecting pixels are drawn multiple times.  

-.LP

-The

-.ZN XDrawLines

-function uses the components of the specified GC to draw 

-npoints\-1 lines between each pair of points (point[i], point[i+1]) 

-in the array of

-.ZN XPoint

-structures.

-It draws the lines in the order listed in the array.

-The lines join correctly at all intermediate points, and if the first and last

-points coincide, the first and last lines also join correctly.

-For any given line, 

-.ZN XDrawLines

-does not draw a pixel more than once.

-If thin (zero line-width) lines intersect, 

-the intersecting pixels are drawn multiple times.

-If wide lines intersect, the intersecting pixels are drawn only once, as though

-the entire 

-.ZN PolyLine 

-protocol request were a single, filled shape.

-.ZN CoordModeOrigin

-treats all coordinates as relative to the origin,

-and

-.ZN CoordModePrevious

-treats all coordinates after the first as relative to the previous point.

-.LP

-The

-.ZN XDrawSegments 

-function draws multiple, unconnected lines. 

-For each segment, 

-.ZN XDrawSegments 

-draws a

-line between (x1, y1) and (x2, y2).

-It draws the lines in the order listed in the array of

-.ZN XSegment

-structures and does not perform joining at coincident endpoints.

-For any given line, 

-.ZN XDrawSegments

-does not draw a pixel more than once.  

-If lines intersect, the intersecting pixels are drawn multiple times.  

-.LP

-All three functions use these GC components:

-function, plane-mask, line-width,

-line-style, cap-style, fill-style, subwindow-mode,

-clip-x-origin, clip-y-origin, and clip-mask.

-The

-.ZN XDrawLines

-function also uses the join-style GC component.

-All three functions also use these GC mode-dependent components:

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-tile-stipple-y-origin, dash-offset, and dash-list.

-.LP

-.ZN XDrawLine ,

-.ZN XDrawLines ,

-and

-.ZN XDrawSegments

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.ZN XDrawLines

-can also generate a

-.ZN BadValue 

-error.

-.SH STRUCTURES

-The

-.ZN XSegment

-structure contains:

-.LP

-.Ds 0

-.TA .5i

-.ta .5i

-typedef struct {

-	short x1, y1, x2, y2;

-} XSegment;

-.De

-.LP

-All x and y members are signed integers.

-The width and height members are 16-bit unsigned integers.

-You should be careful not to generate coordinates and sizes

-out of the 16-bit ranges, because the protocol only has 16-bit fields

-for these values.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XDrawArc(__libmansuffix__),

-XDrawPoint(__libmansuffix__),

-XDrawRectangle(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawLine __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawLine, XDrawLines, XDrawSegments, XSegment \- draw lines, polygons, and line structure
+.SH SYNTAX
+.HP
+int XDrawLine\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx1\fP\^, int \fIy1\fP\^, int \fIx2\fP\^, int \fIy2\fP\^); 
+.HP 
+int XDrawLines\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 
+.HP 
+int XDrawSegments\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XSegment *\fIsegments\fP\^, int \fInsegments\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fImode\fP 1i
+Specifies the coordinate mode. 
+You can pass
+.ZN CoordModeOrigin
+or
+.ZN CoordModePrevious .
+.IP \fInpoints\fP 1i
+Specifies the number of points in the array.
+.IP \fInsegments\fP 1i
+Specifies the number of segments in the array.
+.IP \fIpoints\fP 1i
+Specifies an array of points.
+.IP \fIsegments\fP 1i
+Specifies an array of segments.
+.IP \fIx1\fP 1i
+.br
+.ns
+.IP \fIy1\fP 1i
+.br
+.ns
+.IP \fIx2\fP 1i
+.br
+.ns
+.IP \fIy2\fP 1i
+Specify the points (x1, y1) and (x2, y2) to be connected.
+.SH DESCRIPTION
+The
+.ZN XDrawLine
+function uses the components of the specified GC to
+draw a line between the specified set of points (x1, y1) and (x2, y2).
+It does not perform joining at coincident endpoints.
+For any given line, 
+.ZN XDrawLine 
+does not draw a pixel more than once.
+If lines intersect, the intersecting pixels are drawn multiple times.  
+.LP
+The
+.ZN XDrawLines
+function uses the components of the specified GC to draw 
+npoints\-1 lines between each pair of points (point[i], point[i+1]) 
+in the array of
+.ZN XPoint
+structures.
+It draws the lines in the order listed in the array.
+The lines join correctly at all intermediate points, and if the first and last
+points coincide, the first and last lines also join correctly.
+For any given line, 
+.ZN XDrawLines
+does not draw a pixel more than once.
+If thin (zero line-width) lines intersect, 
+the intersecting pixels are drawn multiple times.
+If wide lines intersect, the intersecting pixels are drawn only once, as though
+the entire 
+.ZN PolyLine 
+protocol request were a single, filled shape.
+.ZN CoordModeOrigin
+treats all coordinates as relative to the origin,
+and
+.ZN CoordModePrevious
+treats all coordinates after the first as relative to the previous point.
+.LP
+The
+.ZN XDrawSegments 
+function draws multiple, unconnected lines. 
+For each segment, 
+.ZN XDrawSegments 
+draws a
+line between (x1, y1) and (x2, y2).
+It draws the lines in the order listed in the array of
+.ZN XSegment
+structures and does not perform joining at coincident endpoints.
+For any given line, 
+.ZN XDrawSegments
+does not draw a pixel more than once.  
+If lines intersect, the intersecting pixels are drawn multiple times.  
+.LP
+All three functions use these GC components:
+function, plane-mask, line-width,
+line-style, cap-style, fill-style, subwindow-mode,
+clip-x-origin, clip-y-origin, and clip-mask.
+The
+.ZN XDrawLines
+function also uses the join-style GC component.
+All three functions also use these GC mode-dependent components:
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+tile-stipple-y-origin, dash-offset, and dash-list.
+.LP
+.ZN XDrawLine ,
+.ZN XDrawLines ,
+and
+.ZN XDrawSegments
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.ZN XDrawLines
+can also generate a
+.ZN BadValue 
+error.
+.SH STRUCTURES
+The
+.ZN XSegment
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        short x1, y1, x2, y2;
+} XSegment;
+.De
+.LP
+All x and y members are signed integers.
+The width and height members are 16-bit unsigned integers.
+You should be careful not to generate coordinates and sizes
+out of the 16-bit ranges, because the protocol only has 16-bit fields
+for these values.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XDrawArc(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawPoint.man b/libX11/man/XDrawPoint.man
index d326d3166..05721ca87 100644
--- a/libX11/man/XDrawPoint.man
+++ b/libX11/man/XDrawPoint.man
@@ -1,252 +1,189 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawPoint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawPoint, XDrawPoints, XPoint \- draw points and points structure

-.SH SYNTAX

-.HP

-int XDrawPoint\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^); 

-.HP

-int XDrawPoints\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fImode\fP 1i

-Specifies the coordinate mode. 

-You can pass

-.ZN CoordModeOrigin

-or

-.ZN CoordModePrevious .

-.IP \fInpoints\fP 1i

-Specifies the number of points in the array.

-.IP \fIpoints\fP 1i

-Specifies an array of points.

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates where you want the point drawn.

-.SH DESCRIPTION

-The

-.ZN XDrawPoint

-function uses the foreground pixel and function components of the

-GC to draw a single point into the specified drawable; 

-.ZN XDrawPoints

-draws multiple points this way.

-.ZN CoordModeOrigin

-treats all coordinates as relative to the origin,

-and

-.ZN CoordModePrevious

-treats all coordinates after the first as relative to the previous point.

-.ZN XDrawPoints

-draws the points in the order listed in the array.

-.LP

-Both functions use these GC components: function, plane-mask,

-foreground, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.

-.LP

-.ZN XDrawPoint

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and 

-.ZN BadMatch 

-errors.

-.ZN XDrawPoints

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.SH STRUCTURES

-The

-.ZN XPoint

-structure contains:

-.LP

-.Ds 0

-.TA .5i

-.ta .5i

-typedef struct {

-	short x, y;

-} XPoint;

-.De

-.LP

-All x and y members are signed integers.

-The width and height members are 16-bit unsigned integers.

-You should be careful not to generate coordinates and sizes

-out of the 16-bit ranges, because the protocol only has 16-bit fields

-for these values.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XDrawArc(__libmansuffix__),

-XDrawLine(__libmansuffix__),

-XDrawRectangle(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawPoint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawPoint, XDrawPoints, XPoint \- draw points and points structure
+.SH SYNTAX
+.HP
+int XDrawPoint\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
+.HP
+int XDrawPoints\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fImode\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fImode\fP 1i
+Specifies the coordinate mode. 
+You can pass
+.ZN CoordModeOrigin
+or
+.ZN CoordModePrevious .
+.IP \fInpoints\fP 1i
+Specifies the number of points in the array.
+.IP \fIpoints\fP 1i
+Specifies an array of points.
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates where you want the point drawn.
+.SH DESCRIPTION
+The
+.ZN XDrawPoint
+function uses the foreground pixel and function components of the
+GC to draw a single point into the specified drawable; 
+.ZN XDrawPoints
+draws multiple points this way.
+.ZN CoordModeOrigin
+treats all coordinates as relative to the origin,
+and
+.ZN CoordModePrevious
+treats all coordinates after the first as relative to the previous point.
+.ZN XDrawPoints
+draws the points in the order listed in the array.
+.LP
+Both functions use these GC components: function, plane-mask,
+foreground, subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+.LP
+.ZN XDrawPoint
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and 
+.ZN BadMatch 
+errors.
+.ZN XDrawPoints
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.SH STRUCTURES
+The
+.ZN XPoint
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        short x, y;
+} XPoint;
+.De
+.LP
+All x and y members are signed integers.
+The width and height members are 16-bit unsigned integers.
+You should be careful not to generate coordinates and sizes
+out of the 16-bit ranges, because the protocol only has 16-bit fields
+for these values.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawRectangle.man b/libX11/man/XDrawRectangle.man
index 9d5e19cba..06fffe4d5 100644
--- a/libX11/man/XDrawRectangle.man
+++ b/libX11/man/XDrawRectangle.man
@@ -1,252 +1,189 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawRectangle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawRectangle, XDrawRectangles, XRectangle \- draw rectangles and rectangles structure

-.SH SYNTAX

-.HP

-int XDrawRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned

-int \fIheight\fP\^); 

-.HP

-int XDrawRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XRectangle \fIrectangles\fP\^[\^]\^, int \fInrectangles\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fInrectangles\fP 1i

-Specifies the number of rectangles in the array.

-.IP \fIrectangles\fP 1i

-Specifies an array of rectangles.

-.ds Wh , which specify the dimensions of the rectangle

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which specify the upper-left corner of the rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XDrawRectangle

-and

-.ZN XDrawRectangles

-functions draw the outlines of the specified rectangle or rectangles as

-if a five-point 

-.ZN PolyLine 

-protocol request were specified for each rectangle:

-.IP

-[x,y] [x+width,y] [x+width,y+height] [x,y+height] [x,y]

-.LP 

-For the specified rectangle or rectangles, 

-these functions do not draw a pixel more than once.

-.ZN XDrawRectangles

-draws the rectangles in the order listed in the array.

-If rectangles intersect,

-the intersecting pixels are drawn multiple times.

-.LP

-Both functions use these GC components: 

-function, plane-mask, line-width,

-line-style, cap-style, join-style, fill-style, 

-subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-tile-stipple-y-origin, dash-offset, and dash-list.

-.LP

-.ZN XDrawRectangle

-and

-.ZN XDrawRectangles

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH STRUCTURES

-The

-.ZN XRectangle

-structure contains:

-.LP

-.Ds 0

-.TA .5i

-.ta .5i

-typedef struct {

-	short x, y;

-	unsigned short width, height;

-} XRectangle;

-.De

-.LP

-All x and y members are signed integers.

-The width and height members are 16-bit unsigned integers.

-You should be careful not to generate coordinates and sizes

-out of the 16-bit ranges, because the protocol only has 16-bit fields

-for these values.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.SH "SEE ALSO"

-XDrawArc(__libmansuffix__),

-XDrawLine(__libmansuffix__),

-XDrawPoint(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawRectangle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawRectangle, XDrawRectangles, XRectangle \- draw rectangles and rectangles structure
+.SH SYNTAX
+.HP
+int XDrawRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned
+int \fIheight\fP\^); 
+.HP
+int XDrawRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XRectangle \fIrectangles\fP\^[\^]\^, int \fInrectangles\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fInrectangles\fP 1i
+Specifies the number of rectangles in the array.
+.IP \fIrectangles\fP 1i
+Specifies an array of rectangles.
+.ds Wh , which specify the dimensions of the rectangle
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which specify the upper-left corner of the rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XDrawRectangle
+and
+.ZN XDrawRectangles
+functions draw the outlines of the specified rectangle or rectangles as
+if a five-point 
+.ZN PolyLine 
+protocol request were specified for each rectangle:
+.IP
+[x,y] [x+width,y] [x+width,y+height] [x,y+height] [x,y]
+.LP 
+For the specified rectangle or rectangles, 
+these functions do not draw a pixel more than once.
+.ZN XDrawRectangles
+draws the rectangles in the order listed in the array.
+If rectangles intersect,
+the intersecting pixels are drawn multiple times.
+.LP
+Both functions use these GC components: 
+function, plane-mask, line-width,
+line-style, cap-style, join-style, fill-style, 
+subwindow-mode, clip-x-origin, clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+tile-stipple-y-origin, dash-offset, and dash-list.
+.LP
+.ZN XDrawRectangle
+and
+.ZN XDrawRectangles
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH STRUCTURES
+The
+.ZN XRectangle
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        short x, y;
+        unsigned short width, height;
+} XRectangle;
+.De
+.LP
+All x and y members are signed integers.
+The width and height members are 16-bit unsigned integers.
+You should be careful not to generate coordinates and sizes
+out of the 16-bit ranges, because the protocol only has 16-bit fields
+for these values.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.SH "SEE ALSO"
+XDrawArc(__libmansuffix__),
+XDrawLine(__libmansuffix__),
+XDrawPoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawString.man b/libX11/man/XDrawString.man
index 71cd9f1b3..6c8ec2b73 100644
--- a/libX11/man/XDrawString.man
+++ b/libX11/man/XDrawString.man
@@ -1,218 +1,157 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawString, XDrawString16 \- draw text characters

-.SH SYNTAX

-.HP

-int XDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int

-\fIlength\fP\^); 

-.HP

-int XDrawString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int

-\fIlength\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIlength\fP 1i

-Specifies the number of characters in the string argument.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.ds Xy , which are relative to the origin of the specified drawable \

-and define the origin of the first character

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-Each character image, as defined by the font in the GC, is treated as an

-additional mask for a fill operation on the drawable.

-The drawable is modified only where the font character has a bit set to 1.

-For fonts defined with 2-byte matrix indexing

-and used with

-.ZN XDrawString16 ,

-each byte is used as a byte2 with a byte1 of zero.

-.LP

-Both functions use these GC components: 

-function, plane-mask, fill-style, font, subwindow-mode, clip-x-origin, 

-clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-and tile-stipple-y-origin.

-.LP

-.ZN XDrawString

-and

-.ZN XDrawString16

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.SH "SEE ALSO"

-XDrawImageString(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XLoadFont(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawString, XDrawString16 \- draw text characters
+.SH SYNTAX
+.HP
+int XDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.HP
+int XDrawString16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XChar2b *\fIstring\fP\^, int
+\fIlength\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIlength\fP 1i
+Specifies the number of characters in the string argument.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.ds Xy , which are relative to the origin of the specified drawable \
+and define the origin of the first character
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+Each character image, as defined by the font in the GC, is treated as an
+additional mask for a fill operation on the drawable.
+The drawable is modified only where the font character has a bit set to 1.
+For fonts defined with 2-byte matrix indexing
+and used with
+.ZN XDrawString16 ,
+each byte is used as a byte2 with a byte1 of zero.
+.LP
+Both functions use these GC components: 
+function, plane-mask, fill-style, font, subwindow-mode, clip-x-origin, 
+clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+and tile-stipple-y-origin.
+.LP
+.ZN XDrawString
+and
+.ZN XDrawString16
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.SH "SEE ALSO"
+XDrawImageString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XLoadFont(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XDrawText.man b/libX11/man/XDrawText.man
index e8a9094ea..c4cae4e8a 100644
--- a/libX11/man/XDrawText.man
+++ b/libX11/man/XDrawText.man
@@ -1,289 +1,224 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XDrawText __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XDrawText, XDrawText16, XTextItem, XTextItem16 \- draw polytext text and text drawing structures

-.SH SYNTAX

-.HP

-int XDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-int \fIx\fP\^, int \fIy\fP\^, XTextItem *\fIitems\fP\^, int \fInitems\fP\^); 

-.HP

-int XDrawText16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XTextItem16 *\fIitems\fP\^, int

-\fInitems\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIitems\fP 1i

-Specifies an array of text items.

-.IP \fInitems\fP 1i

-Specifies the number of text items in the array.

-.ds Xy , which are relative to the origin of the specified drawable \

-and define the origin of the first character

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XDrawText16

-function is similar to

-.ZN XDrawText 

-except that it uses 2-byte or 16-bit characters.

-Both functions allow complex spacing and font shifts between counted strings.

-.LP

-Each text item is processed in turn.

-A font member other than 

-.ZN None

-in an item causes the font to be stored in the GC

-and used for subsequent text.  

-A text element delta specifies an additional change

-in the position along the x axis before the string is drawn. 

-The delta is always added to the character origin

-and is not dependent on any characteristics of the font.

-Each character image, as defined by the font in the GC, is treated as an

-additional mask for a fill operation on the drawable.

-The drawable is modified only where the font character has a bit set to 1.

-If a text item generates a

-.ZN BadFont

-error, the previous text items may have been drawn.

-.LP

-For fonts defined with linear indexing rather than 2-byte matrix indexing,

-each 

-.ZN XChar2b

-structure is interpreted as a 16-bit number with byte1 as the 

-most significant byte.

-.LP

-Both functions use these GC components:

-function, plane-mask, fill-style, font, subwindow-mode, 

-clip-x-origin, clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-and tile-stipple-y-origin.

-.LP

-.ZN XDrawText

-and

-.ZN XDrawText16

-can generate

-.ZN BadDrawable ,

-.ZN BadFont ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH STRUCTURES

-The

-.ZN XTextItem

-and

-.ZN XTextItem16

-structures contain:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	char *chars;	/\&* pointer to string */

-	int nchars;	/\&* number of characters */

-	int delta;	/\&* delta between strings */

-	Font font;	/\&* Font to print it in, None don't change */

-} XTextItem;

-.De

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	XChar2b *chars;	/\&* pointer to two-byte characters */

-	int nchars;	/\&* number of characters */

-	int delta;	/\&* delta between strings */

-	Font font;	/\&* font to print it in, None don't change */

-} XTextItem16;

-.De

-.LP

-If the font member is not

-.ZN None ,

-the font is changed before printing and also is stored in the GC.

-If an error was generated during text drawing,

-the previous items may have been drawn.

-The baseline of the characters are drawn starting at the x and y

-coordinates that you pass in the text drawing functions.

-.LP

-For example, consider the background rectangle drawn by

-.ZN XDrawImageString .

-If you want the upper-left corner of the background rectangle

-to be at pixel coordinate (x,y), pass the (x,y + ascent)

-as the baseline origin coordinates to the text functions.

-The ascent is the font ascent, as given in the

-.ZN XFontStruct

-structure.

-If you want the lower-left corner of the background rectangle

-to be at pixel coordinate (x,y), pass the (x,y \- descent + 1)

-as the baseline origin coordinates to the text functions.

-The descent is the font descent, as given in the

-.ZN XFontStruct

-structure.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.SH "SEE ALSO"

-XDrawImageString(__libmansuffix__),

-XDrawString(__libmansuffix__),

-XLoadFont(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XDrawText __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XDrawText, XDrawText16, XTextItem, XTextItem16 \- draw polytext text and text drawing structures
+.SH SYNTAX
+.HP
+int XDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+int \fIx\fP\^, int \fIy\fP\^, XTextItem *\fIitems\fP\^, int \fInitems\fP\^); 
+.HP
+int XDrawText16\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XTextItem16 *\fIitems\fP\^, int
+\fInitems\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIitems\fP 1i
+Specifies an array of text items.
+.IP \fInitems\fP 1i
+Specifies the number of text items in the array.
+.ds Xy , which are relative to the origin of the specified drawable \
+and define the origin of the first character
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XDrawText16
+function is similar to
+.ZN XDrawText 
+except that it uses 2-byte or 16-bit characters.
+Both functions allow complex spacing and font shifts between counted strings.
+.LP
+Each text item is processed in turn.
+A font member other than 
+.ZN None
+in an item causes the font to be stored in the GC
+and used for subsequent text.  
+A text element delta specifies an additional change
+in the position along the x axis before the string is drawn. 
+The delta is always added to the character origin
+and is not dependent on any characteristics of the font.
+Each character image, as defined by the font in the GC, is treated as an
+additional mask for a fill operation on the drawable.
+The drawable is modified only where the font character has a bit set to 1.
+If a text item generates a
+.ZN BadFont
+error, the previous text items may have been drawn.
+.LP
+For fonts defined with linear indexing rather than 2-byte matrix indexing,
+each 
+.ZN XChar2b
+structure is interpreted as a 16-bit number with byte1 as the 
+most significant byte.
+.LP
+Both functions use these GC components:
+function, plane-mask, fill-style, font, subwindow-mode, 
+clip-x-origin, clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+and tile-stipple-y-origin.
+.LP
+.ZN XDrawText
+and
+.ZN XDrawText16
+can generate
+.ZN BadDrawable ,
+.ZN BadFont ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH STRUCTURES
+The
+.ZN XTextItem
+and
+.ZN XTextItem16
+structures contain:
+.LP
+.Ds 0
+typedef struct {
+        char *chars;    /\&* pointer to string */
+        int nchars;     /\&* number of characters */
+        int delta;      /\&* delta between strings */
+        Font font;      /\&* Font to print it in, None don't change */
+} XTextItem;
+.De
+.LP
+.Ds 0
+typedef struct {
+        XChar2b *chars; /\&* pointer to two-byte characters */
+        int nchars;     /\&* number of characters */
+        int delta;      /\&* delta between strings */
+        Font font;      /\&* font to print it in, None don't change */
+} XTextItem16;
+.De
+.LP
+If the font member is not
+.ZN None ,
+the font is changed before printing and also is stored in the GC.
+If an error was generated during text drawing,
+the previous items may have been drawn.
+The baseline of the characters are drawn starting at the x and y
+coordinates that you pass in the text drawing functions.
+.LP
+For example, consider the background rectangle drawn by
+.ZN XDrawImageString .
+If you want the upper-left corner of the background rectangle
+to be at pixel coordinate (x,y), pass the (x,y + ascent)
+as the baseline origin coordinates to the text functions.
+The ascent is the font ascent, as given in the
+.ZN XFontStruct
+structure.
+If you want the lower-left corner of the background rectangle
+to be at pixel coordinate (x,y), pass the (x,y \- descent + 1)
+as the baseline origin coordinates to the text functions.
+The descent is the font descent, as given in the
+.ZN XFontStruct
+structure.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.SH "SEE ALSO"
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XLoadFont(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XEmptyRegion.man b/libX11/man/XEmptyRegion.man
index dab972c23..b87687f9b 100644
--- a/libX11/man/XEmptyRegion.man
+++ b/libX11/man/XEmptyRegion.man
@@ -1,209 +1,148 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XEmptyRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XEmptyRegion, XEqualRegion, XPointInRegion, XRectInRegion \- determine if regions are empty or equal

-.SH SYNTAX

-.HP

-Bool XEmptyRegion\^(\^Region \fIr\fP\^); 

-.HP

-Bool XEqualRegion\^(\^Region \fIr1\fP\^, Region \fIr2\fP\^); 

-.HP

-Bool XPointInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^); 

-.HP

-int XRectInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned

-int \fIwidth\fP\^, unsigned int \fIheight\fP\^); 

-.SH ARGUMENTS

-.IP \fIr\fP 1i

-Specifies the region.

-.IP \fIr1\fP 1i

-.br

-.ns

-.IP \fIr2\fP 1i

-Specify the two regions.

-.ds Wh , which define the rectangle

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which define the point \

-or the coordinates of the upper-left corner of the rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XEmptyRegion

-function returns

-.ZN True

-if the region is empty.

-.LP

-The

-.ZN XEqualRegion

-function returns

-.ZN True

-if the two regions have the same offset, size, and shape.

-.LP

-The

-.ZN XPointInRegion

-function returns 

-.ZN True

-if the point (x, y) is contained in the region r.

-.LP

-The

-.ZN XRectInRegion

-function returns

-.ZN RectangleIn

-if the rectangle is entirely in the specified region,

-.ZN RectangleOut

-if the rectangle is entirely out of the specified region,

-and

-.ZN RectanglePart

-if the rectangle is partially in the specified region.

-.SH "SEE ALSO"

-XCreateRegion(__libmansuffix__),

-XIntersectRegion(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XEmptyRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XEmptyRegion, XEqualRegion, XPointInRegion, XRectInRegion \- determine if regions are empty or equal
+.SH SYNTAX
+.HP
+Bool XEmptyRegion\^(\^Region \fIr\fP\^); 
+.HP
+Bool XEqualRegion\^(\^Region \fIr1\fP\^, Region \fIr2\fP\^); 
+.HP
+Bool XPointInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
+.HP
+int XRectInRegion\^(\^Region \fIr\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned
+int \fIwidth\fP\^, unsigned int \fIheight\fP\^); 
+.SH ARGUMENTS
+.IP \fIr\fP 1i
+Specifies the region.
+.IP \fIr1\fP 1i
+.br
+.ns
+.IP \fIr2\fP 1i
+Specify the two regions.
+.ds Wh , which define the rectangle
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which define the point \
+or the coordinates of the upper-left corner of the rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XEmptyRegion
+function returns
+.ZN True
+if the region is empty.
+.LP
+The
+.ZN XEqualRegion
+function returns
+.ZN True
+if the two regions have the same offset, size, and shape.
+.LP
+The
+.ZN XPointInRegion
+function returns 
+.ZN True
+if the point (x, y) is contained in the region r.
+.LP
+The
+.ZN XRectInRegion
+function returns
+.ZN RectangleIn
+if the rectangle is entirely in the specified region,
+.ZN RectangleOut
+if the rectangle is entirely out of the specified region,
+and
+.ZN RectanglePart
+if the rectangle is partially in the specified region.
+.SH "SEE ALSO"
+XCreateRegion(__libmansuffix__),
+XIntersectRegion(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XErrorEvent.man b/libX11/man/XErrorEvent.man
index dde564fa8..66c07d0fb 100644
--- a/libX11/man/XErrorEvent.man
+++ b/libX11/man/XErrorEvent.man
@@ -1,203 +1,140 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XErrorEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XErrorEvent \- X error event structure

-.SH STRUCTURES

-The 

-.ZN XErrorEvent

-structure contains:

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	int type;

-	Display *display;	/\&* Display the event was read from */

-	unsigned long serial;		/\&* serial number of failed request */

-	unsigned char error_code;	/\&* error code of failed request */

-	unsigned char request_code;	/\&* Major op-code of failed request */

-	unsigned char minor_code;	/\&* Minor op-code of failed request */

-	XID resourceid;		/\&* resource id */

-} XErrorEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The serial member is the number of requests, starting from one, 

-sent over the network connection since it was opened. 

-It is the number that was the value of 

-.ZN NextRequest 

-immediately before the failing call was made.  

-The request_code member is a protocol request

-of the procedure that failed, as defined in 

-.hN X11/Xproto.h .

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XErrorEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XErrorEvent \- X error event structure
+.SH STRUCTURES
+The 
+.ZN XErrorEvent
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;
+        Display *display;       /\&* Display the event was read from */
+        unsigned long serial;           /\&* serial number of failed request */
+        unsigned char error_code;       /\&* error code of failed request */
+        unsigned char request_code;     /\&* Major op-code of failed request */
+        unsigned char minor_code;       /\&* Minor op-code of failed request */
+        XID resourceid;         /\&* resource id */
+} XErrorEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The serial member is the number of requests, starting from one, 
+sent over the network connection since it was opened. 
+It is the number that was the value of 
+.ZN NextRequest 
+immediately before the failing call was made.  
+The request_code member is a protocol request
+of the procedure that failed, as defined in 
+.hN X11/Xproto.h .
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XExposeEvent.man b/libX11/man/XExposeEvent.man
index 500786c02..7bf90cde0 100644
--- a/libX11/man/XExposeEvent.man
+++ b/libX11/man/XExposeEvent.man
@@ -1,232 +1,169 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XExposeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XExposeEvent \- Expose event structure

-.SH STRUCTURES

-The structure for

-.ZN Expose  

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* Expose */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	int x, y;

-	int width, height;

-	int count;	/\&* if nonzero, at least this many more */

-} XExposeEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the exposed (damaged) window.

-The x and y members are set to the coordinates relative to the window's origin

-and indicate the upper-left corner of the rectangle.

-The width and height members are set to the size (extent) of the rectangle.

-The count member is set to the number of

-.ZN Expose

-events that are to follow.

-If count is zero, no more

-.ZN Expose

-events follow for this window.

-However, if count is nonzero, at least that number of 

-.ZN Expose 

-events (and possibly more) follow for this window.

-Simple applications that do not want to optimize redisplay by distinguishing

-between subareas of its window can just ignore all

-.ZN Expose

-events with nonzero counts and perform full redisplays

-on events with zero counts.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XExposeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XExposeEvent \- Expose event structure
+.SH STRUCTURES
+The structure for
+.ZN Expose  
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* Expose */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        int x, y;
+        int width, height;
+        int count;      /\&* if nonzero, at least this many more */
+} XExposeEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the exposed (damaged) window.
+The x and y members are set to the coordinates relative to the window's origin
+and indicate the upper-left corner of the rectangle.
+The width and height members are set to the size (extent) of the rectangle.
+The count member is set to the number of
+.ZN Expose
+events that are to follow.
+If count is zero, no more
+.ZN Expose
+events follow for this window.
+However, if count is nonzero, at least that number of 
+.ZN Expose 
+events (and possibly more) follow for this window.
+Simple applications that do not want to optimize redisplay by distinguishing
+between subareas of its window can just ignore all
+.ZN Expose
+events with nonzero counts and perform full redisplays
+on events with zero counts.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XExtentsOfFontSet.man b/libX11/man/XExtentsOfFontSet.man
index 96c58faab..6200f6044 100644
--- a/libX11/man/XExtentsOfFontSet.man
+++ b/libX11/man/XExtentsOfFontSet.man
@@ -1,173 +1,112 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XExtentsOfFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XExtentsOfFontSet \- obtain the maximum extents structure for a font set

-.SH SYNTAX

-.HP

-XFontSetExtents *XExtentsOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 

-.SH ARGUMENTS

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.SH DESCRIPTION

-The

-.ZN XExtentsOfFontSet

-function returns an

-.ZN XFontSetExtents

-structure for the fonts used by the Xmb and Xwc layers

-for the given font set.

-.LP

-The 

-.ZN XFontSetExtents

-structure is owned by Xlib and should not be modified

-or freed by the client.

-It will be freed by a call to 

-.ZN XFreeFontSet

-with the associated 

-.ZN XFontSet .

-Until freed, its contents will not be modified by Xlib.

-.SH "SEE ALSO"

-XCreateFontSet(__libmansuffix__),

-XFontsOfFontSet(__libmansuffix__),

-XFontSetExtents(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XExtentsOfFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XExtentsOfFontSet \- obtain the maximum extents structure for a font set
+.SH SYNTAX
+.HP
+XFontSetExtents *XExtentsOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
+.SH ARGUMENTS
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.SH DESCRIPTION
+The
+.ZN XExtentsOfFontSet
+function returns an
+.ZN XFontSetExtents
+structure for the fonts used by the Xmb and Xwc layers
+for the given font set.
+.LP
+The 
+.ZN XFontSetExtents
+structure is owned by Xlib and should not be modified
+or freed by the client.
+It will be freed by a call to 
+.ZN XFreeFontSet
+with the associated 
+.ZN XFontSet .
+Until freed, its contents will not be modified by Xlib.
+.SH "SEE ALSO"
+XCreateFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFillRectangle.man b/libX11/man/XFillRectangle.man
index 70843f906..d2d5e56b4 100644
--- a/libX11/man/XFillRectangle.man
+++ b/libX11/man/XFillRectangle.man
@@ -1,394 +1,333 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFillRectangle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFillRectangle, XFillRectangles, XFillPolygon, XFillArc, XFillArcs \- fill rectangles, polygons, or arcs

-.SH SYNTAX

-.HP

-int XFillRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned

-int \fIheight\fP\^); 

-.HP

-int XFillRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XRectangle *\fIrectangles\fP\^, int \fInrectangles\fP\^); 

-.HP

-int XFillPolygon\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fIshape\fP\^,

-int \fImode\fP\^);

-.HP

-int XFillArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^, 

-int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int

-\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 

-.HP

-int XFillArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 

-.SH ARGUMENTS

-.IP \fIangle1\fP 1i

-Specifies the start of the arc relative to the three-o'clock position

-from the center, in units of degrees * 64.

-.IP \fIangle2\fP 1i

-Specifies the path and extent of the arc relative to the start of the

-arc, in units of degrees * 64.

-.IP \fIarcs\fP 1i

-Specifies an array of arcs.

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fImode\fP 1i

-Specifies the coordinate mode. 

-You can pass

-.ZN CoordModeOrigin

-or

-.ZN CoordModePrevious .

-.IP \fInarcs\fP 1i

-Specifies the number of arcs in the array.

-.IP \fInpoints\fP 1i

-Specifies the number of points in the array.

-.IP \fInrectangles\fP 1i

-Specifies the number of rectangles in the array.

-.IP \fIpoints\fP 1i

-Specifies an array of points.

-.IP \fIrectangles\fP 1i

-Specifies an array of rectangles.

-.IP \fIshape\fP 1i

-Specifies a shape that helps the server to improve performance.

-You can pass 

-.ZN Complex , 

-.ZN Convex , 

-or 

-.ZN Nonconvex .

-.ds Wh , which are the dimensions of the rectangle to be filled \

-or the major and minor axes of the arc

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which are relative to the origin of the drawable \

-and specify the upper-left corner of the rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XFillRectangle

-and

-.ZN XFillRectangles

-functions fill the specified rectangle or rectangles

-as if a four-point 

-.ZN FillPolygon

-protocol request were specified for each rectangle:

-.LP

-.Ds

-[x,y] [x+width,y] [x+width,y+height] [x,y+height]

-.De

-.LP

-Each function uses the x and y coordinates,

-width and height dimensions, and GC you specify.

-.LP

-.ZN XFillRectangles

-fills the rectangles in the order listed in the array.  

-For any given rectangle,

-.ZN XFillRectangle

-and

-.ZN XFillRectangles

-do not draw a pixel more than once.  

-If rectangles intersect, the intersecting pixels are

-drawn multiple times.

-.LP

-Both functions use these GC components: 

-function, plane-mask, fill-style, subwindow-mode, 

-clip-x-origin, clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-and tile-stipple-y-origin.

-.LP

-.ZN XFillRectangle

-and

-.ZN XFillRectangles

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.LP

-.ZN XFillPolygon 

-fills the region closed by the specified path.

-The path is closed

-automatically if the last point in the list does not coincide with the

-first point.

-.ZN XFillPolygon

-does not draw a pixel of the region more than once.

-.ZN CoordModeOrigin

-treats all coordinates as relative to the origin,

-and

-.ZN CoordModePrevious

-treats all coordinates after the first as relative to the previous point.

-.LP

-Depending on the specified shape, the following occurs: 

-.IP \(bu 5

-If shape is

-.ZN Complex , 

-the path may self-intersect. 

-Note that contiguous coincident points in the path are not treated 

-as self-intersection.

-.IP \(bu 5

-If shape is

-.ZN Convex , 

-for every pair of points inside the polygon,

-the line segment connecting them does not intersect the path.

-If known by the client,

-specifying 

-.ZN Convex 

-can improve performance.  

-If you specify

-.ZN Convex 

-for a path that is not convex, 

-the graphics results are undefined.

-.IP \(bu 5

-If shape is

-.ZN Nonconvex , 

-the path does not self-intersect, but the shape is not

-wholly convex. 

-If known by the client, 

-specifying 

-.ZN Nonconvex 

-instead of

-.ZN Complex 

-may improve performance.  

-If you specify

-.ZN Nonconvex 

-for a self-intersecting path, the graphics results are undefined.

-.LP

-The fill-rule of the GC controls the filling behavior of 

-self-intersecting polygons.

-.LP

-This function uses these GC components: 

-function, plane-mask, fill-style, fill-rule, subwindow-mode, clip-x-origin, 

-clip-y-origin, and clip-mask.

-It also uses these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-and tile-stipple-y-origin.

-.LP

-.ZN XFillPolygon

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.LP

-For each arc, 

-.ZN XFillArc

-or

-.ZN XFillArcs

-fills the region closed by the infinitely thin path

-described by the specified arc and, depending on the 

-arc-mode specified in the GC, one or two line segments. 

-For 

-.ZN ArcChord , 

-the single line segment joining the endpoints of the arc is used.  

-For 

-.ZN ArcPieSlice ,

-the two line segments joining the endpoints of the arc with the center

-point are used.  

-.ZN XFillArcs

-fills the arcs in the order listed in the array.  

-For any given arc,  

-.ZN XFillArc

-and

-.ZN XFillArcs

-do not draw a pixel more than once.  

-If regions intersect, 

-the intersecting pixels are drawn multiple times.

-.LP

-Both functions use these GC components: 

-function, plane-mask, fill-style, arc-mode, subwindow-mode, clip-x-origin, 

-clip-y-origin, and clip-mask.

-They also use these GC mode-dependent components: 

-foreground, background, tile, stipple, tile-stipple-x-origin, 

-and tile-stipple-y-origin.

-.LP

-.ZN XFillArc

-and

-.ZN XFillArcs

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-and

-.ZN BadMatch 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XDrawArc(__libmansuffix__),

-XDrawPoint(__libmansuffix__),

-XDrawRectangle(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFillRectangle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFillRectangle, XFillRectangles, XFillPolygon, XFillArc, XFillArcs \- fill rectangles, polygons, or arcs
+.SH SYNTAX
+.HP
+int XFillRectangle\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned
+int \fIheight\fP\^); 
+.HP
+int XFillRectangles\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XRectangle *\fIrectangles\fP\^, int \fInrectangles\fP\^); 
+.HP
+int XFillPolygon\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, XPoint *\fIpoints\fP\^, int \fInpoints\fP\^, int \fIshape\fP\^,
+int \fImode\fP\^);
+.HP
+int XFillArc\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^, 
+int \fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, int \fIangle1\fP\^, int \fIangle2\fP\^); 
+.HP
+int XFillArcs\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XArc *\fIarcs\fP\^, int \fInarcs\fP\^); 
+.SH ARGUMENTS
+.IP \fIangle1\fP 1i
+Specifies the start of the arc relative to the three-o'clock position
+from the center, in units of degrees * 64.
+.IP \fIangle2\fP 1i
+Specifies the path and extent of the arc relative to the start of the
+arc, in units of degrees * 64.
+.IP \fIarcs\fP 1i
+Specifies an array of arcs.
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fImode\fP 1i
+Specifies the coordinate mode. 
+You can pass
+.ZN CoordModeOrigin
+or
+.ZN CoordModePrevious .
+.IP \fInarcs\fP 1i
+Specifies the number of arcs in the array.
+.IP \fInpoints\fP 1i
+Specifies the number of points in the array.
+.IP \fInrectangles\fP 1i
+Specifies the number of rectangles in the array.
+.IP \fIpoints\fP 1i
+Specifies an array of points.
+.IP \fIrectangles\fP 1i
+Specifies an array of rectangles.
+.IP \fIshape\fP 1i
+Specifies a shape that helps the server to improve performance.
+You can pass 
+.ZN Complex , 
+.ZN Convex , 
+or 
+.ZN Nonconvex .
+.ds Wh , which are the dimensions of the rectangle to be filled \
+or the major and minor axes of the arc
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which are relative to the origin of the drawable \
+and specify the upper-left corner of the rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XFillRectangle
+and
+.ZN XFillRectangles
+functions fill the specified rectangle or rectangles
+as if a four-point 
+.ZN FillPolygon
+protocol request were specified for each rectangle:
+.LP
+.Ds
+[x,y] [x+width,y] [x+width,y+height] [x,y+height]
+.De
+.LP
+Each function uses the x and y coordinates,
+width and height dimensions, and GC you specify.
+.LP
+.ZN XFillRectangles
+fills the rectangles in the order listed in the array.  
+For any given rectangle,
+.ZN XFillRectangle
+and
+.ZN XFillRectangles
+do not draw a pixel more than once.  
+If rectangles intersect, the intersecting pixels are
+drawn multiple times.
+.LP
+Both functions use these GC components: 
+function, plane-mask, fill-style, subwindow-mode, 
+clip-x-origin, clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+and tile-stipple-y-origin.
+.LP
+.ZN XFillRectangle
+and
+.ZN XFillRectangles
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.LP
+.ZN XFillPolygon 
+fills the region closed by the specified path.
+The path is closed
+automatically if the last point in the list does not coincide with the
+first point.
+.ZN XFillPolygon
+does not draw a pixel of the region more than once.
+.ZN CoordModeOrigin
+treats all coordinates as relative to the origin,
+and
+.ZN CoordModePrevious
+treats all coordinates after the first as relative to the previous point.
+.LP
+Depending on the specified shape, the following occurs: 
+.IP \(bu 5
+If shape is
+.ZN Complex , 
+the path may self-intersect. 
+Note that contiguous coincident points in the path are not treated 
+as self-intersection.
+.IP \(bu 5
+If shape is
+.ZN Convex , 
+for every pair of points inside the polygon,
+the line segment connecting them does not intersect the path.
+If known by the client,
+specifying 
+.ZN Convex 
+can improve performance.  
+If you specify
+.ZN Convex 
+for a path that is not convex, 
+the graphics results are undefined.
+.IP \(bu 5
+If shape is
+.ZN Nonconvex , 
+the path does not self-intersect, but the shape is not
+wholly convex. 
+If known by the client, 
+specifying 
+.ZN Nonconvex 
+instead of
+.ZN Complex 
+may improve performance.  
+If you specify
+.ZN Nonconvex 
+for a self-intersecting path, the graphics results are undefined.
+.LP
+The fill-rule of the GC controls the filling behavior of 
+self-intersecting polygons.
+.LP
+This function uses these GC components: 
+function, plane-mask, fill-style, fill-rule, subwindow-mode, clip-x-origin, 
+clip-y-origin, and clip-mask.
+It also uses these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+and tile-stipple-y-origin.
+.LP
+.ZN XFillPolygon
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.LP
+For each arc, 
+.ZN XFillArc
+or
+.ZN XFillArcs
+fills the region closed by the infinitely thin path
+described by the specified arc and, depending on the 
+arc-mode specified in the GC, one or two line segments. 
+For 
+.ZN ArcChord , 
+the single line segment joining the endpoints of the arc is used.  
+For 
+.ZN ArcPieSlice ,
+the two line segments joining the endpoints of the arc with the center
+point are used.  
+.ZN XFillArcs
+fills the arcs in the order listed in the array.  
+For any given arc,  
+.ZN XFillArc
+and
+.ZN XFillArcs
+do not draw a pixel more than once.  
+If regions intersect, 
+the intersecting pixels are drawn multiple times.
+.LP
+Both functions use these GC components: 
+function, plane-mask, fill-style, arc-mode, subwindow-mode, clip-x-origin, 
+clip-y-origin, and clip-mask.
+They also use these GC mode-dependent components: 
+foreground, background, tile, stipple, tile-stipple-x-origin, 
+and tile-stipple-y-origin.
+.LP
+.ZN XFillArc
+and
+.ZN XFillArcs
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+and
+.ZN BadMatch 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XDrawArc(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFilterEvent.man b/libX11/man/XFilterEvent.man
index 62c59534d..70154fa03 100644
--- a/libX11/man/XFilterEvent.man
+++ b/libX11/man/XFilterEvent.man
@@ -1,186 +1,125 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFilterEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFilterEvent \- filter X events for an input method

-.SH SYNTAX

-.HP

-Bool XFilterEvent\^(\^XEvent *\fIevent\fP\^, Window \fIw\fP\^); 

-.SH ARGUMENTS

-.ds Ev event to filter

-.IP \fIevent\fP 1i

-Specifies the \*(Ev.

-.ds Wi for which the filter is to be applied

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-If the window argument is

-.ZN None ,

-.ZN XFilterEvent 

-applies the filter to the window specified in the

-.ZN XEvent

-structure.

-The window argument is provided so that layers above Xlib

-that do event redirection can indicate to which window an event

-has been redirected.

-.LP

-If

-.ZN XFilterEvent

-returns

-.ZN True ,

-then some input method has filtered the event,

-and the client should discard the event.

-If

-.ZN XFilterEvent

-returns

-.ZN False ,

-then the client should continue processing the event.

-.LP

-If a grab has occurred in the client and

-.ZN XFilterEvent

-returns

-.ZN True ,

-the client should ungrab the keyboard.

-.SH "SEE ALSO"

-XNextEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFilterEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFilterEvent \- filter X events for an input method
+.SH SYNTAX
+.HP
+Bool XFilterEvent\^(\^XEvent *\fIevent\fP\^, Window \fIw\fP\^); 
+.SH ARGUMENTS
+.ds Ev event to filter
+.IP \fIevent\fP 1i
+Specifies the \*(Ev.
+.ds Wi for which the filter is to be applied
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+If the window argument is
+.ZN None ,
+.ZN XFilterEvent 
+applies the filter to the window specified in the
+.ZN XEvent
+structure.
+The window argument is provided so that layers above Xlib
+that do event redirection can indicate to which window an event
+has been redirected.
+.LP
+If
+.ZN XFilterEvent
+returns
+.ZN True ,
+then some input method has filtered the event,
+and the client should discard the event.
+If
+.ZN XFilterEvent
+returns
+.ZN False ,
+then the client should continue processing the event.
+.LP
+If a grab has occurred in the client and
+.ZN XFilterEvent
+returns
+.ZN True ,
+the client should ungrab the keyboard.
+.SH "SEE ALSO"
+XNextEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFlush.man b/libX11/man/XFlush.man
index 04e64c260..9e1f21e53 100644
--- a/libX11/man/XFlush.man
+++ b/libX11/man/XFlush.man
@@ -1,264 +1,203 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFlush __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFlush, XSync, XEventsQueued, XPending \- handle output buffer or event queue

-.SH SYNTAX

-.HP

-int XFlush\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int XSync\^(\^Display *\fIdisplay\fP\^, Bool \fIdiscard\fP\^); 

-.HP

-int XEventsQueued\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 

-.HP

-int XPending\^(\^Display *\fIdisplay\fP\^); 

-.SH ARGUMENTS

-.IP \fIdiscard\fP 1i

-Specifies a Boolean value that indicates whether 

-.ZN XSync

-discards all events on the event queue.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fImode\fP 1i

-Specifies the mode.

-You can pass

-.ZN QueuedAlready ,

-.ZN QueuedAfterFlush ,

-or

-.ZN QueuedAfterReading .

-.SH DESCRIPTION

-The

-.ZN XFlush

-function

-flushes the output buffer.

-Most client applications need not use this function because the output

-buffer is automatically flushed as needed by calls to

-.ZN XPending ,

-.ZN XNextEvent ,

-and

-.ZN XWindowEvent .

-.IN "XPending"

-.IN "XNextEvent"

-.IN "XWindowEvent"

-Events generated by the server may be enqueued into the library's event queue.

-.LP

-The

-.ZN XSync

-function

-flushes the output buffer and then waits until all requests have been received

-and processed by the X server.

-Any errors generated must be handled by the error handler.

-For each protocol error received by Xlib,

-.ZN XSync

-calls the client application's error handling routine (see section 11.8.2).

-Any events generated by the server are enqueued into the library's 

-event queue.

-.LP

-Finally, if you passed 

-.ZN False ,

-.ZN XSync

-does not discard the events in the queue.

-If you passed 

-.ZN True ,

-.ZN XSync 

-discards all events in the queue,

-including those events that were on the queue before

-.ZN XSync

-was called.

-Client applications seldom need to call

-.ZN XSync .

-.LP

-If mode is 

-.ZN QueuedAlready ,

-.ZN XEventsQueued 

-returns the number of events

-already in the event queue (and never performs a system call).

-If mode is 

-.ZN QueuedAfterFlush , 

-.ZN XEventsQueued

-returns the number of events already in the queue if the number is nonzero.

-If there are no events in the queue, 

-.ZN XEventsQueued

-flushes the output buffer, 

-attempts to read more events out of the application's connection,

-and returns the number read.

-If mode is 

-.ZN QueuedAfterReading , 

-.ZN XEventsQueued

-returns the number of events already in the queue if the number is nonzero. 

-If there are no events in the queue, 

-.ZN XEventsQueued

-attempts to read more events out of the application's connection 

-without flushing the output buffer and returns the number read.

-.LP

-.ZN XEventsQueued

-always returns immediately without I/O if there are events already in the

-queue.

-.ZN XEventsQueued

-with mode 

-.ZN QueuedAfterFlush

-is identical in behavior to

-.ZN XPending .

-.ZN XEventsQueued

-with mode

-.ZN QueuedAlready

-is identical to the

-.ZN XQLength

-function.

-.LP

-The

-.ZN XPending

-function returns the number of events that have been received from the

-X server but have not been removed from the event queue.

-.ZN XPending

-is identical to

-.ZN XEventsQueued

-with the mode

-.ZN QueuedAfterFlush

-specified.

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-XIfEvent(__libmansuffix__),

-XNextEvent(__libmansuffix__),

-XPutBackEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFlush __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFlush, XSync, XEventsQueued, XPending \- handle output buffer or event queue
+.SH SYNTAX
+.HP
+int XFlush\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XSync\^(\^Display *\fIdisplay\fP\^, Bool \fIdiscard\fP\^); 
+.HP
+int XEventsQueued\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 
+.HP
+int XPending\^(\^Display *\fIdisplay\fP\^); 
+.SH ARGUMENTS
+.IP \fIdiscard\fP 1i
+Specifies a Boolean value that indicates whether 
+.ZN XSync
+discards all events on the event queue.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fImode\fP 1i
+Specifies the mode.
+You can pass
+.ZN QueuedAlready ,
+.ZN QueuedAfterFlush ,
+or
+.ZN QueuedAfterReading .
+.SH DESCRIPTION
+The
+.ZN XFlush
+function
+flushes the output buffer.
+Most client applications need not use this function because the output
+buffer is automatically flushed as needed by calls to
+.ZN XPending ,
+.ZN XNextEvent ,
+and
+.ZN XWindowEvent .
+.IN "XPending"
+.IN "XNextEvent"
+.IN "XWindowEvent"
+Events generated by the server may be enqueued into the library's event queue.
+.LP
+The
+.ZN XSync
+function
+flushes the output buffer and then waits until all requests have been received
+and processed by the X server.
+Any errors generated must be handled by the error handler.
+For each protocol error received by Xlib,
+.ZN XSync
+calls the client application's error handling routine (see section 11.8.2).
+Any events generated by the server are enqueued into the library's 
+event queue.
+.LP
+Finally, if you passed 
+.ZN False ,
+.ZN XSync
+does not discard the events in the queue.
+If you passed 
+.ZN True ,
+.ZN XSync 
+discards all events in the queue,
+including those events that were on the queue before
+.ZN XSync
+was called.
+Client applications seldom need to call
+.ZN XSync .
+.LP
+If mode is 
+.ZN QueuedAlready ,
+.ZN XEventsQueued 
+returns the number of events
+already in the event queue (and never performs a system call).
+If mode is 
+.ZN QueuedAfterFlush , 
+.ZN XEventsQueued
+returns the number of events already in the queue if the number is nonzero.
+If there are no events in the queue, 
+.ZN XEventsQueued
+flushes the output buffer, 
+attempts to read more events out of the application's connection,
+and returns the number read.
+If mode is 
+.ZN QueuedAfterReading , 
+.ZN XEventsQueued
+returns the number of events already in the queue if the number is nonzero. 
+If there are no events in the queue, 
+.ZN XEventsQueued
+attempts to read more events out of the application's connection 
+without flushing the output buffer and returns the number read.
+.LP
+.ZN XEventsQueued
+always returns immediately without I/O if there are events already in the
+queue.
+.ZN XEventsQueued
+with mode 
+.ZN QueuedAfterFlush
+is identical in behavior to
+.ZN XPending .
+.ZN XEventsQueued
+with mode
+.ZN QueuedAlready
+is identical to the
+.ZN XQLength
+function.
+.LP
+The
+.ZN XPending
+function returns the number of events that have been received from the
+X server but have not been removed from the event queue.
+.ZN XPending
+is identical to
+.ZN XEventsQueued
+with the mode
+.ZN QueuedAfterFlush
+specified.
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFocusChangeEvent.man b/libX11/man/XFocusChangeEvent.man
index 8a6349b93..0dfaee5e3 100644
--- a/libX11/man/XFocusChangeEvent.man
+++ b/libX11/man/XFocusChangeEvent.man
@@ -1,266 +1,203 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFocusChangeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFocusChangeEvent \- FocusIn and FocusOut event structure

-.SH STRUCTURES

-The structure for

-.ZN FocusIn  

-and

-.ZN FocusOut

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* FocusIn or FocusOut */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* window of event */

-	int mode;	/\&* NotifyNormal, NotifyGrab, NotifyUngrab */

-	int detail;

-		/\&*

-	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 

-	 	* NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,

-	 	* NotifyPointerRoot, NotifyDetailNone 

-	 	*/

-} XFocusChangeEvent;

-typedef XFocusChangeEvent XFocusInEvent;

-typedef XFocusChangeEvent XFocusOutEvent;

-.De

-.LP

-When you receive these events,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window on which the

-.ZN FocusIn

-or

-.ZN FocusOut

-event was generated.

-This is the window used by the X server to report the event. 

-The mode member is set to indicate whether the focus events 

-are normal focus events, 

-focus events while grabbed,

-focus events

-when a grab activates, or focus events when a grab deactivates.

-The X server can set the mode member to 

-.ZN NotifyNormal ,

-.ZN NotifyWhileGrabbed ,

-.ZN NotifyGrab ,

-or

-.ZN NotifyUngrab .

-.LP

-All 

-.ZN FocusOut

-events caused by a window unmap are generated after any

-.ZN UnmapNotify

-event; however, the X protocol does not constrain the ordering of 

-.ZN FocusOut

-events with respect to

-generated 

-.ZN EnterNotify ,

-.ZN LeaveNotify ,

-.ZN VisibilityNotify ,

-and

-.ZN Expose

-events.

-.LP

-Depending on the event mode,

-the detail member is set to indicate the notify detail and can be

-.ZN NotifyAncestor ,

-.ZN NotifyVirtual ,

-.ZN NotifyInferior ,

-.ZN NotifyNonlinear ,

-.ZN NotifyNonlinearVirtual ,

-.ZN NotifyPointer ,

-.ZN NotifyPointerRoot ,

-or

-.ZN NotifyDetailNone .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFocusChangeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFocusChangeEvent \- FocusIn and FocusOut event structure
+.SH STRUCTURES
+The structure for
+.ZN FocusIn  
+and
+.ZN FocusOut
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* FocusIn or FocusOut */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* window of event */
+        int mode;       /\&* NotifyNormal, NotifyGrab, NotifyUngrab */
+        int detail;
+                /\&*
+                * NotifyAncestor, NotifyVirtual, NotifyInferior, 
+                * NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
+                * NotifyPointerRoot, NotifyDetailNone 
+                */
+} XFocusChangeEvent;
+typedef XFocusChangeEvent XFocusInEvent;
+typedef XFocusChangeEvent XFocusOutEvent;
+.De
+.LP
+When you receive these events,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window on which the
+.ZN FocusIn
+or
+.ZN FocusOut
+event was generated.
+This is the window used by the X server to report the event. 
+The mode member is set to indicate whether the focus events 
+are normal focus events, 
+focus events while grabbed,
+focus events
+when a grab activates, or focus events when a grab deactivates.
+The X server can set the mode member to 
+.ZN NotifyNormal ,
+.ZN NotifyWhileGrabbed ,
+.ZN NotifyGrab ,
+or
+.ZN NotifyUngrab .
+.LP
+All 
+.ZN FocusOut
+events caused by a window unmap are generated after any
+.ZN UnmapNotify
+event; however, the X protocol does not constrain the ordering of 
+.ZN FocusOut
+events with respect to
+generated 
+.ZN EnterNotify ,
+.ZN LeaveNotify ,
+.ZN VisibilityNotify ,
+and
+.ZN Expose
+events.
+.LP
+Depending on the event mode,
+the detail member is set to indicate the notify detail and can be
+.ZN NotifyAncestor ,
+.ZN NotifyVirtual ,
+.ZN NotifyInferior ,
+.ZN NotifyNonlinear ,
+.ZN NotifyNonlinearVirtual ,
+.ZN NotifyPointer ,
+.ZN NotifyPointerRoot ,
+or
+.ZN NotifyDetailNone .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFontSetExtents.man b/libX11/man/XFontSetExtents.man
index 2786287e6..d78db7dc9 100644
--- a/libX11/man/XFontSetExtents.man
+++ b/libX11/man/XFontSetExtents.man
@@ -1,193 +1,130 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFontSetExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFontSetExtents \- XFontSetExtents structure

-.SH STRUCTURES

-The

-.ZN XFontSetExtents

-structure contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	XRectangle max_ink_extent;	/\&* over all drawable characters */

-	XRectangle max_logical_extent;	/\&* over all drawable characters */

-} XFontSetExtents;

-.De

-.LP

-The 

-.ZN XRectangle

-structures used to return font set metrics are the usual Xlib screen-oriented 

-rectangles

-with x, y giving the upper left corner, and width and height always positive.

-.LP

-The max_ink_extent member gives the maximum extent, over all drawable characters, of

-the rectangles that bound the character glyph image drawn in the

-foreground color, relative to a constant origin.

-See 

-.ZN XmbTextExtents

-and

-.ZN XwcTextExtents

-for detailed semantics.

-.LP

-The max_logical_extent member gives the maximum extent,

-over all drawable characters, of the rectangles 

-that specify minimum spacing to other graphical features,

-relative to a constant origin.

-Other graphical features drawn by the client, for example,

-a border surrounding the text, should not intersect this rectangle.

-The max_logical_extent member should be used to compute minimum 

-interline spacing and the minimum area that must be allowed

-in a text field to draw a given number of arbitrary characters.

-.LP

-Due to context-dependent rendering,

-appending a given character to a string may change 

-the string's extent by an amount other than that character's

-individual extent.

-.SH "SEE ALSO"

-XCreateFontSet(__libmansuffix__),

-XExtentsOfFontSet(__libmansuffix__),

-XFontsOfFontSet(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFontSetExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFontSetExtents \- XFontSetExtents structure
+.SH STRUCTURES
+The
+.ZN XFontSetExtents
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        XRectangle max_ink_extent;      /\&* over all drawable characters */
+        XRectangle max_logical_extent;  /\&* over all drawable characters */
+} XFontSetExtents;
+.De
+.LP
+The 
+.ZN XRectangle
+structures used to return font set metrics are the usual Xlib screen-oriented 
+rectangles
+with x, y giving the upper left corner, and width and height always positive.
+.LP
+The max_ink_extent member gives the maximum extent, over all drawable characters, of
+the rectangles that bound the character glyph image drawn in the
+foreground color, relative to a constant origin.
+See 
+.ZN XmbTextExtents
+and
+.ZN XwcTextExtents
+for detailed semantics.
+.LP
+The max_logical_extent member gives the maximum extent,
+over all drawable characters, of the rectangles 
+that specify minimum spacing to other graphical features,
+relative to a constant origin.
+Other graphical features drawn by the client, for example,
+a border surrounding the text, should not intersect this rectangle.
+The max_logical_extent member should be used to compute minimum 
+interline spacing and the minimum area that must be allowed
+in a text field to draw a given number of arbitrary characters.
+.LP
+Due to context-dependent rendering,
+appending a given character to a string may change 
+the string's extent by an amount other than that character's
+individual extent.
+.SH "SEE ALSO"
+XCreateFontSet(__libmansuffix__),
+XExtentsOfFontSet(__libmansuffix__),
+XFontsOfFontSet(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFontsOfFontSet.man b/libX11/man/XFontsOfFontSet.man
index 4a6f80ba6..845599dca 100644
--- a/libX11/man/XFontsOfFontSet.man
+++ b/libX11/man/XFontsOfFontSet.man
@@ -1,288 +1,227 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFontsOfFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFontsOfFontSet, XBaseFontNameListOfFontSet, XLocaleOfFontSet, XContextDependentDrawing, XContextualDrawing, XDirectionalDependentDrawing \- obtain fontset information

-.SH SYNTAX

-.HP

-int XFontsOfFontSet\^(\^XFontSet \fIfont_set\fP\^, XFontStruct

-***\fIfont_struct_list_return\fP\^, char ***\fIfont_name_list_return\fP\^); 

-.HP

-char *XBaseFontNameListOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 

-.HP

-char *XLocaleOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 

-.HP

-Bool XContextDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 

-.HP

-Bool XContextualDrawing\^(\^XFontSet \fIfont_set\fP\^); 

-.HP

-Bool XDirectionalDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 

-.SH ARGUMENTS

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fIfont_name_list_return\fP 1i

-Returns the list of font names.

-.IP \fIfont_struct_list_return\fP 1i

-Returns the list of font structs.

-.SH DESCRIPTION

-The

-.ZN XFontsOfFontSet

-function returns a list of one or more 

-.ZN XFontStructs

-and font names for the fonts used by the Xmb and Xwc layers

-for the given font set.

-A list of pointers to the

-.ZN XFontStruct

-structures is returned to font_struct_list_return.

-A list of pointers to null-terminated, fully specified font name strings

-in the locale of the font set is returned to font_name_list_return.

-The font_name_list order corresponds to the font_struct_list order.

-The number of

-.ZN XFontStruct

-structures and font names is returned as the value of the function.

-.LP

-Because it is not guaranteed that a given character will be imaged using a

-single font glyph,

-there is no provision for mapping a character or default string 

-to the font properties, font ID, or direction hint for the font 

-for the character.

-The client may access the 

-.ZN XFontStruct

-list to obtain these values for all the fonts currently in use.

-.LP

-Xlib does not guarantee that fonts are loaded from the server

-at the creation of an 

-.ZN XFontSet .

-Xlib may choose to cache font data, loading it only as needed to draw text 

-or compute text dimensions.

-Therefore, existence of the per_char metrics in the 

-.ZN XFontStruct

-structures in the

-.ZN XFontStructSet

-is undefined.

-Also, note that all properties in the 

-.ZN XFontStruct

-structures are in the STRING encoding.

-.LP

-The 

-.ZN XFontStruct

-and font name lists are owned by Xlib 

-and should not be modified or freed by the client.

-They will be freed by a call to

-.ZN XFreeFontSet

-with the associated

-.ZN XFontSet .

-Until freed, their contents will not be modified by Xlib.

-.LP

-The

-.ZN XBaseFontNameListOfFontSet

-function returns the original base font name list supplied

-by the client when the 

-.ZN XFontSet

-was created.

-A null-terminated string containing a list of

-comma-separated font names is returned

-as the value of the function.

-White space may appear immediately on either side of separating commas.

-.LP

-If 

-.ZN XCreateFontSet

-obtained an XLFD name from the font properties for the font specified

-by a non-XLFD base name, the

-.ZN XBaseFontNameListOfFontSet

-function will return the XLFD name instead of the non-XLFD base name.

-.LP

-The base font name list is owned by Xlib and should not be modified or

-freed by the client.

-It will be freed by a call to 

-.ZN XFreeFontSet

-with the associated 

-.ZN XFontSet .

-Until freed, its contents will not be modified by Xlib.

-.LP

-The

-.ZN XLocaleOfFontSet

-function

-returns the name of the locale bound to the specified

-.ZN XFontSet ,

-as a null-terminated string.

-.LP

-The returned locale name string is owned by Xlib

-and should not be modified or freed by the client.

-It may be freed by a call to

-.ZN XFreeFontSet

-with the associated 

-.ZN XFontSet .

-Until freed, it will not be modified by Xlib.

-.LP

-The

-.ZN XContextDependentDrawing

-function returns

-.ZN True

-if the drawing functions implement implicit text directionality or

-if text drawn with the font_set might include context-dependent drawing;

-otherwise, it returns

-.ZN False .

-.LP

-The

-.ZN XContextualDrawing

-function returns

-.ZN True

-if text drawn with the font set might include context-dependent drawing;

-otherwise, it returns

-.ZN False .

-.LP

-The

-.ZN XDirectionalDependentDrawing

-function returns

-.ZN True

-if the drawing functions implement implicit text directionality;

-otherwise, it returns

-.ZN False .

-.SH "SEE ALSO"

-XCreateFontSet(__libmansuffix__),

-XCreateOM(__libmansuffix__),

-XCreateOC(__libmansuffix__),

-XExtentsOfFontSet(__libmansuffix__),

-XFontSetExtents(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFontsOfFontSet __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFontsOfFontSet, XBaseFontNameListOfFontSet, XLocaleOfFontSet, XContextDependentDrawing, XContextualDrawing, XDirectionalDependentDrawing \- obtain fontset information
+.SH SYNTAX
+.HP
+int XFontsOfFontSet\^(\^XFontSet \fIfont_set\fP\^, XFontStruct
+***\fIfont_struct_list_return\fP\^, char ***\fIfont_name_list_return\fP\^); 
+.HP
+char *XBaseFontNameListOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+char *XLocaleOfFontSet\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XContextDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XContextualDrawing\^(\^XFontSet \fIfont_set\fP\^); 
+.HP
+Bool XDirectionalDependentDrawing\^(\^XFontSet \fIfont_set\fP\^); 
+.SH ARGUMENTS
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fIfont_name_list_return\fP 1i
+Returns the list of font names.
+.IP \fIfont_struct_list_return\fP 1i
+Returns the list of font structs.
+.SH DESCRIPTION
+The
+.ZN XFontsOfFontSet
+function returns a list of one or more 
+.ZN XFontStructs
+and font names for the fonts used by the Xmb and Xwc layers
+for the given font set.
+A list of pointers to the
+.ZN XFontStruct
+structures is returned to font_struct_list_return.
+A list of pointers to null-terminated, fully specified font name strings
+in the locale of the font set is returned to font_name_list_return.
+The font_name_list order corresponds to the font_struct_list order.
+The number of
+.ZN XFontStruct
+structures and font names is returned as the value of the function.
+.LP
+Because it is not guaranteed that a given character will be imaged using a
+single font glyph,
+there is no provision for mapping a character or default string 
+to the font properties, font ID, or direction hint for the font 
+for the character.
+The client may access the 
+.ZN XFontStruct
+list to obtain these values for all the fonts currently in use.
+.LP
+Xlib does not guarantee that fonts are loaded from the server
+at the creation of an 
+.ZN XFontSet .
+Xlib may choose to cache font data, loading it only as needed to draw text 
+or compute text dimensions.
+Therefore, existence of the per_char metrics in the 
+.ZN XFontStruct
+structures in the
+.ZN XFontStructSet
+is undefined.
+Also, note that all properties in the 
+.ZN XFontStruct
+structures are in the STRING encoding.
+.LP
+The 
+.ZN XFontStruct
+and font name lists are owned by Xlib 
+and should not be modified or freed by the client.
+They will be freed by a call to
+.ZN XFreeFontSet
+with the associated
+.ZN XFontSet .
+Until freed, their contents will not be modified by Xlib.
+.LP
+The
+.ZN XBaseFontNameListOfFontSet
+function returns the original base font name list supplied
+by the client when the 
+.ZN XFontSet
+was created.
+A null-terminated string containing a list of
+comma-separated font names is returned
+as the value of the function.
+White space may appear immediately on either side of separating commas.
+.LP
+If 
+.ZN XCreateFontSet
+obtained an XLFD name from the font properties for the font specified
+by a non-XLFD base name, the
+.ZN XBaseFontNameListOfFontSet
+function will return the XLFD name instead of the non-XLFD base name.
+.LP
+The base font name list is owned by Xlib and should not be modified or
+freed by the client.
+It will be freed by a call to 
+.ZN XFreeFontSet
+with the associated 
+.ZN XFontSet .
+Until freed, its contents will not be modified by Xlib.
+.LP
+The
+.ZN XLocaleOfFontSet
+function
+returns the name of the locale bound to the specified
+.ZN XFontSet ,
+as a null-terminated string.
+.LP
+The returned locale name string is owned by Xlib
+and should not be modified or freed by the client.
+It may be freed by a call to
+.ZN XFreeFontSet
+with the associated 
+.ZN XFontSet .
+Until freed, it will not be modified by Xlib.
+.LP
+The
+.ZN XContextDependentDrawing
+function returns
+.ZN True
+if the drawing functions implement implicit text directionality or
+if text drawn with the font_set might include context-dependent drawing;
+otherwise, it returns
+.ZN False .
+.LP
+The
+.ZN XContextualDrawing
+function returns
+.ZN True
+if text drawn with the font set might include context-dependent drawing;
+otherwise, it returns
+.ZN False .
+.LP
+The
+.ZN XDirectionalDependentDrawing
+function returns
+.ZN True
+if the drawing functions implement implicit text directionality;
+otherwise, it returns
+.ZN False .
+.SH "SEE ALSO"
+XCreateFontSet(__libmansuffix__),
+XCreateOM(__libmansuffix__),
+XCreateOC(__libmansuffix__),
+XExtentsOfFontSet(__libmansuffix__),
+XFontSetExtents(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XFree.man b/libX11/man/XFree.man
index ffa83d898..ffc513bde 100644
--- a/libX11/man/XFree.man
+++ b/libX11/man/XFree.man
@@ -1,158 +1,97 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XFree __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XFree \- free client data

-.SH SYNTAX

-int XFree\^(\^void *\fIdata\fP\^); 

-.SH ARGUMENTS

-.IP \fIdata\fP 1i

-Specifies the data that are to be freed.

-.SH DESCRIPTION

-The

-.ZN XFree

-function is a general-purpose Xlib routine that frees the specified data.

-You must use it to free any objects that were allocated by Xlib,

-unless an alternate function is explicitly specified for the object.

-A NULL pointer cannot be passed to this function.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XFree __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XFree \- free client data
+.SH SYNTAX
+int XFree\^(\^void *\fIdata\fP\^); 
+.SH ARGUMENTS
+.IP \fIdata\fP 1i
+Specifies the data that are to be freed.
+.SH DESCRIPTION
+The
+.ZN XFree
+function is a general-purpose Xlib routine that frees the specified data.
+You must use it to free any objects that were allocated by Xlib,
+unless an alternate function is explicitly specified for the object.
+A NULL pointer cannot be passed to this function.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XGetEventData.man b/libX11/man/XGetEventData.man
index 9d4b0804d..6d1f2dbb9 100644
--- a/libX11/man/XGetEventData.man
+++ b/libX11/man/XGetEventData.man
@@ -1,223 +1,158 @@
-.\" Copyright \(co 2009 Red Hat, Inc.

-.\"

-.\" 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 (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 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.

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGetEventData __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGetEventData, XFreeEventData, XGenericEventCookie \- retrieve and free additional event data through cookies.

-.SH SYNTAX

-.HP

-Bool XGetEventData\^(\^Display *\fIdisplay\fP\^, XGenericEventCookie *\fIcookie\fP\^);

-.HP

-void XFreeEventData\^(\^Display *\fIdisplay\fP\^, XGenericEventCookie *\fIcookie\fP\^);

-.HP

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcookie\fP 1i

-Specifies the cookie to free or retrieve the data for.

-

-.SH STRUCTURES

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;

-	unsigned long serial;

-	Bool send_event;

-	Display *display;

-	int extension;

-	int evtype;

-	unsigned int cookie;

-	void *data;

-} XGenericEventCookie;

-.De

-

-.SH DESCRIPTION

-Some extension

-.ZN XGenericEvents

-require additional memory to store information.

-For these events, the library returns a

-.ZN XGenericEventCookie

-with a token ('cookie') unique to this event. The

-.ZN XGenericEventCookie 's

-data pointer is undefined until

-.ZN XGetEventData

-is called.

-

-The

-.ZN XGetEventData

-function retrieves this extra data for the given cookie. No round-trip to

-the server is required. If the cookie is invalid or the

-event is not an event handled by cookie handlers,

-.ZN False

-is returned. If

-.ZN XGetEventData

-returns

-.ZN True ,

-the cookie's data pointer points to the memory containing the event

-information. A client must call

-.ZN XFreeEventData

-to free this memory.

-.ZN XGetEventData

-returns

-.ZN False

-for multiple calls for the same event cookie.

-

-The

-.ZN XFreeEventData

-function frees the data associated with a cookie. A client must call

-.ZN XFreeEventData

-for each cookie claimed with

-.ZN XGetEventData .

-

-.SH EXAMPLE CODE

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-XEvent event;

-XGenericEventCookie *cookie = &ev;

-

-XNextEvent(display, &event);

-if (XGetEventData(display, cookie)) {

-    handle_cookie_event(cookie->data);

-} else

-    handle_event(&event);

-}

-XFreeEventData(display, cookie);

-.De

-

-.SH NOTES

-A cookie is defined as unclaimed if it has been returned to the client

-through

-.ZN XNextEvent

-but its data has not been retrieved via

-.ZN XGetEventData .

-Subsequent calls to

-.ZN XNextEvent

-may free memory associated with unclaimed cookies.

-Multi-threaded X clients must ensure that

-.ZN XGetEventData

-is called before the next call to

-.ZN XNextEvent .

-

-.SH "SEE ALSO"

-XNextEvent(__libmansuffix__),

-.br

-\fI\*(xL\fP

-

+.\" Copyright \(co 2009 Red Hat, Inc.
+.\"
+.\" 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 (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 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.
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGetEventData __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGetEventData, XFreeEventData, XGenericEventCookie \- retrieve and free additional event data through cookies.
+.SH SYNTAX
+.HP
+Bool XGetEventData\^(\^Display *\fIdisplay\fP\^, XGenericEventCookie *\fIcookie\fP\^);
+.HP
+void XFreeEventData\^(\^Display *\fIdisplay\fP\^, XGenericEventCookie *\fIcookie\fP\^);
+.HP
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcookie\fP 1i
+Specifies the cookie to free or retrieve the data for.
+
+.SH STRUCTURES
+.Ds 0
+typedef struct {
+        int type;
+        unsigned long serial;
+        Bool send_event;
+        Display *display;
+        int extension;
+        int evtype;
+        unsigned int cookie;
+        void *data;
+} XGenericEventCookie;
+.De
+
+.SH DESCRIPTION
+Some extension
+.ZN XGenericEvents
+require additional memory to store information.
+For these events, the library returns a
+.ZN XGenericEventCookie
+with a token ('cookie') unique to this event. The
+.ZN XGenericEventCookie 's
+data pointer is undefined until
+.ZN XGetEventData
+is called.
+
+The
+.ZN XGetEventData
+function retrieves this extra data for the given cookie. No round-trip to
+the server is required. If the cookie is invalid or the
+event is not an event handled by cookie handlers,
+.ZN False
+is returned. If
+.ZN XGetEventData
+returns
+.ZN True ,
+the cookie's data pointer points to the memory containing the event
+information. A client must call
+.ZN XFreeEventData
+to free this memory.
+.ZN XGetEventData
+returns
+.ZN False
+for multiple calls for the same event cookie.
+
+The
+.ZN XFreeEventData
+function frees the data associated with a cookie. A client must call
+.ZN XFreeEventData
+for each cookie claimed with
+.ZN XGetEventData .
+
+.SH EXAMPLE CODE
+.Ds 0
+XEvent event;
+XGenericEventCookie *cookie = &ev;
+
+XNextEvent(display, &event);
+if (XGetEventData(display, cookie)) {
+    handle_cookie_event(cookie->data);
+} else
+    handle_event(&event);
+}
+XFreeEventData(display, cookie);
+.De
+
+.SH NOTES
+A cookie is defined as unclaimed if it has been returned to the client
+through
+.ZN XNextEvent
+but its data has not been retrieved via
+.ZN XGetEventData .
+Subsequent calls to
+.ZN XNextEvent
+may free memory associated with unclaimed cookies.
+Multi-threaded X clients must ensure that
+.ZN XGetEventData
+is called before the next call to
+.ZN XNextEvent .
+
+.SH "SEE ALSO"
+XNextEvent(__libmansuffix__),
+.br
+\fI\*(xL\fP
+
diff --git a/libX11/man/XGetVisualInfo.man b/libX11/man/XGetVisualInfo.man
index 88e512c72..5c5d226c2 100644
--- a/libX11/man/XGetVisualInfo.man
+++ b/libX11/man/XGetVisualInfo.man
@@ -1,313 +1,250 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XGetVisualInfo __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGetVisualInfo, XMatchVisualInfo, XVisualIDFromVisual, XVisualInfo \- obtain visual information and visual structure

-.SH SYNTAX

-.HP

-XVisualInfo *XGetVisualInfo\^(\^Display *\fIdisplay\fP\^, long

-\fIvinfo_mask\fP\^, XVisualInfo *\fIvinfo_template\fP\^, int

-*\fInitems_return\fP\^); 

-.HP

-Status XMatchVisualInfo\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, int

-\fIdepth\fP\^, int \fIclass\fP\^, XVisualInfo *\fIvinfo_return\fP\^); 

-.HP

-VisualID XVisualIDFromVisual\^(\^Visual *\^\fIvisual\fP\^); 

-.SH ARGUMENTS

-.IP \fIclass\fP 1i

-Specifies the class of the screen.

-.IP \fIdepth\fP 1i

-Specifies the depth of the screen.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fInitems_return\fP 1i

-Returns the number of matching visual structures.

-.IP \fIscreen\fP 1i

-Specifies the screen.

-.IP \fIvisual\fP 1i

-Specifies the visual type.

-.IP \fIvinfo_mask\fP 1i

-Specifies the visual mask value.

-.IP \fIvinfo_return\fP 1i

-Returns the matched visual information.

-.IP \fIvinfo_template\fP 1i

-Specifies the visual attributes that are to be used in matching the visual

-structures.

-.SH DESCRIPTION

-The

-.ZN XGetVisualInfo

-function returns a list of visual structures that have attributes 

-equal to the attributes specified by vinfo_template.

-If no visual structures match the template using the specified vinfo_mask,

-.ZN XGetVisualInfo

-returns a NULL.

-To free the data returned by this function, use

-.ZN XFree .

-.LP

-The

-.ZN XMatchVisualInfo

-function returns the visual information for a visual that matches the specified

-depth and class for a screen.

-Because multiple visuals that match the specified depth and class can exist,

-the exact visual chosen is undefined.

-If a visual is found,

-.ZN XMatchVisualInfo

-returns nonzero and the information on the visual to vinfo_return.

-Otherwise, when a visual is not found,

-.ZN XMatchVisualInfo

-returns zero.

-.LP

-The

-.ZN XVisualIDFromVisual

-function returns the visual ID for the specified visual type.

-.SH STRUCTURES

-The

-.ZN XVisualInfo

-structure contains:

-.LP

-.LP

-/\&* Visual information mask bits */

-.TS

-lw(.5i) lw(2.5i) lw(.8i).

-T{

-\&#define

-T}	T{

-.ZN VisualNoMask

-T}	T{

-0x0

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualIDMask

-T}	T{

-0x1

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualScreenMask

-T}	T{

-0x2

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualDepthMask

-T}	T{

-0x4

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualClassMask

-T}	T{

-0x8

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualRedMaskMask

-T}	T{

-0x10

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualGreenMaskMask

-T}	T{

-0x20

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualBlueMaskMask

-T}	T{

-0x40

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualColormapSizeMask

-T}	T{

-0x80

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualBitsPerRGBMask

-T}	T{

-0x100

-T}

-T{

-\&#define

-T}	T{

-.ZN VisualAllMask

-T}	T{

-0x1FF

-T}

-.TE

-.IN "XVisualInfo" "" "@DEF@"

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-/\&* Values */

-

-typedef struct {

-	Visual *visual;

-	VisualID visualid;

-	int screen;

-	int depth;

-	int class;

-	unsigned long red_mask;

-	unsigned long green_mask;

-	unsigned long blue_mask;

-	int colormap_size;

-	int bits_per_rgb;

-} XVisualInfo;

-.De

-.SH "SEE ALSO"

-XFree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XGetVisualInfo __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGetVisualInfo, XMatchVisualInfo, XVisualIDFromVisual, XVisualInfo \- obtain visual information and visual structure
+.SH SYNTAX
+.HP
+XVisualInfo *XGetVisualInfo\^(\^Display *\fIdisplay\fP\^, long
+\fIvinfo_mask\fP\^, XVisualInfo *\fIvinfo_template\fP\^, int
+*\fInitems_return\fP\^); 
+.HP
+Status XMatchVisualInfo\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, int
+\fIdepth\fP\^, int \fIclass\fP\^, XVisualInfo *\fIvinfo_return\fP\^); 
+.HP
+VisualID XVisualIDFromVisual\^(\^Visual *\^\fIvisual\fP\^); 
+.SH ARGUMENTS
+.IP \fIclass\fP 1i
+Specifies the class of the screen.
+.IP \fIdepth\fP 1i
+Specifies the depth of the screen.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInitems_return\fP 1i
+Returns the number of matching visual structures.
+.IP \fIscreen\fP 1i
+Specifies the screen.
+.IP \fIvisual\fP 1i
+Specifies the visual type.
+.IP \fIvinfo_mask\fP 1i
+Specifies the visual mask value.
+.IP \fIvinfo_return\fP 1i
+Returns the matched visual information.
+.IP \fIvinfo_template\fP 1i
+Specifies the visual attributes that are to be used in matching the visual
+structures.
+.SH DESCRIPTION
+The
+.ZN XGetVisualInfo
+function returns a list of visual structures that have attributes 
+equal to the attributes specified by vinfo_template.
+If no visual structures match the template using the specified vinfo_mask,
+.ZN XGetVisualInfo
+returns a NULL.
+To free the data returned by this function, use
+.ZN XFree .
+.LP
+The
+.ZN XMatchVisualInfo
+function returns the visual information for a visual that matches the specified
+depth and class for a screen.
+Because multiple visuals that match the specified depth and class can exist,
+the exact visual chosen is undefined.
+If a visual is found,
+.ZN XMatchVisualInfo
+returns nonzero and the information on the visual to vinfo_return.
+Otherwise, when a visual is not found,
+.ZN XMatchVisualInfo
+returns zero.
+.LP
+The
+.ZN XVisualIDFromVisual
+function returns the visual ID for the specified visual type.
+.SH STRUCTURES
+The
+.ZN XVisualInfo
+structure contains:
+.LP
+.LP
+/\&* Visual information mask bits */
+.TS
+lw(.5i) lw(2.5i) lw(.8i).
+T{
+\&#define
+T}	T{
+.ZN VisualNoMask
+T}	T{
+0x0
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualIDMask
+T}	T{
+0x1
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualScreenMask
+T}	T{
+0x2
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualDepthMask
+T}	T{
+0x4
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualClassMask
+T}	T{
+0x8
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualRedMaskMask
+T}	T{
+0x10
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualGreenMaskMask
+T}	T{
+0x20
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualBlueMaskMask
+T}	T{
+0x40
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualColormapSizeMask
+T}	T{
+0x80
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualBitsPerRGBMask
+T}	T{
+0x100
+T}
+T{
+\&#define
+T}	T{
+.ZN VisualAllMask
+T}	T{
+0x1FF
+T}
+.TE
+.IN "XVisualInfo" "" "@DEF@"
+.Ds 0
+/\&* Values */
+
+typedef struct {
+        Visual *visual;
+        VisualID visualid;
+        int screen;
+        int depth;
+        int class;
+        unsigned long red_mask;
+        unsigned long green_mask;
+        unsigned long blue_mask;
+        int colormap_size;
+        int bits_per_rgb;
+} XVisualInfo;
+.De
+.SH "SEE ALSO"
+XFree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGetWindowAttributes.man b/libX11/man/XGetWindowAttributes.man
index d54292f6c..953aeed4e 100644
--- a/libX11/man/XGetWindowAttributes.man
+++ b/libX11/man/XGetWindowAttributes.man
@@ -1,395 +1,332 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XGetWindowAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGetWindowAttributes, XGetGeometry, XWindowAttributes \- get current window attribute or geometry and current window attributes structure

-.SH SYNTAX

-.HP

-Status XGetWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XWindowAttributes *\fIwindow_attributes_return\fP\^); 

-.HP

-Status XGetGeometry\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, Window

-*\fIroot_return\fP\^, int *\fIx_return\fP\^, int *\fIy_return\fP\^, unsigned

-int *\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^, unsigned int

-*\fIborder_width_return\fP\^, unsigned int *\fIdepth_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIborder_width_return\fP 1i

-Returns the border width in pixels. 

-.ds Dr , which can be a window or a pixmap

-.IP \fId\fP 1i

-Specifies the drawable\*(Dr. 

-.IP \fIdepth_return\fP 1i

-Returns the depth of the drawable (bits per pixel for the object).

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIroot_return\fP 1i

-Returns the root window.

-.ds Wi whose current attributes you want to obtain

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.IP \fIwidth_return\fP 1i

-.br

-.ns

-.IP \fIheight_return\fP 1i

-Return the drawable's dimensions (width and height).

-.IP \fIwindow_attributes_return\fP 1i

-Returns the specified window's attributes in the

-.ZN XWindowAttributes

-structure.

-.IP \fIx_return\fP 1i

-.br

-.ns

-.IP \fIy_return\fP 1i

-Return the x and y coordinates that define the location of the drawable.

-For a window, 

-these coordinates specify the upper-left outer corner relative to

-its parent's origin.

-For pixmaps, these coordinates are always zero.

-.SH DESCRIPTION

-The

-.ZN XGetWindowAttributes

-function returns the current attributes for the specified window to an

-.ZN XWindowAttributes

-structure.  It returns a nonzero status on success; otherwise, it returns a

-zero status.

-.LP

-.ZN XGetWindowAttributes

-can generate

-.ZN BadDrawable

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetGeometry

-function returns the root window and the current geometry of the drawable.

-The geometry of the drawable includes the x and y coordinates, width and height,

-border width, and depth.

-These are described in the argument list.

-It is legal to pass to this function a window whose class is

-.ZN InputOnly .

-It returns a nonzero status on success; otherwise, it returns a

-zero status.

-.SH STRUCTURES

-The

-.ZN XWindowAttributes

-structure contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int x, y;	/\&* location of window */

-	int width, height;	/\&* width and height of window */

-	int border_width;	/\&* border width of window */

-	int depth;	/\&* depth of window */

-	Visual *visual;	/\&* the associated visual structure */

-	Window root;	/\&* root of screen containing window */

-	int class;	/\&* InputOutput, InputOnly*/

-	int bit_gravity;	/\&* one of the bit gravity values */

-	int win_gravity;	/\&* one of the window gravity values */

-	int backing_store;	/\&* NotUseful, WhenMapped, Always */

-	unsigned long backing_planes;	/\&* planes to be preserved if possible */

-	unsigned long backing_pixel;	/\&* value to be used when restoring planes */

-	Bool save_under;	/\&* boolean, should bits under be saved? */

-	Colormap colormap;	/\&* color map to be associated with window */

-	Bool map_installed;	/\&* boolean, is color map currently installed*/

-	int map_state;	/\&* IsUnmapped, IsUnviewable, IsViewable */

-	long all_event_masks;	/\&* set of events all people have interest in*/

-	long your_event_mask;	/\&* my event mask */

-	long do_not_propagate_mask;	/\&* set of events that should not propagate */

-	Bool override_redirect;	/\&* boolean value for override-redirect */

-	Screen *screen;	/\&* back pointer to correct screen */

-} XWindowAttributes;

-.De

-.LP

-The x and y members are set to the upper-left outer

-corner relative to the parent window's origin.

-The width and height members are set to the inside size of the window, 

-not including the border.

-The border_width member is set to the window's border width in pixels.

-The depth member is set to the depth of the window 

-(that is, bits per pixel for the object).

-The visual member is a pointer to the screen's associated

-.ZN Visual

-structure.

-The root member is set to the root window of the screen containing the window.

-The class member is set to the window's class and can be either

-.ZN InputOutput

-or

-.ZN InputOnly .

-.LP

-The bit_gravity member is set to the window's bit gravity

-and can be one of the following:

-.LP

-.TS

-lw(1.5i) lw(1.5i).

-T{

-.ZN ForgetGravity

-T}	T{

-.ZN EastGravity

-T}

-T{

-.ZN NorthWestGravity

-T}	T{

-.ZN SouthWestGravity

-T}

-T{

-.ZN NorthGravity

-T}	T{

-.ZN SouthGravity

-T}

-T{

-.ZN NorthEastGravity

-T}	T{

-.ZN SouthEastGravity

-T}

-T{

-.ZN WestGravity

-T}	T{

-.ZN StaticGravity

-T}

-.ZN CenterGravity

-.TE

-.LP

-The win_gravity member is set to the window's window gravity

-and can be one of the following:

-.LP

-.TS

-lw(1.5i) lw(1.5i).

-T{

-.ZN UnmapGravity

-T}	T{

-.ZN EastGravity

-T}

-T{

-.ZN NorthWestGravity

-T}	T{

-.ZN SouthWestGravity

-T}

-T{

-.ZN NorthGravity

-T}	T{

-.ZN SouthGravity

-T}

-T{

-.ZN NorthEastGravity

-T}	T{

-.ZN SouthEastGravity

-T}

-T{

-.ZN WestGravity

-T}	T{

-.ZN StaticGravity

-T}

-.ZN CenterGravity

-.TE

-.LP

-For additional information on gravity,

-see section 3.3.

-.LP

-The backing_store member is set to indicate how the X server should maintain

-the contents of a window 

-and can be 

-.ZN WhenMapped ,

-.ZN Always ,

-or

-.ZN NotUseful .

-The backing_planes member is set to indicate (with bits set to 1) which bit 

-planes of the window hold dynamic data that must be preserved in backing_stores 

-and during save_unders.

-The backing_pixel member is set to indicate what values to use 

-for planes not set in backing_planes.

-.LP

-The save_under member is set to 

-.ZN True

-or

-.ZN False .

-The colormap member is set to the colormap for the specified window and can be

-a colormap ID or 

-.ZN None .

-The map_installed member is set to indicate whether the colormap is 

-currently installed and can be 

-.ZN True

-or

-.ZN False .

-The map_state member is set to indicate the state of the window and can be

-.ZN IsUnmapped ,

-.ZN IsUnviewable ,

-or

-.ZN IsViewable .

-.ZN IsUnviewable

-is used if the window is mapped but some ancestor is unmapped.

-.LP

-The all_event_masks member is set to the bitwise inclusive OR of all event 

-masks selected on the window by all clients.

-The your_event_mask member is set to the bitwise inclusive OR of all event 

-masks selected by the querying client.

-The do_not_propagate_mask member is set to the bitwise inclusive OR of the 

-set of events that should not propagate.

-.LP

-The override_redirect member is set to indicate whether this window overrides

-structure control facilities and can be 

-.ZN True

-or

-.ZN False .

-Window manager clients should ignore the window if this member is

-.ZN True .

-.LP

-The screen member is set to a screen pointer that gives you a back pointer 

-to the correct screen.

-This makes it easier to obtain the screen information without

-having to loop over the root window fields to see which field matches.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XQueryPointer(__libmansuffix__),

-XQueryTree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XGetWindowAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGetWindowAttributes, XGetGeometry, XWindowAttributes \- get current window attribute or geometry and current window attributes structure
+.SH SYNTAX
+.HP
+Status XGetWindowAttributes\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XWindowAttributes *\fIwindow_attributes_return\fP\^); 
+.HP
+Status XGetGeometry\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, Window
+*\fIroot_return\fP\^, int *\fIx_return\fP\^, int *\fIy_return\fP\^, unsigned
+int *\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^, unsigned int
+*\fIborder_width_return\fP\^, unsigned int *\fIdepth_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIborder_width_return\fP 1i
+Returns the border width in pixels. 
+.ds Dr , which can be a window or a pixmap
+.IP \fId\fP 1i
+Specifies the drawable\*(Dr. 
+.IP \fIdepth_return\fP 1i
+Returns the depth of the drawable (bits per pixel for the object).
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIroot_return\fP 1i
+Returns the root window.
+.ds Wi whose current attributes you want to obtain
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.IP \fIwidth_return\fP 1i
+.br
+.ns
+.IP \fIheight_return\fP 1i
+Return the drawable's dimensions (width and height).
+.IP \fIwindow_attributes_return\fP 1i
+Returns the specified window's attributes in the
+.ZN XWindowAttributes
+structure.
+.IP \fIx_return\fP 1i
+.br
+.ns
+.IP \fIy_return\fP 1i
+Return the x and y coordinates that define the location of the drawable.
+For a window, 
+these coordinates specify the upper-left outer corner relative to
+its parent's origin.
+For pixmaps, these coordinates are always zero.
+.SH DESCRIPTION
+The
+.ZN XGetWindowAttributes
+function returns the current attributes for the specified window to an
+.ZN XWindowAttributes
+structure.  It returns a nonzero status on success; otherwise, it returns a
+zero status.
+.LP
+.ZN XGetWindowAttributes
+can generate
+.ZN BadDrawable
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetGeometry
+function returns the root window and the current geometry of the drawable.
+The geometry of the drawable includes the x and y coordinates, width and height,
+border width, and depth.
+These are described in the argument list.
+It is legal to pass to this function a window whose class is
+.ZN InputOnly .
+It returns a nonzero status on success; otherwise, it returns a
+zero status.
+.SH STRUCTURES
+The
+.ZN XWindowAttributes
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        int x, y;       /\&* location of window */
+        int width, height;      /\&* width and height of window */
+        int border_width;       /\&* border width of window */
+        int depth;      /\&* depth of window */
+        Visual *visual; /\&* the associated visual structure */
+        Window root;    /\&* root of screen containing window */
+        int class;      /\&* InputOutput, InputOnly*/
+        int bit_gravity;        /\&* one of the bit gravity values */
+        int win_gravity;        /\&* one of the window gravity values */
+        int backing_store;      /\&* NotUseful, WhenMapped, Always */
+        unsigned long backing_planes;   /\&* planes to be preserved if possible */
+        unsigned long backing_pixel;    /\&* value to be used when restoring planes */
+        Bool save_under;        /\&* boolean, should bits under be saved? */
+        Colormap colormap;      /\&* color map to be associated with window */
+        Bool map_installed;     /\&* boolean, is color map currently installed*/
+        int map_state;  /\&* IsUnmapped, IsUnviewable, IsViewable */
+        long all_event_masks;   /\&* set of events all people have interest in*/
+        long your_event_mask;   /\&* my event mask */
+        long do_not_propagate_mask;     /\&* set of events that should not propagate */
+        Bool override_redirect; /\&* boolean value for override-redirect */
+        Screen *screen; /\&* back pointer to correct screen */
+} XWindowAttributes;
+.De
+.LP
+The x and y members are set to the upper-left outer
+corner relative to the parent window's origin.
+The width and height members are set to the inside size of the window, 
+not including the border.
+The border_width member is set to the window's border width in pixels.
+The depth member is set to the depth of the window 
+(that is, bits per pixel for the object).
+The visual member is a pointer to the screen's associated
+.ZN Visual
+structure.
+The root member is set to the root window of the screen containing the window.
+The class member is set to the window's class and can be either
+.ZN InputOutput
+or
+.ZN InputOnly .
+.LP
+The bit_gravity member is set to the window's bit gravity
+and can be one of the following:
+.LP
+.TS
+lw(1.5i) lw(1.5i).
+T{
+.ZN ForgetGravity
+T}	T{
+.ZN EastGravity
+T}
+T{
+.ZN NorthWestGravity
+T}	T{
+.ZN SouthWestGravity
+T}
+T{
+.ZN NorthGravity
+T}	T{
+.ZN SouthGravity
+T}
+T{
+.ZN NorthEastGravity
+T}	T{
+.ZN SouthEastGravity
+T}
+T{
+.ZN WestGravity
+T}	T{
+.ZN StaticGravity
+T}
+.ZN CenterGravity
+.TE
+.LP
+The win_gravity member is set to the window's window gravity
+and can be one of the following:
+.LP
+.TS
+lw(1.5i) lw(1.5i).
+T{
+.ZN UnmapGravity
+T}	T{
+.ZN EastGravity
+T}
+T{
+.ZN NorthWestGravity
+T}	T{
+.ZN SouthWestGravity
+T}
+T{
+.ZN NorthGravity
+T}	T{
+.ZN SouthGravity
+T}
+T{
+.ZN NorthEastGravity
+T}	T{
+.ZN SouthEastGravity
+T}
+T{
+.ZN WestGravity
+T}	T{
+.ZN StaticGravity
+T}
+.ZN CenterGravity
+.TE
+.LP
+For additional information on gravity,
+see section 3.3.
+.LP
+The backing_store member is set to indicate how the X server should maintain
+the contents of a window 
+and can be 
+.ZN WhenMapped ,
+.ZN Always ,
+or
+.ZN NotUseful .
+The backing_planes member is set to indicate (with bits set to 1) which bit 
+planes of the window hold dynamic data that must be preserved in backing_stores 
+and during save_unders.
+The backing_pixel member is set to indicate what values to use 
+for planes not set in backing_planes.
+.LP
+The save_under member is set to 
+.ZN True
+or
+.ZN False .
+The colormap member is set to the colormap for the specified window and can be
+a colormap ID or 
+.ZN None .
+The map_installed member is set to indicate whether the colormap is 
+currently installed and can be 
+.ZN True
+or
+.ZN False .
+The map_state member is set to indicate the state of the window and can be
+.ZN IsUnmapped ,
+.ZN IsUnviewable ,
+or
+.ZN IsViewable .
+.ZN IsUnviewable
+is used if the window is mapped but some ancestor is unmapped.
+.LP
+The all_event_masks member is set to the bitwise inclusive OR of all event 
+masks selected on the window by all clients.
+The your_event_mask member is set to the bitwise inclusive OR of all event 
+masks selected by the querying client.
+The do_not_propagate_mask member is set to the bitwise inclusive OR of the 
+set of events that should not propagate.
+.LP
+The override_redirect member is set to indicate whether this window overrides
+structure control facilities and can be 
+.ZN True
+or
+.ZN False .
+Window manager clients should ignore the window if this member is
+.ZN True .
+.LP
+The screen member is set to a screen pointer that gives you a back pointer 
+to the correct screen.
+This makes it easier to obtain the screen information without
+having to loop over the root window fields to see which field matches.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XQueryPointer(__libmansuffix__),
+XQueryTree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGetWindowProperty.man b/libX11/man/XGetWindowProperty.man
index 09dd55b15..33e6e3de4 100644
--- a/libX11/man/XGetWindowProperty.man
+++ b/libX11/man/XGetWindowProperty.man
@@ -1,476 +1,415 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGetWindowProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGetWindowProperty, XListProperties, XChangeProperty, XRotateWindowProperties, XDeleteProperty \- obtain and change window properties

-.SH SYNTAX

-.HP

-int XGetWindowProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom

-\fIproperty\fP\^, long \fIlong_offset\fP\^, long \fIlong_length\fP\^, Bool

-\fIdelete\fP\^, Atom \fIreq_type\fP\^, Atom *\fIactual_type_return\fP\^, int

-*\fIactual_format_return\fP\^, unsigned long *\fInitems_return\fP\^, unsigned

-long *\fIbytes_after_return\fP\^, unsigned char **\fIprop_return\fP\^); 

-.HP

-Atom *XListProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int

-*\fInum_prop_return\fP\^); 

-.HP

-int XChangeProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom

-\fIproperty\fP\^, Atom \fItype\fP\^, int \fIformat\fP\^, int \fImode\fP\^,

-unsigned char *\fIdata\fP\^, int \fInelements\fP\^); 

-.HP

-int XRotateWindowProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Atom \fIproperties\fP\^[]\^, int \fInum_prop\fP\^, int \fInpositions\fP\^); 

-.HP

-int XDeleteProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom

-\fIproperty\fP\^); 

-.SH ARGUMENTS

-.IP \fIactual_format_return\fP 1i

-Returns the actual format of the property.

-.IP \fIactual_type_return\fP 1i

-Returns the atom identifier  that defines the actual type of the property.

-.IP \fIbytes_after_return\fP 1i

-Returns the number of bytes remaining to be read in the property if 

-a partial read was performed.

-.IP \fIdata\fP 1i

-Specifies the property data.

-.IP \fIdelete\fP 1i

-Specifies a Boolean value that determines whether the property is deleted.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIformat\fP 1i

-Specifies whether the data should be viewed as a list

-of 8-bit, 16-bit, or 32-bit quantities.

-Possible values are 8, 16, and 32.

-This information allows the X server to correctly perform

-byte-swap operations as necessary.

-If the format is 16-bit or 32-bit,

-you must explicitly cast your data pointer to an (unsigned char *) in the call

-to 

-.ZN XChangeProperty .

-.IP \fIlong_length\fP 1i

-Specifies the length in 32-bit multiples of the data to be retrieved.

-.IP \fIlong_offset\fP 1i

-Specifies the offset in the specified property (in 32-bit quantities) 

-where the data is to be retrieved.

-.\" Changed name of this file to prop_mode.a on 1/13/87

-.IP \fImode\fP 1i

-Specifies the mode of the operation.

-You can pass

-.ZN PropModeReplace ,

-.ZN PropModePrepend ,

-or

-.ZN PropModeAppend .

-.IP \fInelements\fP 1i

-Specifies the number of elements of the specified data format.

-.IP \fInitems_return\fP 1i

-Returns the actual number of 8-bit, 16-bit, or 32-bit items 

-stored in the prop_return data.

-.IP \fInum_prop\fP 1i

-Specifies the length of the properties array.

-.IP \fInum_prop_return\fP 1i

-Returns the length of the properties array.

-.IP \fInpositions\fP 1i

-Specifies the rotation amount.

-.IP \fIprop_return\fP 1i

-Returns the data in the specified format.

-If the returned format is 8, the returned data is represented as a

-char array. If the returned format is 16, the returned data is

-represented as a array of short int type and should be cast to that

-type to obtain the elements. If the returned format is 32, the

-property data will be stored as an array of longs (which in a 64-bit

-application will be 64-bit values that are padded in the upper 4 bytes).

-.IP \fIproperty\fP 1i

-Specifies the property name.

-.IP \fIproperties\fP 1i

-Specifies the array of properties that are to be rotated.

-.IP \fIreq_type\fP 1i

-Specifies the atom identifier associated with the property type or

-.ZN AnyPropertyType .

-.IP \fItype\fP 1i

-Specifies the type of the property.

-The X server does not interpret the type but simply

-passes it back to an application that later calls 

-.ZN XGetWindowProperty .

-.ds Wi whose property you want to obtain, change, rotate or delete

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XGetWindowProperty

-function returns the actual type of the property; the actual format of the property;

-the number of 8-bit, 16-bit, or 32-bit items transferred; the number of bytes remaining

-to be read in the property; and a pointer to the data actually returned.

-.ZN XGetWindowProperty

-sets the return arguments as follows:

-.IP \(bu 5

-If the specified property does not exist for the specified window,

-.ZN XGetWindowProperty 

-returns 

-.ZN None

-to actual_type_return and the value zero to 

-actual_format_return and bytes_after_return.

-The nitems_return argument is empty.

-In this case, the delete argument is ignored.

-.IP \(bu 5

-If the specified property exists 

-but its type does not match the specified type,

-.ZN XGetWindowProperty 

-returns the actual property type to actual_type_return, 

-the actual property format (never zero) to actual_format_return, 

-and the property length in bytes

-(even if the actual_format_return is 16 or 32) 

-to bytes_after_return.

-It also ignores the delete argument.

-The nitems_return argument is empty.

-.IP \(bu 5

-If the specified property exists and either you assign 

-.ZN AnyPropertyType 

-to the req_type argument or the specified type matches the actual property type,

-.ZN XGetWindowProperty 

-returns the actual property type to actual_type_return and the actual

-property format (never zero) to actual_format_return. 

-It also returns a value to bytes_after_return and nitems_return, by 

-defining the following

-values:

-.IP

-.nf

-	N = actual length of the stored property in bytes

-	     (even if the format is 16 or 32)

-	I = 4 * long_offset

-	T = N - I

-	L = MINIMUM(T, 4 * long_length)

-	A = N - (I + L)

-.fi

-.IP

-The returned value starts at byte index I in the property (indexing

-from zero), and its length in bytes is L.

-If the value for long_offset causes L to be negative,

-a

-.ZN BadValue

-error results. 

-The value of bytes_after_return is A, 

-giving the number of trailing unread bytes in the stored property.

-.LP

-If the returned format is 8, the returned data is represented as a

-.ZN char

-array.

-If the returned format is 16, the returned data is represented as a

-.ZN short

-array and should be cast to that type to obtain the elements.

-If the returned format is 32, the returned data is represented as a

-.ZN long

-array and should be cast to that type to obtain the elements.

-.LP

-.ZN XGetWindowProperty

-always allocates one extra byte in prop_return 

-(even if the property is zero length) 

-and sets it to zero so that simple properties consisting of characters

-do not have to be copied into yet another string before use.

-.LP

-If delete is 

-.ZN True 

-and bytes_after_return is zero, 

-.ZN XGetWindowProperty

-deletes the property 

-from the window and generates a 

-.ZN PropertyNotify 

-event on the window.

-.LP

-The function returns

-.ZN Success

-if it executes successfully.

-To free the resulting data,

-use

-.ZN XFree .

-.LP

-.ZN XGetWindowProperty

-can generate

-.ZN BadAtom ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XListProperties

-function returns a pointer to an array of atom properties that are defined for 

-the specified window or returns NULL if no properties were found.

-To free the memory allocated by this function, use

-.ZN XFree .

-.LP

-.ZN XListProperties

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XChangeProperty

-function alters the property for the specified window and

-causes the X server to generate a

-.ZN PropertyNotify

-event on that window.

-.ZN XChangeProperty

-performs the following:

-.IP \(bu 5

-If mode is

-.ZN PropModeReplace ,

-.ZN XChangeProperty

-discards the previous property value and stores the new data.

-.IP \(bu 5

-If mode is

-.ZN PropModePrepend

-or

-.ZN PropModeAppend ,

-.ZN XChangeProperty

-inserts the specified data before the beginning of the existing data

-or onto the end of the existing data, respectively.

-The type and format must match the existing property value,

-or a

-.ZN BadMatch

-error results.

-If the property is undefined, 

-it is treated as defined with the correct type and

-format with zero-length data.

-.LP

-If the specified format is 8, the property data must be a

-.ZN char

-array.

-If the specified format is 16, the property data must be a

-.ZN short

-array.

-If the specified format is 32, the property data must be a

-.ZN long

-array.

-.LP

-The lifetime of a property is not tied to the storing client.

-Properties remain until explicitly deleted, until the window is destroyed,

-or until the server resets.

-For a discussion of what happens when the connection to the X server is closed,

-see section 2.6. 

-The maximum size of a property is server dependent and can vary dynamically

-depending on the amount of memory the server has available.

-(If there is insufficient space, a

-.ZN BadAlloc

-error results.)

-.LP

-.ZN XChangeProperty

-can generate

-.ZN BadAlloc ,

-.ZN BadAtom ,

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XRotateWindowProperties

-function allows you to rotate properties on a window and causes

-the X server to generate

-.ZN PropertyNotify

-events.

-If the property names in the properties array are viewed as being numbered 

-starting from zero and if there are num_prop property names in the list,

-then the value associated with property name I becomes the value associated 

-with property name (I + npositions) mod N for all I from zero to N \- 1.

-The effect is to rotate the states by npositions places around the virtual ring

-of property names (right for positive npositions, 

-left for negative npositions).

-If npositions mod N is nonzero,

-the X server generates a

-.ZN PropertyNotify

-event for each property in the order that they are listed in the array.

-If an atom occurs more than once in the list or no property with that 

-name is defined for the window,

-a 

-.ZN BadMatch 

-error results.

-If a 

-.ZN BadAtom 

-or 

-.ZN BadMatch 

-error results,

-no properties are changed.

-.LP

-.ZN XRotateWindowProperties

-can generate

-.ZN BadAtom ,

-.ZN BadMatch ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XDeleteProperty

-function deletes the specified property only if the

-property was defined on the specified window

-and causes the X server to generate a

-.ZN PropertyNotify

-event on the window unless the property does not exist.

-.LP

-.ZN XDeleteProperty

-can generate

-.ZN BadAtom

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XFree(__libmansuffix__),

-XInternAtom(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGetWindowProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGetWindowProperty, XListProperties, XChangeProperty, XRotateWindowProperties, XDeleteProperty \- obtain and change window properties
+.SH SYNTAX
+.HP
+int XGetWindowProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^, long \fIlong_offset\fP\^, long \fIlong_length\fP\^, Bool
+\fIdelete\fP\^, Atom \fIreq_type\fP\^, Atom *\fIactual_type_return\fP\^, int
+*\fIactual_format_return\fP\^, unsigned long *\fInitems_return\fP\^, unsigned
+long *\fIbytes_after_return\fP\^, unsigned char **\fIprop_return\fP\^); 
+.HP
+Atom *XListProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+*\fInum_prop_return\fP\^); 
+.HP
+int XChangeProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^, Atom \fItype\fP\^, int \fIformat\fP\^, int \fImode\fP\^,
+unsigned char *\fIdata\fP\^, int \fInelements\fP\^); 
+.HP
+int XRotateWindowProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Atom \fIproperties\fP\^[]\^, int \fInum_prop\fP\^, int \fInpositions\fP\^); 
+.HP
+int XDeleteProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+\fIproperty\fP\^); 
+.SH ARGUMENTS
+.IP \fIactual_format_return\fP 1i
+Returns the actual format of the property.
+.IP \fIactual_type_return\fP 1i
+Returns the atom identifier  that defines the actual type of the property.
+.IP \fIbytes_after_return\fP 1i
+Returns the number of bytes remaining to be read in the property if 
+a partial read was performed.
+.IP \fIdata\fP 1i
+Specifies the property data.
+.IP \fIdelete\fP 1i
+Specifies a Boolean value that determines whether the property is deleted.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIformat\fP 1i
+Specifies whether the data should be viewed as a list
+of 8-bit, 16-bit, or 32-bit quantities.
+Possible values are 8, 16, and 32.
+This information allows the X server to correctly perform
+byte-swap operations as necessary.
+If the format is 16-bit or 32-bit,
+you must explicitly cast your data pointer to an (unsigned char *) in the call
+to 
+.ZN XChangeProperty .
+.IP \fIlong_length\fP 1i
+Specifies the length in 32-bit multiples of the data to be retrieved.
+.IP \fIlong_offset\fP 1i
+Specifies the offset in the specified property (in 32-bit quantities) 
+where the data is to be retrieved.
+.\" Changed name of this file to prop_mode.a on 1/13/87
+.IP \fImode\fP 1i
+Specifies the mode of the operation.
+You can pass
+.ZN PropModeReplace ,
+.ZN PropModePrepend ,
+or
+.ZN PropModeAppend .
+.IP \fInelements\fP 1i
+Specifies the number of elements of the specified data format.
+.IP \fInitems_return\fP 1i
+Returns the actual number of 8-bit, 16-bit, or 32-bit items 
+stored in the prop_return data.
+.IP \fInum_prop\fP 1i
+Specifies the length of the properties array.
+.IP \fInum_prop_return\fP 1i
+Returns the length of the properties array.
+.IP \fInpositions\fP 1i
+Specifies the rotation amount.
+.IP \fIprop_return\fP 1i
+Returns the data in the specified format.
+If the returned format is 8, the returned data is represented as a
+char array. If the returned format is 16, the returned data is
+represented as a array of short int type and should be cast to that
+type to obtain the elements. If the returned format is 32, the
+property data will be stored as an array of longs (which in a 64-bit
+application will be 64-bit values that are padded in the upper 4 bytes).
+.IP \fIproperty\fP 1i
+Specifies the property name.
+.IP \fIproperties\fP 1i
+Specifies the array of properties that are to be rotated.
+.IP \fIreq_type\fP 1i
+Specifies the atom identifier associated with the property type or
+.ZN AnyPropertyType .
+.IP \fItype\fP 1i
+Specifies the type of the property.
+The X server does not interpret the type but simply
+passes it back to an application that later calls 
+.ZN XGetWindowProperty .
+.ds Wi whose property you want to obtain, change, rotate or delete
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XGetWindowProperty
+function returns the actual type of the property; the actual format of the property;
+the number of 8-bit, 16-bit, or 32-bit items transferred; the number of bytes remaining
+to be read in the property; and a pointer to the data actually returned.
+.ZN XGetWindowProperty
+sets the return arguments as follows:
+.IP \(bu 5
+If the specified property does not exist for the specified window,
+.ZN XGetWindowProperty 
+returns 
+.ZN None
+to actual_type_return and the value zero to 
+actual_format_return and bytes_after_return.
+The nitems_return argument is empty.
+In this case, the delete argument is ignored.
+.IP \(bu 5
+If the specified property exists 
+but its type does not match the specified type,
+.ZN XGetWindowProperty 
+returns the actual property type to actual_type_return, 
+the actual property format (never zero) to actual_format_return, 
+and the property length in bytes
+(even if the actual_format_return is 16 or 32) 
+to bytes_after_return.
+It also ignores the delete argument.
+The nitems_return argument is empty.
+.IP \(bu 5
+If the specified property exists and either you assign 
+.ZN AnyPropertyType 
+to the req_type argument or the specified type matches the actual property type,
+.ZN XGetWindowProperty 
+returns the actual property type to actual_type_return and the actual
+property format (never zero) to actual_format_return. 
+It also returns a value to bytes_after_return and nitems_return, by 
+defining the following
+values:
+.IP
+.nf
+	N = actual length of the stored property in bytes
+	     (even if the format is 16 or 32)
+	I = 4 * long_offset
+	T = N - I
+	L = MINIMUM(T, 4 * long_length)
+	A = N - (I + L)
+.fi
+.IP
+The returned value starts at byte index I in the property (indexing
+from zero), and its length in bytes is L.
+If the value for long_offset causes L to be negative,
+a
+.ZN BadValue
+error results. 
+The value of bytes_after_return is A, 
+giving the number of trailing unread bytes in the stored property.
+.LP
+If the returned format is 8, the returned data is represented as a
+.ZN char
+array.
+If the returned format is 16, the returned data is represented as a
+.ZN short
+array and should be cast to that type to obtain the elements.
+If the returned format is 32, the returned data is represented as a
+.ZN long
+array and should be cast to that type to obtain the elements.
+.LP
+.ZN XGetWindowProperty
+always allocates one extra byte in prop_return 
+(even if the property is zero length) 
+and sets it to zero so that simple properties consisting of characters
+do not have to be copied into yet another string before use.
+.LP
+If delete is 
+.ZN True 
+and bytes_after_return is zero, 
+.ZN XGetWindowProperty
+deletes the property 
+from the window and generates a 
+.ZN PropertyNotify 
+event on the window.
+.LP
+The function returns
+.ZN Success
+if it executes successfully.
+To free the resulting data,
+use
+.ZN XFree .
+.LP
+.ZN XGetWindowProperty
+can generate
+.ZN BadAtom ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XListProperties
+function returns a pointer to an array of atom properties that are defined for 
+the specified window or returns NULL if no properties were found.
+To free the memory allocated by this function, use
+.ZN XFree .
+.LP
+.ZN XListProperties
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XChangeProperty
+function alters the property for the specified window and
+causes the X server to generate a
+.ZN PropertyNotify
+event on that window.
+.ZN XChangeProperty
+performs the following:
+.IP \(bu 5
+If mode is
+.ZN PropModeReplace ,
+.ZN XChangeProperty
+discards the previous property value and stores the new data.
+.IP \(bu 5
+If mode is
+.ZN PropModePrepend
+or
+.ZN PropModeAppend ,
+.ZN XChangeProperty
+inserts the specified data before the beginning of the existing data
+or onto the end of the existing data, respectively.
+The type and format must match the existing property value,
+or a
+.ZN BadMatch
+error results.
+If the property is undefined, 
+it is treated as defined with the correct type and
+format with zero-length data.
+.LP
+If the specified format is 8, the property data must be a
+.ZN char
+array.
+If the specified format is 16, the property data must be a
+.ZN short
+array.
+If the specified format is 32, the property data must be a
+.ZN long
+array.
+.LP
+The lifetime of a property is not tied to the storing client.
+Properties remain until explicitly deleted, until the window is destroyed,
+or until the server resets.
+For a discussion of what happens when the connection to the X server is closed,
+see section 2.6. 
+The maximum size of a property is server dependent and can vary dynamically
+depending on the amount of memory the server has available.
+(If there is insufficient space, a
+.ZN BadAlloc
+error results.)
+.LP
+.ZN XChangeProperty
+can generate
+.ZN BadAlloc ,
+.ZN BadAtom ,
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XRotateWindowProperties
+function allows you to rotate properties on a window and causes
+the X server to generate
+.ZN PropertyNotify
+events.
+If the property names in the properties array are viewed as being numbered 
+starting from zero and if there are num_prop property names in the list,
+then the value associated with property name I becomes the value associated 
+with property name (I + npositions) mod N for all I from zero to N \- 1.
+The effect is to rotate the states by npositions places around the virtual ring
+of property names (right for positive npositions, 
+left for negative npositions).
+If npositions mod N is nonzero,
+the X server generates a
+.ZN PropertyNotify
+event for each property in the order that they are listed in the array.
+If an atom occurs more than once in the list or no property with that 
+name is defined for the window,
+a 
+.ZN BadMatch 
+error results.
+If a 
+.ZN BadAtom 
+or 
+.ZN BadMatch 
+error results,
+no properties are changed.
+.LP
+.ZN XRotateWindowProperties
+can generate
+.ZN BadAtom ,
+.ZN BadMatch ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XDeleteProperty
+function deletes the specified property only if the
+property was defined on the specified window
+and causes the X server to generate a
+.ZN PropertyNotify
+event on the window unless the property does not exist.
+.LP
+.ZN XDeleteProperty
+can generate
+.ZN BadAtom
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XFree(__libmansuffix__),
+XInternAtom(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGrabButton.man b/libX11/man/XGrabButton.man
index 30701d95e..a96b39824 100644
--- a/libX11/man/XGrabButton.man
+++ b/libX11/man/XGrabButton.man
@@ -1,312 +1,251 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGrabButton __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGrabButton, XUngrabButton \- grab pointer buttons

-.SH SYNTAX

-.HP 

-int XGrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,

-unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool

-\fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int

-\fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^, Cursor

-\fIcursor\fP\^); 

-.HP

-int XUngrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,

-unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^); 

-.SH ARGUMENTS

-.ds Bu grabbed or released

-.IP \fIbutton\fP 1i

-Specifies the pointer button that is to be \*(Bu or

-.ZN AnyButton .

-.IP \fIconfine_to\fP 1i

-Specifies the window to confine the pointer in or

-.ZN None .

-.IP \fIcursor\fP 1i

-Specifies the cursor that is to be displayed or

-.ZN None .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mask\fP 1i

-Specifies which pointer events are reported to the client.

-The mask is the bitwise inclusive OR of the valid pointer event mask bits.

-.IP \fIgrab_window\fP 1i

-Specifies the grab window.

-.IP \fIkeyboard_mode\fP 1i

-Specifies further processing of keyboard events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.IP \fImodifiers\fP 1i

-Specifies the set of keymasks or

-.ZN AnyModifier .

-The mask is the bitwise inclusive OR of the valid keymask bits.

-.IP \fIowner_events\fP 1i

-Specifies a Boolean value that indicates whether the pointer 

-events are to be reported as usual or reported with respect to the grab window 

-if selected by the event mask.

-.IP \fIpointer_mode\fP 1i

-Specifies further processing of pointer events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.SH DESCRIPTION

-The

-.ZN XGrabButton

-function establishes a passive grab.

-In the future,

-the pointer is actively grabbed (as for

-.ZN XGrabPointer ),

-the last-pointer-grab time is set to the time at which the button was pressed

-(as transmitted in the

-.ZN ButtonPress

-event), and the

-.ZN ButtonPress

-event is reported if all of the following conditions are true:

-.IP \(bu 5

-The pointer is not grabbed, and the specified button is logically pressed

-when the specified modifier keys are logically down,

-and no other buttons or modifier keys are logically down.

-.IP \(bu 5

-The grab_window contains the pointer.

-.IP \(bu 5

-The confine_to window (if any) is viewable.

-.IP \(bu 5

-A passive grab on the same button/key combination does not exist

-on any ancestor of grab_window.

-.LP

-The interpretation of the remaining arguments is as for

-.ZN XGrabPointer .

-The active grab is terminated automatically when the logical state of the

-pointer has all buttons released

-(independent of the state of the logical modifier keys),

-at which point a 

-.ZN ButtonRelease

-event is reported to the grabbing window.

-.LP

-Note that the logical state of a device (as seen by client applications)

-may lag the physical state if device event processing is frozen.

-.LP

-This request overrides all previous grabs by the same client on the same

-button/key combinations on the same window.

-A modifiers of 

-.ZN AnyModifier 

-is equivalent to issuing the grab request for all

-possible modifier combinations (including the combination of no modifiers).  

-It is not required that all modifiers specified have currently assigned 

-KeyCodes.

-A button of 

-.ZN AnyButton 

-is equivalent to

-issuing the request for all possible buttons.

-Otherwise, it is not required that the specified button currently be assigned

-to a physical button.

-.LP

-If some other client has already issued a 

-.ZN XGrabButton

-with the same button/key combination on the same window, a

-.ZN BadAccess 

-error results.

-When using 

-.ZN AnyModifier 

-or 

-.ZN AnyButton , 

-the request fails completely,

-and a

-.ZN BadAccess

-error results (no grabs are

-established) if there is a conflicting grab for any combination.

-.ZN XGrabButton

-has no effect on an active grab.

-.LP

-.ZN XGrabButton

-can generate

-.ZN BadCursor ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XUngrabButton

-function releases the passive button/key combination on the specified window if

-it was grabbed by this client.

-A modifiers of 

-.ZN AnyModifier 

-is

-equivalent to issuing 

-the ungrab request for all possible modifier combinations, including 

-the combination of no modifiers.

-A button of 

-.ZN AnyButton 

-is equivalent to issuing the

-request for all possible buttons.

-.ZN XUngrabButton

-has no effect on an active grab.

-.LP

-.ZN XUngrabButton

-can generate

-.ZN BadValue

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllowEvents(__libmansuffix__),

-XGrabPointer(__libmansuffix__),

-XGrabKey(__libmansuffix__),

-XGrabKeyboard(__libmansuffix__),

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGrabButton __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGrabButton, XUngrabButton \- grab pointer buttons
+.SH SYNTAX
+.HP 
+int XGrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^, Bool
+\fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int
+\fIpointer_mode\fP\^, \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^, Cursor
+\fIcursor\fP\^); 
+.HP
+int XUngrabButton\^(\^Display *\fIdisplay\fP\^, unsigned int \fIbutton\fP\^,
+unsigned int \fImodifiers\fP\^, Window \fIgrab_window\fP\^); 
+.SH ARGUMENTS
+.ds Bu grabbed or released
+.IP \fIbutton\fP 1i
+Specifies the pointer button that is to be \*(Bu or
+.ZN AnyButton .
+.IP \fIconfine_to\fP 1i
+Specifies the window to confine the pointer in or
+.ZN None .
+.IP \fIcursor\fP 1i
+Specifies the cursor that is to be displayed or
+.ZN None .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mask\fP 1i
+Specifies which pointer events are reported to the client.
+The mask is the bitwise inclusive OR of the valid pointer event mask bits.
+.IP \fIgrab_window\fP 1i
+Specifies the grab window.
+.IP \fIkeyboard_mode\fP 1i
+Specifies further processing of keyboard events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.IP \fImodifiers\fP 1i
+Specifies the set of keymasks or
+.ZN AnyModifier .
+The mask is the bitwise inclusive OR of the valid keymask bits.
+.IP \fIowner_events\fP 1i
+Specifies a Boolean value that indicates whether the pointer 
+events are to be reported as usual or reported with respect to the grab window 
+if selected by the event mask.
+.IP \fIpointer_mode\fP 1i
+Specifies further processing of pointer events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.SH DESCRIPTION
+The
+.ZN XGrabButton
+function establishes a passive grab.
+In the future,
+the pointer is actively grabbed (as for
+.ZN XGrabPointer ),
+the last-pointer-grab time is set to the time at which the button was pressed
+(as transmitted in the
+.ZN ButtonPress
+event), and the
+.ZN ButtonPress
+event is reported if all of the following conditions are true:
+.IP \(bu 5
+The pointer is not grabbed, and the specified button is logically pressed
+when the specified modifier keys are logically down,
+and no other buttons or modifier keys are logically down.
+.IP \(bu 5
+The grab_window contains the pointer.
+.IP \(bu 5
+The confine_to window (if any) is viewable.
+.IP \(bu 5
+A passive grab on the same button/key combination does not exist
+on any ancestor of grab_window.
+.LP
+The interpretation of the remaining arguments is as for
+.ZN XGrabPointer .
+The active grab is terminated automatically when the logical state of the
+pointer has all buttons released
+(independent of the state of the logical modifier keys),
+at which point a 
+.ZN ButtonRelease
+event is reported to the grabbing window.
+.LP
+Note that the logical state of a device (as seen by client applications)
+may lag the physical state if device event processing is frozen.
+.LP
+This request overrides all previous grabs by the same client on the same
+button/key combinations on the same window.
+A modifiers of 
+.ZN AnyModifier 
+is equivalent to issuing the grab request for all
+possible modifier combinations (including the combination of no modifiers).  
+It is not required that all modifiers specified have currently assigned 
+KeyCodes.
+A button of 
+.ZN AnyButton 
+is equivalent to
+issuing the request for all possible buttons.
+Otherwise, it is not required that the specified button currently be assigned
+to a physical button.
+.LP
+If some other client has already issued a 
+.ZN XGrabButton
+with the same button/key combination on the same window, a
+.ZN BadAccess 
+error results.
+When using 
+.ZN AnyModifier 
+or 
+.ZN AnyButton , 
+the request fails completely,
+and a
+.ZN BadAccess
+error results (no grabs are
+established) if there is a conflicting grab for any combination.
+.ZN XGrabButton
+has no effect on an active grab.
+.LP
+.ZN XGrabButton
+can generate
+.ZN BadCursor ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XUngrabButton
+function releases the passive button/key combination on the specified window if
+it was grabbed by this client.
+A modifiers of 
+.ZN AnyModifier 
+is
+equivalent to issuing 
+the ungrab request for all possible modifier combinations, including 
+the combination of no modifiers.
+A button of 
+.ZN AnyButton 
+is equivalent to issuing the
+request for all possible buttons.
+.ZN XUngrabButton
+has no effect on an active grab.
+.LP
+.ZN XUngrabButton
+can generate
+.ZN BadValue
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllowEvents(__libmansuffix__),
+XGrabPointer(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__),
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGrabKey.man b/libX11/man/XGrabKey.man
index 8b31dd1fe..0ffc66613 100644
--- a/libX11/man/XGrabKey.man
+++ b/libX11/man/XGrabKey.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH XGrabKey __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
diff --git a/libX11/man/XGrabKeyboard.man b/libX11/man/XGrabKeyboard.man
index 08397c027..875fe3e5a 100644
--- a/libX11/man/XGrabKeyboard.man
+++ b/libX11/man/XGrabKeyboard.man
@@ -1,297 +1,236 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGrabKeyboard __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGrabKeyboard, XUngrabKeyboard \- grab the keyboard

-.SH SYNTAX

-.HP

-int XGrabKeyboard\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,

-Bool \fIowner_events\fP\^, int \fIpointer_mode\fP\^, int

-\fIkeyboard_mode\fP\^, Time \fItime\fP\^); 

-.HP

-int XUngrabKeyboard\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgrab_window\fP 1i

-Specifies the grab window.

-.IP \fIkeyboard_mode\fP 1i

-Specifies further processing of keyboard events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.IP \fIowner_events\fP 1i

-Specifies a Boolean value that indicates whether the keyboard events 

-are to be reported as usual.

-.IP \fIpointer_mode\fP 1i

-Specifies further processing of pointer events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.IP \fItime\fP 1i

-Specifies the time.

-You can pass either a timestamp or

-.ZN CurrentTime .

-.SH DESCRIPTION

-The

-.ZN XGrabKeyboard

-function actively grabs control of the keyboard and generates

-.ZN FocusIn

-and

-.ZN FocusOut

-events.

-Further key events are reported only to the

-grabbing client.

-.ZN XGrabKeyboard

-overrides any active keyboard grab by this client.

-If owner_events is 

-.ZN False , 

-all generated key events are reported with

-respect to grab_window.  

-If owner_events is 

-.ZN True  

-and if a generated

-key event would normally be reported to this client, it is reported

-normally; otherwise, the event is reported with respect to the

-grab_window.  

-Both 

-.ZN KeyPress 

-and 

-.ZN KeyRelease 

-events are always reported,

-independent of any event selection made by the client.

-.LP

-If the keyboard_mode argument is 

-.ZN GrabModeAsync ,

-keyboard event processing continues

-as usual. 

-If the keyboard is currently frozen by this client, 

-then processing of keyboard events is resumed.

-If the keyboard_mode  argument is

-.ZN GrabModeSync ,

-the state of the keyboard (as seen by client applications) appears to freeze,

-and the X server generates no further keyboard events until the

-grabbing client issues a releasing 

-.ZN XAllowEvents 

-call or until the keyboard grab is released.

-Actual keyboard changes are not lost while the keyboard is frozen; 

-they are simply queued in the server for later processing.

-.LP

-If pointer_mode is 

-.ZN GrabModeAsync ,

-pointer event processing is unaffected

-by activation of the grab.  

-If pointer_mode is 

-.ZN GrabModeSync ,

-the state of the pointer (as seen by client applications) appears to freeze, 

-and the X server generates no further pointer events 

-until the grabbing client issues a releasing 

-.ZN XAllowEvents 

-call or until the keyboard grab is released.

-Actual pointer changes are not lost while the pointer is frozen; 

-they are simply queued in the server for later processing.

-.LP

-If the keyboard is actively grabbed by some other client,

-.ZN XGrabKeyboard

-fails and returns

-.ZN AlreadyGrabbed .

-If grab_window is not viewable,

-it fails and returns

-.ZN GrabNotViewable .

-If the keyboard is frozen by an active grab of another client,

-it fails and returns

-.ZN GrabFrozen .

-If the specified time is earlier than the last-keyboard-grab time 

-or later than the current X server time,

-it fails and returns

-.ZN GrabInvalidTime .

-Otherwise, the last-keyboard-grab time is set to the specified time

-.Pn ( CurrentTime 

-is replaced by the current X server time).

-.LP

-.ZN XGrabKeyboard

-can generate

-.ZN BadValue

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XUngrabKeyboard

-function

-releases the keyboard and any queued events if this client has it actively grabbed from

-either

-.ZN XGrabKeyboard

-or

-.ZN XGrabKey .

-.ZN XUngrabKeyboard

-does not release the keyboard and any queued events

-if the specified time is earlier than

-the last-keyboard-grab time or is later than the current X server time.

-It also generates

-.ZN FocusIn 

-and 

-.ZN FocusOut 

-events.

-The X server automatically performs an 

-.ZN UngrabKeyboard 

-request if the event window for an

-active keyboard grab becomes not viewable.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllowEvents(__libmansuffix__),

-XGrabButton(__libmansuffix__),

-XGrabKey(__libmansuffix__),

-XGrabPointer(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGrabKeyboard __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGrabKeyboard, XUngrabKeyboard \- grab the keyboard
+.SH SYNTAX
+.HP
+int XGrabKeyboard\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,
+Bool \fIowner_events\fP\^, int \fIpointer_mode\fP\^, int
+\fIkeyboard_mode\fP\^, Time \fItime\fP\^); 
+.HP
+int XUngrabKeyboard\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgrab_window\fP 1i
+Specifies the grab window.
+.IP \fIkeyboard_mode\fP 1i
+Specifies further processing of keyboard events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.IP \fIowner_events\fP 1i
+Specifies a Boolean value that indicates whether the keyboard events 
+are to be reported as usual.
+.IP \fIpointer_mode\fP 1i
+Specifies further processing of pointer events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.IP \fItime\fP 1i
+Specifies the time.
+You can pass either a timestamp or
+.ZN CurrentTime .
+.SH DESCRIPTION
+The
+.ZN XGrabKeyboard
+function actively grabs control of the keyboard and generates
+.ZN FocusIn
+and
+.ZN FocusOut
+events.
+Further key events are reported only to the
+grabbing client.
+.ZN XGrabKeyboard
+overrides any active keyboard grab by this client.
+If owner_events is 
+.ZN False , 
+all generated key events are reported with
+respect to grab_window.  
+If owner_events is 
+.ZN True  
+and if a generated
+key event would normally be reported to this client, it is reported
+normally; otherwise, the event is reported with respect to the
+grab_window.  
+Both 
+.ZN KeyPress 
+and 
+.ZN KeyRelease 
+events are always reported,
+independent of any event selection made by the client.
+.LP
+If the keyboard_mode argument is 
+.ZN GrabModeAsync ,
+keyboard event processing continues
+as usual. 
+If the keyboard is currently frozen by this client, 
+then processing of keyboard events is resumed.
+If the keyboard_mode  argument is
+.ZN GrabModeSync ,
+the state of the keyboard (as seen by client applications) appears to freeze,
+and the X server generates no further keyboard events until the
+grabbing client issues a releasing 
+.ZN XAllowEvents 
+call or until the keyboard grab is released.
+Actual keyboard changes are not lost while the keyboard is frozen; 
+they are simply queued in the server for later processing.
+.LP
+If pointer_mode is 
+.ZN GrabModeAsync ,
+pointer event processing is unaffected
+by activation of the grab.  
+If pointer_mode is 
+.ZN GrabModeSync ,
+the state of the pointer (as seen by client applications) appears to freeze, 
+and the X server generates no further pointer events 
+until the grabbing client issues a releasing 
+.ZN XAllowEvents 
+call or until the keyboard grab is released.
+Actual pointer changes are not lost while the pointer is frozen; 
+they are simply queued in the server for later processing.
+.LP
+If the keyboard is actively grabbed by some other client,
+.ZN XGrabKeyboard
+fails and returns
+.ZN AlreadyGrabbed .
+If grab_window is not viewable,
+it fails and returns
+.ZN GrabNotViewable .
+If the keyboard is frozen by an active grab of another client,
+it fails and returns
+.ZN GrabFrozen .
+If the specified time is earlier than the last-keyboard-grab time 
+or later than the current X server time,
+it fails and returns
+.ZN GrabInvalidTime .
+Otherwise, the last-keyboard-grab time is set to the specified time
+.Pn ( CurrentTime 
+is replaced by the current X server time).
+.LP
+.ZN XGrabKeyboard
+can generate
+.ZN BadValue
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XUngrabKeyboard
+function
+releases the keyboard and any queued events if this client has it actively grabbed from
+either
+.ZN XGrabKeyboard
+or
+.ZN XGrabKey .
+.ZN XUngrabKeyboard
+does not release the keyboard and any queued events
+if the specified time is earlier than
+the last-keyboard-grab time or is later than the current X server time.
+It also generates
+.ZN FocusIn 
+and 
+.ZN FocusOut 
+events.
+The X server automatically performs an 
+.ZN UngrabKeyboard 
+request if the event window for an
+active keyboard grab becomes not viewable.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllowEvents(__libmansuffix__),
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabPointer(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGrabPointer.man b/libX11/man/XGrabPointer.man
index f18900526..b29d0c9d7 100644
--- a/libX11/man/XGrabPointer.man
+++ b/libX11/man/XGrabPointer.man
@@ -1,365 +1,304 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGrabPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGrabPointer, XUngrabPointer, XChangeActivePointerGrab \- grab the pointer

-.SH SYNTAX

-.HP

-int XGrabPointer\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,

-Bool \fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int

-\fIpointer_mode\fP\^, int \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^,

-Cursor \fIcursor\fP\^, Time \fItime\fP\^); 

-.HP

-int XUngrabPointer\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 

-.HP

-int XChangeActivePointerGrab\^(\^Display *\fIdisplay\fP\^, unsigned int

-\fIevent_mask\fP\^, Cursor \fIcursor\fP\^, Time \fItime\fP\^); 

-.SH ARGUMENTS

-.IP \fIconfine_to\fP 1i

-Specifies the window to confine the pointer in or

-.ZN None .

-.IP \fIcursor\fP 1i

-Specifies the cursor that is to be displayed during the grab or

-.ZN None . 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mask\fP 1i

-Specifies which pointer events are reported to the client.

-The mask is the bitwise inclusive OR of the valid pointer event mask bits.

-.IP \fIgrab_window\fP 1i

-Specifies the grab window.

-.IP \fIkeyboard_mode\fP 1i

-Specifies further processing of keyboard events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.IP \fIowner_events\fP 1i

-Specifies a Boolean value that indicates whether the pointer 

-events are to be reported as usual or reported with respect to the grab window 

-if selected by the event mask.

-.IP \fIpointer_mode\fP 1i

-Specifies further processing of pointer events.

-You can pass 

-.ZN GrabModeSync 

-or

-.ZN GrabModeAsync .

-.IP \fItime\fP 1i

-Specifies the time.

-You can pass either a timestamp or

-.ZN CurrentTime .

-.SH DESCRIPTION

-The

-.ZN XGrabPointer

-function actively grabs control of the pointer and returns

-.ZN GrabSuccess

-if the grab was successful.

-Further pointer events are reported only to the grabbing client.

-.ZN XGrabPointer

-overrides any active pointer grab by this client.

-If owner_events is 

-.ZN False , 

-all generated pointer events

-are reported with respect to grab_window and are reported only if

-selected by event_mask.

-If owner_events is 

-.ZN True

-and if a generated

-pointer event would normally be reported to this client, 

-it is reported as usual. 

-Otherwise, the event is reported with respect to the

-grab_window and is reported only if selected by event_mask.

-For either value of owner_events, unreported events are discarded.

-.LP

-If the pointer_mode is 

-.ZN GrabModeAsync , 

-pointer event processing continues as usual.

-If the pointer is currently frozen by this client, 

-the processing of events for the pointer is resumed.

-If the pointer_mode is 

-.ZN GrabModeSync , 

-the state of the pointer, as seen by

-client applications,

-appears to freeze, and the X server generates no further pointer events

-until the grabbing client calls 

-.ZN XAllowEvents

-or until the pointer grab is released.

-Actual pointer changes are not lost while the pointer is frozen;

-they are simply queued in the server for later processing.

-.LP

-If the keyboard_mode is 

-.ZN GrabModeAsync , 

-keyboard event processing is unaffected by activation of the grab.

-If the keyboard_mode is 

-.ZN GrabModeSync , 

-the state of the keyboard, as seen by

-client applications,

-appears to freeze, and the X server generates no further keyboard events

-until the grabbing client calls 

-.ZN XAllowEvents

-or until the pointer grab is released.

-Actual keyboard changes are not lost while the pointer is frozen;

-they are simply queued in the server for later processing.

-.LP

-If a cursor is specified, it is displayed regardless of what

-window the pointer is in.  

-If 

-.ZN None

-is specified,

-the normal cursor for that window is displayed

-when the pointer is in grab_window or one of its subwindows;

-otherwise, the cursor for grab_window is displayed.

-.LP

-If a confine_to window is specified,

-the pointer is restricted to stay contained in that window.

-The confine_to window need have no relationship to the grab_window.

-If the pointer is not initially in the confine_to window, 

-it is warped automatically to the closest edge 

-just before the grab activates and enter/leave events are generated as usual. 

-If the confine_to window is subsequently reconfigured, 

-the pointer is warped automatically, as necessary, 

-to keep it contained in the window.

-.LP

-The time argument allows you to avoid certain circumstances that come up

-if applications take a long time to respond or if there are long network

-delays.

-Consider a situation where you have two applications, both

-of which normally grab the pointer when clicked on.

-If both applications specify the timestamp from the event, 

-the second application may wake up faster and successfully grab the pointer

-before the first application. 

-The first application then will get an indication that the other application 

-grabbed the pointer before its request was processed.

-.LP

-.ZN XGrabPointer 

-generates

-.ZN EnterNotify 

-and

-.ZN LeaveNotify 

-events.

-.LP

-Either if grab_window or confine_to window is not viewable

-or if the confine_to window lies completely outside the boundaries of the root

-window,

-.ZN XGrabPointer

-fails and returns

-.ZN GrabNotViewable .

-If the pointer is actively grabbed by some other client,

-it fails and returns

-.ZN AlreadyGrabbed .

-If the pointer is frozen by an active grab of another client,

-it fails and returns

-.ZN GrabFrozen .

-If the specified time is earlier than the last-pointer-grab time or later 

-than the current X server time, it fails and returns

-.ZN GrabInvalidTime .

-Otherwise, the last-pointer-grab time is set to the specified time

-.Pn ( CurrentTime 

-is replaced by the current X server time).

-.LP

-.ZN XGrabPointer

-can generate

-.ZN BadCursor ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XUngrabPointer

-function releases the pointer and any queued events

-if this client has actively grabbed the pointer from

-.ZN XGrabPointer ,

-.ZN XGrabButton ,

-or from a normal button press.

-.ZN XUngrabPointer

-does not release the pointer if the specified

-time is earlier than the last-pointer-grab time or is later than the

-current X server time.

-It also generates 

-.ZN EnterNotify 

-and 

-.ZN LeaveNotify 

-events.

-The X server performs an 

-.ZN UngrabPointer 

-request automatically if the event window or confine_to window 

-for an active pointer grab becomes not viewable

-or if window reconfiguration causes the confine_to window to lie completely

-outside the boundaries of the root window.

-.LP

-The

-.ZN XChangeActivePointerGrab

-function changes the specified dynamic parameters if the pointer is actively

-grabbed by the client and if the specified time is no earlier than the

-last-pointer-grab time and no later than the current X server time.

-This function has no effect on the passive parameters of a

-.ZN XGrabButton .

-The interpretation of event_mask and cursor is the same as described in

-.ZN XGrabPointer .

-.LP

-.ZN XChangeActivePointerGrab

-can generate a

-.ZN BadCursor 

-and

-.ZN BadValue

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllowEvents(__libmansuffix__),

-XGrabButton(__libmansuffix__),

-XGrabKey(__libmansuffix__),

-XGrabKeyboard(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGrabPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGrabPointer, XUngrabPointer, XChangeActivePointerGrab \- grab the pointer
+.SH SYNTAX
+.HP
+int XGrabPointer\^(\^Display *\fIdisplay\fP\^, Window \fIgrab_window\fP\^,
+Bool \fIowner_events\fP\^, unsigned int \fIevent_mask\fP\^, int
+\fIpointer_mode\fP\^, int \fIkeyboard_mode\fP\^, Window \fIconfine_to\fP\^,
+Cursor \fIcursor\fP\^, Time \fItime\fP\^); 
+.HP
+int XUngrabPointer\^(\^Display *\fIdisplay\fP\^, Time \fItime\fP\^); 
+.HP
+int XChangeActivePointerGrab\^(\^Display *\fIdisplay\fP\^, unsigned int
+\fIevent_mask\fP\^, Cursor \fIcursor\fP\^, Time \fItime\fP\^); 
+.SH ARGUMENTS
+.IP \fIconfine_to\fP 1i
+Specifies the window to confine the pointer in or
+.ZN None .
+.IP \fIcursor\fP 1i
+Specifies the cursor that is to be displayed during the grab or
+.ZN None . 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mask\fP 1i
+Specifies which pointer events are reported to the client.
+The mask is the bitwise inclusive OR of the valid pointer event mask bits.
+.IP \fIgrab_window\fP 1i
+Specifies the grab window.
+.IP \fIkeyboard_mode\fP 1i
+Specifies further processing of keyboard events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.IP \fIowner_events\fP 1i
+Specifies a Boolean value that indicates whether the pointer 
+events are to be reported as usual or reported with respect to the grab window 
+if selected by the event mask.
+.IP \fIpointer_mode\fP 1i
+Specifies further processing of pointer events.
+You can pass 
+.ZN GrabModeSync 
+or
+.ZN GrabModeAsync .
+.IP \fItime\fP 1i
+Specifies the time.
+You can pass either a timestamp or
+.ZN CurrentTime .
+.SH DESCRIPTION
+The
+.ZN XGrabPointer
+function actively grabs control of the pointer and returns
+.ZN GrabSuccess
+if the grab was successful.
+Further pointer events are reported only to the grabbing client.
+.ZN XGrabPointer
+overrides any active pointer grab by this client.
+If owner_events is 
+.ZN False , 
+all generated pointer events
+are reported with respect to grab_window and are reported only if
+selected by event_mask.
+If owner_events is 
+.ZN True
+and if a generated
+pointer event would normally be reported to this client, 
+it is reported as usual. 
+Otherwise, the event is reported with respect to the
+grab_window and is reported only if selected by event_mask.
+For either value of owner_events, unreported events are discarded.
+.LP
+If the pointer_mode is 
+.ZN GrabModeAsync , 
+pointer event processing continues as usual.
+If the pointer is currently frozen by this client, 
+the processing of events for the pointer is resumed.
+If the pointer_mode is 
+.ZN GrabModeSync , 
+the state of the pointer, as seen by
+client applications,
+appears to freeze, and the X server generates no further pointer events
+until the grabbing client calls 
+.ZN XAllowEvents
+or until the pointer grab is released.
+Actual pointer changes are not lost while the pointer is frozen;
+they are simply queued in the server for later processing.
+.LP
+If the keyboard_mode is 
+.ZN GrabModeAsync , 
+keyboard event processing is unaffected by activation of the grab.
+If the keyboard_mode is 
+.ZN GrabModeSync , 
+the state of the keyboard, as seen by
+client applications,
+appears to freeze, and the X server generates no further keyboard events
+until the grabbing client calls 
+.ZN XAllowEvents
+or until the pointer grab is released.
+Actual keyboard changes are not lost while the pointer is frozen;
+they are simply queued in the server for later processing.
+.LP
+If a cursor is specified, it is displayed regardless of what
+window the pointer is in.  
+If 
+.ZN None
+is specified,
+the normal cursor for that window is displayed
+when the pointer is in grab_window or one of its subwindows;
+otherwise, the cursor for grab_window is displayed.
+.LP
+If a confine_to window is specified,
+the pointer is restricted to stay contained in that window.
+The confine_to window need have no relationship to the grab_window.
+If the pointer is not initially in the confine_to window, 
+it is warped automatically to the closest edge 
+just before the grab activates and enter/leave events are generated as usual. 
+If the confine_to window is subsequently reconfigured, 
+the pointer is warped automatically, as necessary, 
+to keep it contained in the window.
+.LP
+The time argument allows you to avoid certain circumstances that come up
+if applications take a long time to respond or if there are long network
+delays.
+Consider a situation where you have two applications, both
+of which normally grab the pointer when clicked on.
+If both applications specify the timestamp from the event, 
+the second application may wake up faster and successfully grab the pointer
+before the first application. 
+The first application then will get an indication that the other application 
+grabbed the pointer before its request was processed.
+.LP
+.ZN XGrabPointer 
+generates
+.ZN EnterNotify 
+and
+.ZN LeaveNotify 
+events.
+.LP
+Either if grab_window or confine_to window is not viewable
+or if the confine_to window lies completely outside the boundaries of the root
+window,
+.ZN XGrabPointer
+fails and returns
+.ZN GrabNotViewable .
+If the pointer is actively grabbed by some other client,
+it fails and returns
+.ZN AlreadyGrabbed .
+If the pointer is frozen by an active grab of another client,
+it fails and returns
+.ZN GrabFrozen .
+If the specified time is earlier than the last-pointer-grab time or later 
+than the current X server time, it fails and returns
+.ZN GrabInvalidTime .
+Otherwise, the last-pointer-grab time is set to the specified time
+.Pn ( CurrentTime 
+is replaced by the current X server time).
+.LP
+.ZN XGrabPointer
+can generate
+.ZN BadCursor ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XUngrabPointer
+function releases the pointer and any queued events
+if this client has actively grabbed the pointer from
+.ZN XGrabPointer ,
+.ZN XGrabButton ,
+or from a normal button press.
+.ZN XUngrabPointer
+does not release the pointer if the specified
+time is earlier than the last-pointer-grab time or is later than the
+current X server time.
+It also generates 
+.ZN EnterNotify 
+and 
+.ZN LeaveNotify 
+events.
+The X server performs an 
+.ZN UngrabPointer 
+request automatically if the event window or confine_to window 
+for an active pointer grab becomes not viewable
+or if window reconfiguration causes the confine_to window to lie completely
+outside the boundaries of the root window.
+.LP
+The
+.ZN XChangeActivePointerGrab
+function changes the specified dynamic parameters if the pointer is actively
+grabbed by the client and if the specified time is no earlier than the
+last-pointer-grab time and no later than the current X server time.
+This function has no effect on the passive parameters of a
+.ZN XGrabButton .
+The interpretation of event_mask and cursor is the same as described in
+.ZN XGrabPointer .
+.LP
+.ZN XChangeActivePointerGrab
+can generate a
+.ZN BadCursor 
+and
+.ZN BadValue
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllowEvents(__libmansuffix__),
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGrabServer.man b/libX11/man/XGrabServer.man
index 9cfee3935..c0502313f 100644
--- a/libX11/man/XGrabServer.man
+++ b/libX11/man/XGrabServer.man
@@ -1,170 +1,109 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGrabServer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGrabServer, XUngrabServer \- grab the server

-.SH SYNTAX

-.HP

-int XGrabServer\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int XUngrabServer\^(\^Display *\fIdisplay\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.SH DESCRIPTION

-The

-.ZN XGrabServer

-function disables processing of requests and close downs on all other 

-connections than the one this request arrived on.

-You should not grab the X server any more than is absolutely necessary.

-.LP

-The

-.ZN XUngrabServer

-function restarts processing of requests and close downs on other connections.

-You should avoid grabbing the X server as much as possible.

-.SH "SEE ALSO"

-XGrabButton(__libmansuffix__),

-XGrabKey(__libmansuffix__),

-XGrabKeyboard(__libmansuffix__),

-XGrabPointer(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGrabServer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGrabServer, XUngrabServer \- grab the server
+.SH SYNTAX
+.HP
+int XGrabServer\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XUngrabServer\^(\^Display *\fIdisplay\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.SH DESCRIPTION
+The
+.ZN XGrabServer
+function disables processing of requests and close downs on all other 
+connections than the one this request arrived on.
+You should not grab the X server any more than is absolutely necessary.
+.LP
+The
+.ZN XUngrabServer
+function restarts processing of requests and close downs on other connections.
+You should avoid grabbing the X server as much as possible.
+.SH "SEE ALSO"
+XGrabButton(__libmansuffix__),
+XGrabKey(__libmansuffix__),
+XGrabKeyboard(__libmansuffix__),
+XGrabPointer(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGraphicsExposeEvent.man b/libX11/man/XGraphicsExposeEvent.man
index 95758d9da..9961f8c3d 100644
--- a/libX11/man/XGraphicsExposeEvent.man
+++ b/libX11/man/XGraphicsExposeEvent.man
@@ -1,276 +1,211 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGraphicsExposeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGraphicsExposeEvent, XNoExposeEvent \- GraphicsExpose and NoExpose event structures

-.SH STRUCTURES

-The structures for

-.ZN GraphicsExpose

-and

-.ZN NoExpose

-events contain:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* GraphicsExpose */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Drawable drawable;

-	int x, y;

-	int width, height;

-	int count;	/\&* if nonzero, at least this many more */

-	int major_code;	/\&* core is CopyArea or CopyPlane */

-	int minor_code;	/\&* not defined in the core */

-} XGraphicsExposeEvent;

-.De

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* NoExpose */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Drawable drawable;

-	int major_code;	/\&* core is CopyArea or CopyPlane */

-	int minor_code;	/\&* not defined in the core */

-} XNoExposeEvent;

-.De

-.LP

-When you receive these events,

-their structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-Both structures have these common members: drawable, major_code, and minor_code.

-The drawable member is set to the drawable of the destination region on 

-which the graphics request was to be performed.

-The major_code member is set to the graphics request initiated by the client

-and can be either

-.ZN X_CopyArea

-or

-.ZN X_CopyPlane .

-If it is

-.ZN X_CopyArea ,

-a call to

-.ZN XCopyArea

-initiated the request.

-If it is

-.ZN X_CopyPlane ,

-a call to

-.ZN XCopyPlane

-initiated the request.

-These constants are defined in 

-.hN X11/Xproto.h .

-The minor_code member,

-like the major_code member, 

-indicates which graphics request was initiated by

-the client. 

-However, the minor_code member is not defined by the core

-X protocol and will be zero in these cases, 

-although it may be used by an extension.

-.LP

-The 

-.ZN XGraphicsExposeEvent

-structure has these additional members: x, y, width, height, and count. 

-The x and y members are set to the coordinates relative to the drawable's origin

-and indicate the upper-left corner of the rectangle.

-The width and height members are set to the size (extent) of the rectangle.

-The count member is set to the number of

-.ZN GraphicsExpose

-events to follow.

-If count is zero, no more

-.ZN GraphicsExpose

-events follow for this window.

-However, if count is nonzero, at least that number of

-.ZN GraphicsExpose

-events (and possibly more) are to follow for this window.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCopyArea(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGraphicsExposeEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGraphicsExposeEvent, XNoExposeEvent \- GraphicsExpose and NoExpose event structures
+.SH STRUCTURES
+The structures for
+.ZN GraphicsExpose
+and
+.ZN NoExpose
+events contain:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* GraphicsExpose */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Drawable drawable;
+        int x, y;
+        int width, height;
+        int count;      /\&* if nonzero, at least this many more */
+        int major_code; /\&* core is CopyArea or CopyPlane */
+        int minor_code; /\&* not defined in the core */
+} XGraphicsExposeEvent;
+.De
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* NoExpose */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Drawable drawable;
+        int major_code; /\&* core is CopyArea or CopyPlane */
+        int minor_code; /\&* not defined in the core */
+} XNoExposeEvent;
+.De
+.LP
+When you receive these events,
+their structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+Both structures have these common members: drawable, major_code, and minor_code.
+The drawable member is set to the drawable of the destination region on 
+which the graphics request was to be performed.
+The major_code member is set to the graphics request initiated by the client
+and can be either
+.ZN X_CopyArea
+or
+.ZN X_CopyPlane .
+If it is
+.ZN X_CopyArea ,
+a call to
+.ZN XCopyArea
+initiated the request.
+If it is
+.ZN X_CopyPlane ,
+a call to
+.ZN XCopyPlane
+initiated the request.
+These constants are defined in 
+.hN X11/Xproto.h .
+The minor_code member,
+like the major_code member, 
+indicates which graphics request was initiated by
+the client. 
+However, the minor_code member is not defined by the core
+X protocol and will be zero in these cases, 
+although it may be used by an extension.
+.LP
+The 
+.ZN XGraphicsExposeEvent
+structure has these additional members: x, y, width, height, and count. 
+The x and y members are set to the coordinates relative to the drawable's origin
+and indicate the upper-left corner of the rectangle.
+The width and height members are set to the size (extent) of the rectangle.
+The count member is set to the number of
+.ZN GraphicsExpose
+events to follow.
+If count is zero, no more
+.ZN GraphicsExpose
+events follow for this window.
+However, if count is nonzero, at least that number of
+.ZN GraphicsExpose
+events (and possibly more) are to follow for this window.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCopyArea(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XGravityEvent.man b/libX11/man/XGravityEvent.man
index 9c3ec8027..afdacc74d 100644
--- a/libX11/man/XGravityEvent.man
+++ b/libX11/man/XGravityEvent.man
@@ -1,224 +1,161 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XGravityEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XGravityEvent \- GravityNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN GravityNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* GravityNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	int x, y;

-} XGravityEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the window that was moved or to its parent,

-depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected.

-The window member is set to the child window that was moved.

-The x and y members are set to the coordinates relative to the 

-new parent window's origin

-and indicate the position of the upper-left outside corner of the 

-window.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XGravityEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XGravityEvent \- GravityNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN GravityNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* GravityNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        int x, y;
+} XGravityEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the window that was moved or to its parent,
+depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected.
+The window member is set to the child window that was moved.
+The x and y members are set to the coordinates relative to the 
+new parent window's origin
+and indicate the position of the upper-left outside corner of the 
+window.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XIconifyWindow.man b/libX11/man/XIconifyWindow.man
index 40b1a7f1d..b11776e03 100644
--- a/libX11/man/XIconifyWindow.man
+++ b/libX11/man/XIconifyWindow.man
@@ -1,256 +1,195 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XIconifyWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XIconifyWindow, XWithdrawWindow, XReconfigureWMWindow \- manipulate top-level windows

-.SH SYNTAX

-.HP

-Status XIconifyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP, int

-\fIscreen_number\fP\^); 

-.HP

-Status XWithdrawWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int

-\fIscreen_number\fP\^); 

-.HP

-Status XReconfigureWMWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-int \fIscreen_number\fP\^, unsigned int \fIvalue_mask\fP\^, XWindowChanges

-*\fIvalues\fP); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIscreen_number\fP 1i

-Specifies the appropriate screen number on the host server.

-.IP \fIvalue_mask\fP 1i

-Specifies which values are to be set using information in

-the values structure.

-This mask is the bitwise inclusive OR of the valid configure window values bits.

-.IP \fIvalues\fP 1i

-Specifies the 

-.ZN XWindowChanges 

-structure.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The 

-.ZN XIconifyWindow 

-function sends a WM_CHANGE_STATE 

-.ZN ClientMessage 

-event with a format of 32 and a first data element of 

-.ZN IconicState 

-(as described in section 4.1.4 of the 

-\fIInter-Client Communication Conventions Manual\fP)

-and a window of w

-to the root window of the specified screen

-with an event mask set to

-.ZN SubstructureNotifyMask |

-.ZN SubstructureRedirectMask .

-Window managers may elect to receive this message and

-if the window is in its normal state, 

-may treat it as a request to change the window's state from normal to iconic.

-If the WM_CHANGE_STATE property cannot be interned, 

-.ZN XIconifyWindow

-does not send a message and returns a zero status.

-It returns a nonzero status if the client message is sent successfully;

-otherwise, it returns a zero status.

-.LP

-The 

-.ZN XWithdrawWindow 

-function unmaps the specified window 

-and sends a synthetic 

-.ZN UnmapNotify 

-event to the root window of the specified screen.

-Window managers may elect to receive this message 

-and may treat it as a request to change the window's state to withdrawn.

-When a window is in the withdrawn state, 

-neither its normal nor its iconic representations is visible.

-It returns a nonzero status if the 

-.ZN UnmapNotify 

-event is successfully sent; 

-otherwise, it returns a zero status.

-.LP

-.ZN XWithdrawWindow

-can generate a

-.ZN BadWindow

-error.

-.LP

-The 

-.ZN XReconfigureWMWindow 

-function issues a 

-.ZN ConfigureWindow 

-request on the specified top-level window.

-If the stacking mode is changed and the request fails with a 

-.ZN BadMatch 

-error, 

-the error is trapped by Xlib and a synthetic 

-.ZN ConfigureRequestEvent 

-containing the same configuration parameters is sent to the root 

-of the specified window.

-Window managers may elect to receive this event 

-and treat it as a request to reconfigure the indicated window.

-It returns a nonzero status if the request or event is successfully sent;

-otherwise, it returns a zero status.

-.LP

-.ZN XReconfigureWMWindow

-can generate

-.ZN BadValue

-and

-.ZN BadWindow

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XRaiseWindow(__libmansuffix__),

-XMapWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XIconifyWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XIconifyWindow, XWithdrawWindow, XReconfigureWMWindow \- manipulate top-level windows
+.SH SYNTAX
+.HP
+Status XIconifyWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP, int
+\fIscreen_number\fP\^); 
+.HP
+Status XWithdrawWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIscreen_number\fP\^); 
+.HP
+Status XReconfigureWMWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+int \fIscreen_number\fP\^, unsigned int \fIvalue_mask\fP\^, XWindowChanges
+*\fIvalues\fP); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIscreen_number\fP 1i
+Specifies the appropriate screen number on the host server.
+.IP \fIvalue_mask\fP 1i
+Specifies which values are to be set using information in
+the values structure.
+This mask is the bitwise inclusive OR of the valid configure window values bits.
+.IP \fIvalues\fP 1i
+Specifies the 
+.ZN XWindowChanges 
+structure.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The 
+.ZN XIconifyWindow 
+function sends a WM_CHANGE_STATE 
+.ZN ClientMessage 
+event with a format of 32 and a first data element of 
+.ZN IconicState 
+(as described in section 4.1.4 of the 
+\fIInter-Client Communication Conventions Manual\fP)
+and a window of w
+to the root window of the specified screen
+with an event mask set to
+.ZN SubstructureNotifyMask |
+.ZN SubstructureRedirectMask .
+Window managers may elect to receive this message and
+if the window is in its normal state, 
+may treat it as a request to change the window's state from normal to iconic.
+If the WM_CHANGE_STATE property cannot be interned, 
+.ZN XIconifyWindow
+does not send a message and returns a zero status.
+It returns a nonzero status if the client message is sent successfully;
+otherwise, it returns a zero status.
+.LP
+The 
+.ZN XWithdrawWindow 
+function unmaps the specified window 
+and sends a synthetic 
+.ZN UnmapNotify 
+event to the root window of the specified screen.
+Window managers may elect to receive this message 
+and may treat it as a request to change the window's state to withdrawn.
+When a window is in the withdrawn state, 
+neither its normal nor its iconic representations is visible.
+It returns a nonzero status if the 
+.ZN UnmapNotify 
+event is successfully sent; 
+otherwise, it returns a zero status.
+.LP
+.ZN XWithdrawWindow
+can generate a
+.ZN BadWindow
+error.
+.LP
+The 
+.ZN XReconfigureWMWindow 
+function issues a 
+.ZN ConfigureWindow 
+request on the specified top-level window.
+If the stacking mode is changed and the request fails with a 
+.ZN BadMatch 
+error, 
+the error is trapped by Xlib and a synthetic 
+.ZN ConfigureRequestEvent 
+containing the same configuration parameters is sent to the root 
+of the specified window.
+Window managers may elect to receive this event 
+and treat it as a request to reconfigure the indicated window.
+It returns a nonzero status if the request or event is successfully sent;
+otherwise, it returns a zero status.
+.LP
+.ZN XReconfigureWMWindow
+can generate
+.ZN BadValue
+and
+.ZN BadWindow
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XIfEvent.man b/libX11/man/XIfEvent.man
index 4b5ef141d..1cfc571ae 100644
--- a/libX11/man/XIfEvent.man
+++ b/libX11/man/XIfEvent.man
@@ -1,251 +1,190 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XIfEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XIfEvent, XCheckIfEvent, XPeekIfEvent \- check the event queue with a predicate procedure

-.SH SYNTAX

-.HP

-int XIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^, Bool

-(\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 

-.HP

-Bool XCheckIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,

-Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 

-.HP

-int XPeekIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,

-Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 

-.SH ARGUMENTS

-.IP \fIarg\fP 1i

-Specifies the user-supplied argument that will be passed to the predicate procedure.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Ev \ either a copy of or 

-.IP \fIevent_return\fP 1i

-Returns\*(Ev the matched event's associated structure.

-.IP \fIpredicate\fP 1i

-Specifies the procedure that is to be called to determine

-if the next event in the queue matches what you want.

-.SH DESCRIPTION

-The

-.ZN XIfEvent

-function completes only when the specified predicate

-procedure returns 

-.ZN True 

-for an event, 

-which indicates an event in the queue matches.

-.ZN XIfEvent

-flushes the output buffer if it blocks waiting for additional events.

-.ZN XIfEvent

-removes the matching event from the queue 

-and copies the structure into the client-supplied

-.ZN XEvent

-structure.

-.LP

-When the predicate procedure finds a match,

-.ZN XCheckIfEvent

-copies the matched event into the client-supplied

-.ZN XEvent

-structure and returns 

-.ZN True .

-(This event is removed from the queue.)

-If the predicate procedure finds no match,

-.ZN XCheckIfEvent

-returns

-.ZN False ,

-and the output buffer will have been flushed.

-All earlier events stored in the queue are not discarded.

-.LP

-The

-.ZN XPeekIfEvent

-function returns only when the specified predicate

-procedure returns 

-.ZN True

-for an event.

-After the predicate procedure finds a match,

-.ZN XPeekIfEvent

-copies the matched event into the client-supplied

-.ZN XEvent

-structure without removing the event from the queue.

-.ZN XPeekIfEvent

-flushes the output buffer if it blocks waiting for additional events.

-.LP

-Each of these functions requires you to pass a predicate procedure that 

-determines if an event matches what you want.

-Your predicate procedure must decide if the event is useful

-without calling any Xlib functions.

-If the predicate directly or indirectly causes the state of the event queue

-to change, the result is not defined.

-If Xlib has been initialized for threads, the predicate is called with

-the display locked and the result of a call by the predicate to any

-Xlib function that locks the display is not defined unless the caller

-has first called

-.ZN XLockDisplay .

-.LP

-The predicate procedure and its associated arguments are:

-.HP

-Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^)

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent\fP 1i

-Specifies the

-.ZN XEvent

-structure.

-.IP \fIarg\fP 1i

-Specifies the argument passed in from the 

-.ZN XIfEvent ,

-.ZN XCheckIfEvent ,

-or

-.ZN XPeekIfEvent 

-function.

-.LP

-The predicate procedure is called once for each

-event in the queue until it finds a match. 

-After finding a match, the predicate procedure must return 

-.ZN True .

-If it did not find a match, it must return

-.ZN False .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XNextEvent(__libmansuffix__),

-XPutBackEvent(__libmansuffix__)

-XSendEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XIfEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XIfEvent, XCheckIfEvent, XPeekIfEvent \- check the event queue with a predicate procedure
+.SH SYNTAX
+.HP
+int XIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^, Bool
+(\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.HP
+Bool XCheckIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,
+Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.HP
+int XPeekIfEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^,
+Bool (\^*\fIpredicate\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.SH ARGUMENTS
+.IP \fIarg\fP 1i
+Specifies the user-supplied argument that will be passed to the predicate procedure.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Ev \ either a copy of or 
+.IP \fIevent_return\fP 1i
+Returns\*(Ev the matched event's associated structure.
+.IP \fIpredicate\fP 1i
+Specifies the procedure that is to be called to determine
+if the next event in the queue matches what you want.
+.SH DESCRIPTION
+The
+.ZN XIfEvent
+function completes only when the specified predicate
+procedure returns 
+.ZN True 
+for an event, 
+which indicates an event in the queue matches.
+.ZN XIfEvent
+flushes the output buffer if it blocks waiting for additional events.
+.ZN XIfEvent
+removes the matching event from the queue 
+and copies the structure into the client-supplied
+.ZN XEvent
+structure.
+.LP
+When the predicate procedure finds a match,
+.ZN XCheckIfEvent
+copies the matched event into the client-supplied
+.ZN XEvent
+structure and returns 
+.ZN True .
+(This event is removed from the queue.)
+If the predicate procedure finds no match,
+.ZN XCheckIfEvent
+returns
+.ZN False ,
+and the output buffer will have been flushed.
+All earlier events stored in the queue are not discarded.
+.LP
+The
+.ZN XPeekIfEvent
+function returns only when the specified predicate
+procedure returns 
+.ZN True
+for an event.
+After the predicate procedure finds a match,
+.ZN XPeekIfEvent
+copies the matched event into the client-supplied
+.ZN XEvent
+structure without removing the event from the queue.
+.ZN XPeekIfEvent
+flushes the output buffer if it blocks waiting for additional events.
+.LP
+Each of these functions requires you to pass a predicate procedure that 
+determines if an event matches what you want.
+Your predicate procedure must decide if the event is useful
+without calling any Xlib functions.
+If the predicate directly or indirectly causes the state of the event queue
+to change, the result is not defined.
+If Xlib has been initialized for threads, the predicate is called with
+the display locked and the result of a call by the predicate to any
+Xlib function that locks the display is not defined unless the caller
+has first called
+.ZN XLockDisplay .
+.LP
+The predicate procedure and its associated arguments are:
+.HP
+Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^)
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent\fP 1i
+Specifies the
+.ZN XEvent
+structure.
+.IP \fIarg\fP 1i
+Specifies the argument passed in from the 
+.ZN XIfEvent ,
+.ZN XCheckIfEvent ,
+or
+.ZN XPeekIfEvent 
+function.
+.LP
+The predicate procedure is called once for each
+event in the queue until it finds a match. 
+After finding a match, the predicate procedure must return 
+.ZN True .
+If it did not find a match, it must return
+.ZN False .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
+XSendEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XInitImage.man b/libX11/man/XInitImage.man
index 793c6cb4b..efd9478fa 100644
--- a/libX11/man/XInitImage.man
+++ b/libX11/man/XInitImage.man
@@ -1,314 +1,253 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XCreateImage __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XInitImage, XCreateImage, XGetPixel, XPutPixel, XSubImage, XAddPixel, XDestroyImage \- image utilities

-.SH SYNTAX

-.HP

-Status XInitImage\^(\^XImage *\fIimage\fP\^); 

-.HP

-XImage *XCreateImage\^(\^Display *\fIdisplay\fP\^, Visual *\fIvisual\fP\^,

-unsigned int \fIdepth\fP\^, int \fIformat\fP\^, int \fIoffset\fP\^, char

-*\fIdata\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, int

-\fIbitmap_pad\fP\^, int \fIbytes_per_line\fP\^); 

-.HP

-unsigned long XGetPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int

-\fIy\fP\^); 

-.HP

-int XPutPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,

-unsigned long \fIpixel\fP\^); 

-.HP

-XImage *XSubImage\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,

-unsigned int \fIsubimage_width\fP\^, unsigned int \fIsubimage_height\fP\^); 

-.HP

-int XAddPixel\^(\^XImage *\fIximage\fP\^, long \fIvalue\fP\^); 

-.HP

-int XDestroyImage\^(\^XImage *\^\fIximage\fP\^); 

-.SH ARGUMENTS

-.IP \fIbitmap_pad\fP 1i

-Specifies the quantum of a scanline (8, 16, or 32).

-In other words, the start of one scanline is separated in client memory from 

-the start of the next scanline by an integer multiple of this many bits.  

-.IP \fIbytes_per_line\fP 1i

-Specifies the number of bytes in the client image between

-the start of one scanline and the start of the next.  

-.IP \fIdata\fP 1i

-Specifies the image data.

-.IP \fIdepth\fP 1i

-Specifies the depth of the image.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIformat\fP 1i

-Specifies the format for the image.

-You can pass

-.ZN XYBitmap ,

-.ZN XYPixmap ,

-or 

-.ZN ZPixmap .

-.IP \fIheight\fP 1i

-Specifies the height of the image, in pixels.

-.IP \fIoffset\fP 1i

-Specifies the number of pixels to ignore at the beginning of the scanline.

-.IP \fIpixel\fP 1i

-Specifies the new pixel value.

-.IP \fIsubimage_height\fP 1i

-Specifies the height of the new subimage, in pixels.

-.IP \fIsubimage_width\fP 1i

-Specifies the width of the new subimage, in pixels.

-.IP \fIvalue\fP 1i

-Specifies the constant value that is to be added.

-.IP \fIvisual\fP 1i

-Specifies the

-.ZN Visual

-structure.

-.IP \fIwidth\fP 1i

-Specifies the width of the image, in pixels.

-.IP \fIximage\fP 1i

-Specifies the image.

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates.

-.SH DESCRIPTION

-The

-.ZN XInitImage

-function initializes the internal image manipulation routines of an

-image structure, based on the values of the various structure members.

-All fields other than the manipulation routines must already be initialized.

-If the bytes_per_line member is zero,

-.ZN XInitImage

-will assume the image data is contiguous in memory and set the

-bytes_per_line member to an appropriate value based on the other

-members; otherwise, the value of bytes_per_line is not changed.

-All of the manipulation routines are initialized to functions

-that other Xlib image manipulation functions need to operate on the

-type of image specified by the rest of the structure.

-.LP

-This function must be called for any image constructed by the client

-before passing it to any other Xlib function.

-Image structures created or returned by Xlib do not need to be

-initialized in this fashion.

-.LP

-This function returns a nonzero status if initialization of the

-structure is successful.  It returns zero if it detected some error

-or inconsistency in the structure, in which case the image is not changed.

-.LP

-The

-.ZN XCreateImage

-function allocates the memory needed for an

-.ZN XImage

-structure for the

-specified display but does not allocate space for the image itself.

-Rather, it initializes the structure byte-order, bit-order, and bitmap-unit

-values from the display and returns a pointer to the 

-.ZN XImage 

-structure.

-The red, green, and blue mask values are defined for Z format images only

-and are derived from the 

-.ZN Visual 

-structure passed in.

-Other values also are passed in.

-The offset permits the rapid displaying of the image without requiring each 

-scanline to be shifted into position.

-If you pass a zero value in bytes_per_line,

-Xlib assumes that the scanlines are contiguous

-in memory and calculates the value of bytes_per_line itself.

-.LP

-Note that when the image is created using

-.ZN XCreateImage ,

-.ZN XGetImage ,

-or

-.ZN XSubImage ,

-the destroy procedure that the 

-.ZN XDestroyImage

-function calls frees both the image structure 

-and the data pointed to by the image structure.

-.LP

-The basic functions used to get a pixel, set a pixel, create a subimage,

-and add a constant value to an image are defined in the image object.

-The functions in this section are really macro invocations of the functions

-in the image object and are defined in

-.hN X11/Xutil.h .

-.LP

-The

-.ZN XGetPixel

-function returns the specified pixel from the named image.

-The pixel value is returned in normalized format (that is,

-the least significant byte of the long is the least significant byte

-of the pixel).

-The image must contain the x and y coordinates.

-.LP

-The

-.ZN XPutPixel

-function overwrites the pixel in the named image with the specified pixel value.

-The input pixel value must be in normalized format

-(that is, the least significant byte of the long is the least significant

-byte of the pixel).

-The image must contain the x and y coordinates.

-.LP

-The

-.ZN XSubImage

-function creates a new image that is a subsection of an existing one.

-It allocates the memory necessary for the new

-.ZN XImage

-structure

-and returns a pointer to the new image.

-The data is copied from the source image,

-and the image must contain the rectangle defined by x, y, subimage_width,

-and subimage_height.

-.LP

-The

-.ZN XAddPixel

-function adds a constant value to every pixel in an image.

-It is useful when you have a base pixel value from allocating

-color resources and need to manipulate the image to that form.

-.LP

-The

-.ZN XDestroyImage

-function deallocates the memory associated with the

-.ZN XImage

-structure.

-.SH "SEE ALSO"

-XPutImage(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XCreateImage __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XInitImage, XCreateImage, XGetPixel, XPutPixel, XSubImage, XAddPixel, XDestroyImage \- image utilities
+.SH SYNTAX
+.HP
+Status XInitImage\^(\^XImage *\fIimage\fP\^); 
+.HP
+XImage *XCreateImage\^(\^Display *\fIdisplay\fP\^, Visual *\fIvisual\fP\^,
+unsigned int \fIdepth\fP\^, int \fIformat\fP\^, int \fIoffset\fP\^, char
+*\fIdata\fP\^, unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, int
+\fIbitmap_pad\fP\^, int \fIbytes_per_line\fP\^); 
+.HP
+unsigned long XGetPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int
+\fIy\fP\^); 
+.HP
+int XPutPixel\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+unsigned long \fIpixel\fP\^); 
+.HP
+XImage *XSubImage\^(\^XImage *\fIximage\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+unsigned int \fIsubimage_width\fP\^, unsigned int \fIsubimage_height\fP\^); 
+.HP
+int XAddPixel\^(\^XImage *\fIximage\fP\^, long \fIvalue\fP\^); 
+.HP
+int XDestroyImage\^(\^XImage *\^\fIximage\fP\^); 
+.SH ARGUMENTS
+.IP \fIbitmap_pad\fP 1i
+Specifies the quantum of a scanline (8, 16, or 32).
+In other words, the start of one scanline is separated in client memory from 
+the start of the next scanline by an integer multiple of this many bits.  
+.IP \fIbytes_per_line\fP 1i
+Specifies the number of bytes in the client image between
+the start of one scanline and the start of the next.  
+.IP \fIdata\fP 1i
+Specifies the image data.
+.IP \fIdepth\fP 1i
+Specifies the depth of the image.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIformat\fP 1i
+Specifies the format for the image.
+You can pass
+.ZN XYBitmap ,
+.ZN XYPixmap ,
+or 
+.ZN ZPixmap .
+.IP \fIheight\fP 1i
+Specifies the height of the image, in pixels.
+.IP \fIoffset\fP 1i
+Specifies the number of pixels to ignore at the beginning of the scanline.
+.IP \fIpixel\fP 1i
+Specifies the new pixel value.
+.IP \fIsubimage_height\fP 1i
+Specifies the height of the new subimage, in pixels.
+.IP \fIsubimage_width\fP 1i
+Specifies the width of the new subimage, in pixels.
+.IP \fIvalue\fP 1i
+Specifies the constant value that is to be added.
+.IP \fIvisual\fP 1i
+Specifies the
+.ZN Visual
+structure.
+.IP \fIwidth\fP 1i
+Specifies the width of the image, in pixels.
+.IP \fIximage\fP 1i
+Specifies the image.
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates.
+.SH DESCRIPTION
+The
+.ZN XInitImage
+function initializes the internal image manipulation routines of an
+image structure, based on the values of the various structure members.
+All fields other than the manipulation routines must already be initialized.
+If the bytes_per_line member is zero,
+.ZN XInitImage
+will assume the image data is contiguous in memory and set the
+bytes_per_line member to an appropriate value based on the other
+members; otherwise, the value of bytes_per_line is not changed.
+All of the manipulation routines are initialized to functions
+that other Xlib image manipulation functions need to operate on the
+type of image specified by the rest of the structure.
+.LP
+This function must be called for any image constructed by the client
+before passing it to any other Xlib function.
+Image structures created or returned by Xlib do not need to be
+initialized in this fashion.
+.LP
+This function returns a nonzero status if initialization of the
+structure is successful.  It returns zero if it detected some error
+or inconsistency in the structure, in which case the image is not changed.
+.LP
+The
+.ZN XCreateImage
+function allocates the memory needed for an
+.ZN XImage
+structure for the
+specified display but does not allocate space for the image itself.
+Rather, it initializes the structure byte-order, bit-order, and bitmap-unit
+values from the display and returns a pointer to the 
+.ZN XImage 
+structure.
+The red, green, and blue mask values are defined for Z format images only
+and are derived from the 
+.ZN Visual 
+structure passed in.
+Other values also are passed in.
+The offset permits the rapid displaying of the image without requiring each 
+scanline to be shifted into position.
+If you pass a zero value in bytes_per_line,
+Xlib assumes that the scanlines are contiguous
+in memory and calculates the value of bytes_per_line itself.
+.LP
+Note that when the image is created using
+.ZN XCreateImage ,
+.ZN XGetImage ,
+or
+.ZN XSubImage ,
+the destroy procedure that the 
+.ZN XDestroyImage
+function calls frees both the image structure 
+and the data pointed to by the image structure.
+.LP
+The basic functions used to get a pixel, set a pixel, create a subimage,
+and add a constant value to an image are defined in the image object.
+The functions in this section are really macro invocations of the functions
+in the image object and are defined in
+.hN X11/Xutil.h .
+.LP
+The
+.ZN XGetPixel
+function returns the specified pixel from the named image.
+The pixel value is returned in normalized format (that is,
+the least significant byte of the long is the least significant byte
+of the pixel).
+The image must contain the x and y coordinates.
+.LP
+The
+.ZN XPutPixel
+function overwrites the pixel in the named image with the specified pixel value.
+The input pixel value must be in normalized format
+(that is, the least significant byte of the long is the least significant
+byte of the pixel).
+The image must contain the x and y coordinates.
+.LP
+The
+.ZN XSubImage
+function creates a new image that is a subsection of an existing one.
+It allocates the memory necessary for the new
+.ZN XImage
+structure
+and returns a pointer to the new image.
+The data is copied from the source image,
+and the image must contain the rectangle defined by x, y, subimage_width,
+and subimage_height.
+.LP
+The
+.ZN XAddPixel
+function adds a constant value to every pixel in an image.
+It is useful when you have a base pixel value from allocating
+color resources and need to manipulate the image to that form.
+.LP
+The
+.ZN XDestroyImage
+function deallocates the memory associated with the
+.ZN XImage
+structure.
+.SH "SEE ALSO"
+XPutImage(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XInitThreads.man b/libX11/man/XInitThreads.man
index 5ebbb64a4..2ca980299 100644
--- a/libX11/man/XInitThreads.man
+++ b/libX11/man/XInitThreads.man
@@ -1,203 +1,142 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XInitThreads __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XInitThreads, XLockDisplay, XUnlockDisplay \- multi-threading support

-.SH SYNTAX

-.HP

-Status XInitThreads\^(void);

-.HP

-void XLockDisplay\^(\^Display *\fIdisplay\fP\^); 

-.HP

-void XUnlockDisplay\^(\^Display *\fIdisplay\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.SH DESCRIPTION

-The

-.ZN XInitThreads

-function initializes Xlib support for concurrent threads.

-This function must be the first Xlib function a

-multi-threaded program calls, and it must complete

-before any other Xlib call is made.

-This function returns a nonzero status if initialization was

-successful; otherwise, it returns zero.

-On systems that do not support threads, this function always returns zero.

-.LP

-It is only necessary to call this function if multiple threads

-might use Xlib concurrently.  If all calls to Xlib functions

-are protected by some other access mechanism (for example,

-a mutual exclusion lock in a toolkit or through explicit client

-programming), Xlib thread initialization is not required.

-It is recommended that single-threaded programs not call this function.

-

-.LP

-The

-.ZN XLockDisplay

-function locks out all other threads from using the specified display.

-Other threads attempting to use the display will block until

-the display is unlocked by this thread.

-Nested calls to

-.ZN XLockDisplay

-work correctly; the display will not actually be unlocked until

-.ZN XUnlockDisplay

-has been called the same number of times as

-.ZN XLockDisplay .

-This function has no effect unless Xlib was successfully initialized

-for threads using

-.ZN XInitThreads .

-.LP

-The

-.ZN XUnlockDisplay

-function allows other threads to use the specified display again.

-Any threads that have blocked on the display are allowed to continue.

-Nested locking works correctly; if

-.ZN XLockDisplay

-has been called multiple times by a thread, then

-.ZN XUnlockDisplay

-must be called an equal number of times before the display is

-actually unlocked.

-This function has no effect unless Xlib was successfully initialized

-for threads using

-.ZN XInitThreads .

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XInitThreads __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XInitThreads, XLockDisplay, XUnlockDisplay \- multi-threading support
+.SH SYNTAX
+.HP
+Status XInitThreads\^(void);
+.HP
+void XLockDisplay\^(\^Display *\fIdisplay\fP\^); 
+.HP
+void XUnlockDisplay\^(\^Display *\fIdisplay\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.SH DESCRIPTION
+The
+.ZN XInitThreads
+function initializes Xlib support for concurrent threads.
+This function must be the first Xlib function a
+multi-threaded program calls, and it must complete
+before any other Xlib call is made.
+This function returns a nonzero status if initialization was
+successful; otherwise, it returns zero.
+On systems that do not support threads, this function always returns zero.
+.LP
+It is only necessary to call this function if multiple threads
+might use Xlib concurrently.  If all calls to Xlib functions
+are protected by some other access mechanism (for example,
+a mutual exclusion lock in a toolkit or through explicit client
+programming), Xlib thread initialization is not required.
+It is recommended that single-threaded programs not call this function.
+
+.LP
+The
+.ZN XLockDisplay
+function locks out all other threads from using the specified display.
+Other threads attempting to use the display will block until
+the display is unlocked by this thread.
+Nested calls to
+.ZN XLockDisplay
+work correctly; the display will not actually be unlocked until
+.ZN XUnlockDisplay
+has been called the same number of times as
+.ZN XLockDisplay .
+This function has no effect unless Xlib was successfully initialized
+for threads using
+.ZN XInitThreads .
+.LP
+The
+.ZN XUnlockDisplay
+function allows other threads to use the specified display again.
+Any threads that have blocked on the display are allowed to continue.
+Nested locking works correctly; if
+.ZN XLockDisplay
+has been called multiple times by a thread, then
+.ZN XUnlockDisplay
+must be called an equal number of times before the display is
+actually unlocked.
+This function has no effect unless Xlib was successfully initialized
+for threads using
+.ZN XInitThreads .
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XInstallColormap.man b/libX11/man/XInstallColormap.man
index 77b4d1350..b3570cb50 100644
--- a/libX11/man/XInstallColormap.man
+++ b/libX11/man/XInstallColormap.man
@@ -1,246 +1,185 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XInstallColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XInstallColormap, XUninstallColormap, XListInstalledColormaps \- control colormaps

-.SH SYNTAX

-.HP

-int XInstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^);

-.HP

-int XUninstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^); 

-.HP

-Colormap *XListInstalledColormaps\^(\^Display *\fIdisplay\fP\^, Window

-\fIw\fP\^, int *\fInum_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fInum_return\fP 1i

-Returns the number of currently installed colormaps.

-.ds Wi that determines the screen

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XInstallColormap

-function installs the specified colormap for its associated screen.

-All windows associated with this colormap immediately display with

-true colors.

-You associated the windows with this colormap when you created them by calling

-.ZN XCreateWindow ,

-.ZN XCreateSimpleWindow ,

-.ZN XChangeWindowAttributes ,

-or

-.ZN XSetWindowColormap .

-.LP

-If the specified colormap is not already an installed colormap, 

-the X server generates a

-.ZN ColormapNotify

-event on each window that has that colormap.

-In addition, for every other colormap that is installed as 

-a result of a call to

-.ZN XInstallColormap ,

-the X server generates a

-.ZN ColormapNotify

-event on each window that has that colormap.

-.LP

-.ZN XInstallColormap

-can generate a

-.ZN BadColor 

-error.

-.LP

-The

-.ZN XUninstallColormap

-function removes the specified colormap from the required

-list for its screen.

-As a result,

-the specified colormap might be uninstalled, 

-and the X server might implicitly install or uninstall additional colormaps.

-Which colormaps get installed or uninstalled is server dependent

-except that the required list must remain installed.

-.LP

-If the specified colormap becomes uninstalled, 

-the X server generates a

-.ZN ColormapNotify

-event on each window that has that colormap.

-In addition, for every other colormap that is installed or uninstalled as a 

-result of a call to 

-.ZN XUninstallColormap ,

-the X server generates a

-.ZN ColormapNotify

-event on each window that has that colormap.

-.LP

-.ZN XUninstallColormap

-can generate a

-.ZN BadColor 

-error.

-.LP

-The

-.ZN XListInstalledColormaps

-function returns a list of the currently installed colormaps for the screen 

-of the specified window.

-The order of the colormaps in the list is not significant

-and is no explicit indication of the required list.

-When the allocated list is no longer needed,

-free it by using

-.ZN XFree .

-.LP

-.ZN XListInstalledColormaps

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XCreateColormap(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XFree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XInstallColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XInstallColormap, XUninstallColormap, XListInstalledColormaps \- control colormaps
+.SH SYNTAX
+.HP
+int XInstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^);
+.HP
+int XUninstallColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^); 
+.HP
+Colormap *XListInstalledColormaps\^(\^Display *\fIdisplay\fP\^, Window
+\fIw\fP\^, int *\fInum_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInum_return\fP 1i
+Returns the number of currently installed colormaps.
+.ds Wi that determines the screen
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XInstallColormap
+function installs the specified colormap for its associated screen.
+All windows associated with this colormap immediately display with
+true colors.
+You associated the windows with this colormap when you created them by calling
+.ZN XCreateWindow ,
+.ZN XCreateSimpleWindow ,
+.ZN XChangeWindowAttributes ,
+or
+.ZN XSetWindowColormap .
+.LP
+If the specified colormap is not already an installed colormap, 
+the X server generates a
+.ZN ColormapNotify
+event on each window that has that colormap.
+In addition, for every other colormap that is installed as 
+a result of a call to
+.ZN XInstallColormap ,
+the X server generates a
+.ZN ColormapNotify
+event on each window that has that colormap.
+.LP
+.ZN XInstallColormap
+can generate a
+.ZN BadColor 
+error.
+.LP
+The
+.ZN XUninstallColormap
+function removes the specified colormap from the required
+list for its screen.
+As a result,
+the specified colormap might be uninstalled, 
+and the X server might implicitly install or uninstall additional colormaps.
+Which colormaps get installed or uninstalled is server dependent
+except that the required list must remain installed.
+.LP
+If the specified colormap becomes uninstalled, 
+the X server generates a
+.ZN ColormapNotify
+event on each window that has that colormap.
+In addition, for every other colormap that is installed or uninstalled as a 
+result of a call to 
+.ZN XUninstallColormap ,
+the X server generates a
+.ZN ColormapNotify
+event on each window that has that colormap.
+.LP
+.ZN XUninstallColormap
+can generate a
+.ZN BadColor 
+error.
+.LP
+The
+.ZN XListInstalledColormaps
+function returns a list of the currently installed colormaps for the screen 
+of the specified window.
+The order of the colormaps in the list is not significant
+and is no explicit indication of the required list.
+When the allocated list is no longer needed,
+free it by using
+.ZN XFree .
+.LP
+.ZN XListInstalledColormaps
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XFree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XInternAtom.man b/libX11/man/XInternAtom.man
index 237ed91c0..3c0039bf0 100644
--- a/libX11/man/XInternAtom.man
+++ b/libX11/man/XInternAtom.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH XInternAtom __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
diff --git a/libX11/man/XIntersectRegion.man b/libX11/man/XIntersectRegion.man
index 05cd28fb4..0686935ba 100644
--- a/libX11/man/XIntersectRegion.man
+++ b/libX11/man/XIntersectRegion.man
@@ -1,225 +1,164 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XIntersectRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XIntersectRegion, XUnionRegion, XUnionRectWithRegion, XSubtractRegion, XXorRegion, XOffsetRegion, XShrinkRegion \- region arithmetic

-.SH SYNTAX

-.HP

-int XIntersectRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region

-\fIdr_return\fP\^); 

-.HP

-int XUnionRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region

-\fIdr_return\fP\^); 

-.HP

-int XUnionRectWithRegion\^(\^XRectangle *\fIrectangle\fP\^, Region

-\fIsrc_region\fP\^, Region \fIdest_region_return\fP\^); 

-.HP

-int XSubtractRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region

-\fIdr_return\fP\^); 

-.HP

-int XXorRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region

-\fIdr_return\fP\^); 

-.HP

-int XOffsetRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 

-.HP

-int XShrinkRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 

-.SH ARGUMENTS

-.IP \fIdest_region_return\fP 1i

-Returns the destination region.

-.IP \fIdr_return\fP 1i

-Returns the result of the computation.

-ds Dy move or shrink

-.IP \fIdx\fP 1i

-.br

-.ns

-.IP \fIdy\fP 1i

-Specify the x and y coordinates,

-which define the amount you want to \*(Dy the specified region.

-.IP \fIr\fP 1i

-Specifies the region.

-.IP \fIrectangle\fP 1i

-Specifies the rectangle.

-.IP \fIsra\fP 1i

-.br

-.ns

-.IP \fIsrb\fP 1i

-Specify the two regions with which you want to perform the computation.

-.IP \fIsrc_region\fP 1i

-Specifies the source region to be used.

-.SH DESCRIPTION

-The

-.ZN XIntersectRegion

-function computes the intersection of two regions.

-.LP

-The

-.ZN XUnionRegion

-function computes the union of two regions.

-.LP

-The

-.ZN XUnionRectWithRegion

-function updates the destination region from a union of the specified rectangle

-and the specified source region.

-.LP

-The

-.ZN XSubtractRegion

-function subtracts srb from sra and stores the results in dr_return.

-.LP

-The

-.ZN XXorRegion

-function calculates the difference between the union and intersection

-of two regions.

-.LP

-The

-.ZN XOffsetRegion

-function moves the specified region by a specified amount.

-.LP

-The

-.ZN XShrinkRegion

-function reduces the specified region by a specified amount.

-Positive values shrink the size of the region,

-and negative values expand the region.

-.SH "SEE ALSO"

-XCreateRegion(__libmansuffix__),

-XDrawRectangle(__libmansuffix__),

-XEmptyRegion(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XIntersectRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XIntersectRegion, XUnionRegion, XUnionRectWithRegion, XSubtractRegion, XXorRegion, XOffsetRegion, XShrinkRegion \- region arithmetic
+.SH SYNTAX
+.HP
+int XIntersectRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XUnionRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XUnionRectWithRegion\^(\^XRectangle *\fIrectangle\fP\^, Region
+\fIsrc_region\fP\^, Region \fIdest_region_return\fP\^); 
+.HP
+int XSubtractRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XXorRegion\^(\^Region \fIsra\fP\^, Region \fIsrb\fP\^, Region
+\fIdr_return\fP\^); 
+.HP
+int XOffsetRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 
+.HP
+int XShrinkRegion\^(\^Region \fIr\fP\^, int \fIdx\fP\^, int \fIdy\fP\^); 
+.SH ARGUMENTS
+.IP \fIdest_region_return\fP 1i
+Returns the destination region.
+.IP \fIdr_return\fP 1i
+Returns the result of the computation.
+ds Dy move or shrink
+.IP \fIdx\fP 1i
+.br
+.ns
+.IP \fIdy\fP 1i
+Specify the x and y coordinates,
+which define the amount you want to \*(Dy the specified region.
+.IP \fIr\fP 1i
+Specifies the region.
+.IP \fIrectangle\fP 1i
+Specifies the rectangle.
+.IP \fIsra\fP 1i
+.br
+.ns
+.IP \fIsrb\fP 1i
+Specify the two regions with which you want to perform the computation.
+.IP \fIsrc_region\fP 1i
+Specifies the source region to be used.
+.SH DESCRIPTION
+The
+.ZN XIntersectRegion
+function computes the intersection of two regions.
+.LP
+The
+.ZN XUnionRegion
+function computes the union of two regions.
+.LP
+The
+.ZN XUnionRectWithRegion
+function updates the destination region from a union of the specified rectangle
+and the specified source region.
+.LP
+The
+.ZN XSubtractRegion
+function subtracts srb from sra and stores the results in dr_return.
+.LP
+The
+.ZN XXorRegion
+function calculates the difference between the union and intersection
+of two regions.
+.LP
+The
+.ZN XOffsetRegion
+function moves the specified region by a specified amount.
+.LP
+The
+.ZN XShrinkRegion
+function reduces the specified region by a specified amount.
+Positive values shrink the size of the region,
+and negative values expand the region.
+.SH "SEE ALSO"
+XCreateRegion(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XEmptyRegion(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XKeymapEvent.man b/libX11/man/XKeymapEvent.man
index e058c9d2c..1fdb5165f 100644
--- a/libX11/man/XKeymapEvent.man
+++ b/libX11/man/XKeymapEvent.man
@@ -1,220 +1,157 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XKeymapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XKeymapEvent \- KeymapNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN KeymapNotify  

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-/\&* generated on EnterWindow and FocusIn when KeymapState selected */

-typedef struct {

-	int type;	/\&* KeymapNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	char key_vector[32];

-} XKeymapEvent;	

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is not used but is present to aid some toolkits.

-The key_vector member is set to the bit vector of the keyboard.

-Each bit set to 1 indicates that the corresponding key 

-is currently pressed.

-The vector is represented as 32 bytes.

-Byte N (from 0) contains the bits for keys 8N to 8N + 7 

-with the least significant bit in the byte representing key 8N.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XKeymapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XKeymapEvent \- KeymapNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN KeymapNotify  
+events contains:
+.LP
+.Ds 0
+/\&* generated on EnterWindow and FocusIn when KeymapState selected */
+typedef struct {
+        int type;       /\&* KeymapNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        char key_vector[32];
+} XKeymapEvent; 
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is not used but is present to aid some toolkits.
+The key_vector member is set to the bit vector of the keyboard.
+Each bit set to 1 indicates that the corresponding key 
+is currently pressed.
+The vector is represented as 32 bytes.
+Byte N (from 0) contains the bits for keys 8N to 8N + 7 
+with the least significant bit in the byte representing key 8N.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XListFonts.man b/libX11/man/XListFonts.man
index 37126dc59..b386ae8a4 100644
--- a/libX11/man/XListFonts.man
+++ b/libX11/man/XListFonts.man
@@ -1,265 +1,204 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XListFonts __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XListFonts, XFreeFontNames, XListFontsWithInfo, XFreeFontInfo \- obtain or free font names and information

-.SH SYNTAX

-.HP

-char **XListFonts\^(\^Display *\^\fIdisplay\fP\^, char *\^\fIpattern\fP\^, int

-\fImaxnames\fP\^, int *\^\fIactual_count_return\fP\^); 

-.HP

-int XFreeFontNames\^(\^char *\fIlist\fP\^[\^]\^); 

-.HP

-char **XListFontsWithInfo\^(\^Display *\fIdisplay\fP\^, char *\fIpattern\fP\^,

-int \fImaxnames\fP\^, int *\fIcount_return\fP\^, XFontStruct

-**\fIinfo_return\fP\^); 

-.HP

-int XFreeFontInfo(\^char **\fInames\fP\^, XFontStruct *\fIfree_info\fP, int

-\fIactual_count\fP\^); 

-.SH ARGUMENTS

-.IP \fIactual_count\fP 1i

-Specifies the actual number of font names.

-

-.IP \fIactual_count_return\fP 1i

-Returns the actual number of font names.

-.IP \fIcount_return\fP 1i

-Returns the actual number of matched font names.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIinfo_return\fP 1i

-Returns the font information.

-.IP \fIfree_info\fP 1i

-Specifies the font information.

-

-.IP \fIlist\fP 1i

-Specifies the array of strings you want to free.

-.IP \fImaxnames\fP 1i

-Specifies the maximum number of names to be returned.

-.IP \fInames\fP 1i

-Specifies the list of font names.

-

-.IP \fIpattern\fP 1i

-Specifies the null-terminated pattern string that can contain wildcard 

-characters.

-.SH DESCRIPTION

-The

-.ZN XListFonts

-function returns an array of available font names 

-(as controlled by the font search path; see

-.ZN XSetFontPath )

-that match the string you passed to the pattern argument.

-The pattern string can contain any characters,

-but each asterisk (*) is a wildcard for any number of characters,

-and each question mark (?) is a wildcard for a single character.

-If the pattern string is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-Each returned string is null-terminated.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned strings are in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-If there are no matching font names,

-.ZN XListFonts

-returns NULL.

-The client should call

-.ZN XFreeFontNames

-when finished with the result to free the memory.

-.LP

-The

-.ZN XFreeFontNames

-function frees the array and strings returned by

-.ZN XListFonts 

-or

-.ZN XListFontsWithInfo .

-.LP

-The

-.ZN XListFontsWithInfo

-function returns a list of font names that match the specified pattern and their

-associated font information.

-The list of names is limited to size specified by maxnames.

-The information returned for each font is identical to what

-.ZN XLoadQueryFont

-would return except that the per-character metrics are not returned.

-The pattern string can contain any characters,

-but each asterisk (*) is a wildcard for any number of characters,

-and each question mark (?) is a wildcard for a single character.

-If the pattern string is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-Each returned string is null-terminated.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned strings are in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-If there are no matching font names,

-.ZN XListFontsWithInfo

-returns NULL.

-.LP

-To free only the allocated name array,

-the client should call

-.ZN XFreeFontNames .

-To free both the name array and the font information array

-or to free just the font information array,

-the client should call

-.ZN XFreeFontInfo .

-.LP

-The

-.ZN XFreeFontInfo

-function frees a font structure or an array of font structures

-and optionally an array of font names.

-If NULL is passed for names, no font names are freed.

-If a font structure for an open font (returned by

-.ZN XLoadQueryFont )

-is passed, the structure is freed,

-but the font is not closed; use

-.ZN XUnloadFont

-to close the font.

-.LP

-Note that

-.ZN XListFontsWithInfo

-is not thread-safe. If other threads make X requests on the same

-.ZN Display ,

-then this function's behavior is undefined.

-.SH "SEE ALSO"

-XLoadFont(__libmansuffix__),

-XSetFontPath(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XListFonts __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XListFonts, XFreeFontNames, XListFontsWithInfo, XFreeFontInfo \- obtain or free font names and information
+.SH SYNTAX
+.HP
+char **XListFonts\^(\^Display *\^\fIdisplay\fP\^, char *\^\fIpattern\fP\^, int
+\fImaxnames\fP\^, int *\^\fIactual_count_return\fP\^); 
+.HP
+int XFreeFontNames\^(\^char *\fIlist\fP\^[\^]\^); 
+.HP
+char **XListFontsWithInfo\^(\^Display *\fIdisplay\fP\^, char *\fIpattern\fP\^,
+int \fImaxnames\fP\^, int *\fIcount_return\fP\^, XFontStruct
+**\fIinfo_return\fP\^); 
+.HP
+int XFreeFontInfo(\^char **\fInames\fP\^, XFontStruct *\fIfree_info\fP, int
+\fIactual_count\fP\^); 
+.SH ARGUMENTS
+.IP \fIactual_count\fP 1i
+Specifies the actual number of font names.
+
+.IP \fIactual_count_return\fP 1i
+Returns the actual number of font names.
+.IP \fIcount_return\fP 1i
+Returns the actual number of matched font names.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIinfo_return\fP 1i
+Returns the font information.
+.IP \fIfree_info\fP 1i
+Specifies the font information.
+
+.IP \fIlist\fP 1i
+Specifies the array of strings you want to free.
+.IP \fImaxnames\fP 1i
+Specifies the maximum number of names to be returned.
+.IP \fInames\fP 1i
+Specifies the list of font names.
+
+.IP \fIpattern\fP 1i
+Specifies the null-terminated pattern string that can contain wildcard 
+characters.
+.SH DESCRIPTION
+The
+.ZN XListFonts
+function returns an array of available font names 
+(as controlled by the font search path; see
+.ZN XSetFontPath )
+that match the string you passed to the pattern argument.
+The pattern string can contain any characters,
+but each asterisk (*) is a wildcard for any number of characters,
+and each question mark (?) is a wildcard for a single character.
+If the pattern string is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+Each returned string is null-terminated.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned strings are in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+If there are no matching font names,
+.ZN XListFonts
+returns NULL.
+The client should call
+.ZN XFreeFontNames
+when finished with the result to free the memory.
+.LP
+The
+.ZN XFreeFontNames
+function frees the array and strings returned by
+.ZN XListFonts 
+or
+.ZN XListFontsWithInfo .
+.LP
+The
+.ZN XListFontsWithInfo
+function returns a list of font names that match the specified pattern and their
+associated font information.
+The list of names is limited to size specified by maxnames.
+The information returned for each font is identical to what
+.ZN XLoadQueryFont
+would return except that the per-character metrics are not returned.
+The pattern string can contain any characters,
+but each asterisk (*) is a wildcard for any number of characters,
+and each question mark (?) is a wildcard for a single character.
+If the pattern string is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+Each returned string is null-terminated.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned strings are in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+If there are no matching font names,
+.ZN XListFontsWithInfo
+returns NULL.
+.LP
+To free only the allocated name array,
+the client should call
+.ZN XFreeFontNames .
+To free both the name array and the font information array
+or to free just the font information array,
+the client should call
+.ZN XFreeFontInfo .
+.LP
+The
+.ZN XFreeFontInfo
+function frees a font structure or an array of font structures
+and optionally an array of font names.
+If NULL is passed for names, no font names are freed.
+If a font structure for an open font (returned by
+.ZN XLoadQueryFont )
+is passed, the structure is freed,
+but the font is not closed; use
+.ZN XUnloadFont
+to close the font.
+.LP
+Note that
+.ZN XListFontsWithInfo
+is not thread-safe. If other threads make X requests on the same
+.ZN Display ,
+then this function's behavior is undefined.
+.SH "SEE ALSO"
+XLoadFont(__libmansuffix__),
+XSetFontPath(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XLoadFont.man b/libX11/man/XLoadFont.man
index 008d6d1ba..2d2d1422d 100644
--- a/libX11/man/XLoadFont.man
+++ b/libX11/man/XLoadFont.man
@@ -1,539 +1,478 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.de EX

-.sp

-.nf

-.ft CW

-..

-.de EE

-.ft R

-.fi

-.sp

-..

-.TH XLoadFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures

-.SH SYNTAX

-.HP

-Font XLoadFont\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP\^); 

-.HP

-XFontStruct *XQueryFont\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^); 

-.HP

-XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, char

-*\fIname\fP\^); 

-.HP

-int XFreeFont\^(\^Display *\fIdisplay\fP\^, XFontStruct *\fIfont_struct\fP\^);

-.HP

-Bool XGetFontProperty\^(\^XFontStruct *\fIfont_struct\fP\^, Atom \fIatom\fP\^,

-unsigned long *\fIvalue_return\fP\^); 

-.HP

-int XUnloadFont\^(\^Display *\fIdisplay\fP\^, Font \fIfont\fP\^); 

-.SH ARGUMENTS

-.IP \fIatom\fP 1i

-Specifies the atom for the property name you want returned.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfont\fP 1i

-Specifies the font.

-.IP \fIfont_ID\fP 1i

-Specifies the font ID or the 

-.ZN GContext

-ID.

-.IP \fIfont_struct\fP 1i

-Specifies the storage associated with the font.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIname\fP 1i

-Specifies the name of the font,

-which is a null-terminated string.

-.IP \fIvalue_return\fP 1i

-Returns the value of the font property.

-.SH DESCRIPTION

-The

-.ZN XLoadFont

-function loads the specified font and returns its associated font ID.

-If the font name is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-When the characters ``?'' and ``*'' are used in a font name, a

-pattern match is performed and any matching font is used.

-In the pattern, 

-the ``?'' character will match any single character, 

-and the ``*'' character will match any number of characters.

-A structured format for font names is specified in the X Consortium standard 

-\fIX Logical Font Description Conventions\fP.

-If 

-.ZN XLoadFont

-was unsuccessful at loading the specified font, 

-a 

-.ZN BadName 

-error results.

-Fonts are not associated with a particular screen 

-and can be stored as a component

-of any GC.

-When the font is no longer needed, call 

-.ZN XUnloadFont .

-.LP

-.ZN XLoadFont

-can generate

-.ZN BadAlloc 

-and

-.ZN BadName 

-errors.

-.LP

-The

-.ZN XQueryFont

-function returns a pointer to the

-.ZN XFontStruct

-structure, which contains information associated with the font.

-You can query a font or the font stored in a GC.

-The font ID stored in the 

-.ZN XFontStruct

-structure will be the 

-.ZN GContext 

-ID, and you need to be careful when using this ID in other functions

-(see

-.ZN XGContextFromGC ).

-If the font does not exist,

-.ZN XQueryFont

-returns NULL.

-To free this data, use

-.ZN XFreeFontInfo .

-.LP

-.ZN XLoadQueryFont

-can generate a

-.ZN BadAlloc 

-error.

-.LP

-The

-.ZN XLoadQueryFont

-function provides the most common way for accessing a font.

-.ZN XLoadQueryFont

-both opens (loads) the specified font and returns a pointer to the

-appropriate

-.ZN XFontStruct

-structure.

-If the font name is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-If the font does not exist,

-.ZN XLoadQueryFont

-returns NULL.

-.LP

-The

-.ZN XFreeFont

-function deletes the association between the font resource ID and the specified 

-font and frees the

-.ZN XFontStruct

-structure.

-The font itself will be freed when no other resource references it.

-The data and the font should not be referenced again.

-.LP

-.ZN XFreeFont

-can generate a

-.ZN BadFont 

-error.

-.LP

-Given the atom for that property,

-the

-.ZN XGetFontProperty

-function returns the value of the specified font property. 

-.ZN XGetFontProperty

-also returns 

-.ZN False

-if the property was not defined or 

-.ZN True

-if it was defined.

-A set of predefined atoms exists for font properties,

-which can be found in

-.hN X11/Xatom.h .

-This set contains the standard properties associated with

-a font.

-Although it is not guaranteed,

-it is likely that the predefined font properties will be present.

-.LP

-The

-.ZN XUnloadFont

-function deletes the association between the font resource ID and the specified font.

-The font itself will be freed when no other resource references it.

-The font should not be referenced again.

-.LP

-.ZN XUnloadFont

-can generate a

-.ZN BadFont 

-error.

-.SH STRUCTURES

-The

-.ZN XFontStruct

-structure contains all of the information for the font

-and consists of the font-specific information as well as

-a pointer to an array of

-.ZN XCharStruct

-structures for the

-characters contained in the font.

-The

-.ZN XFontStruct ,

-.ZN XFontProp ,

-and

-.ZN XCharStruct

-structures contain:

-.LP

-.IN "XCharStruct" "" "@DEF@"

-.EX

-typedef struct {

-	short lbearing;	/\&* origin to left edge of raster */

-	short rbearing;	/\&* origin to right edge of raster */

-	short width;	/\&* advance to next char's origin */

-	short ascent;	/\&* baseline to top edge of raster */

-	short descent;	/\&* baseline to bottom edge of raster */

-	unsigned short attributes;	/\&* per char flags (not predefined) */

-} XCharStruct;

-.EE

-.LP

-.IN "XFontProp" "" "@DEF@"

-.EX

-typedef struct {

-	Atom	name;

-	unsigned long card32;

-} XFontProp;

-.EE

-.LP

-.IN "XChar2b" "" "@DEF@"

-.EX

-typedef struct {	/\&* normal 16 bit characters are two bytes */

-    unsigned char byte1;

-    unsigned char byte2;

-} XChar2b;

-.EE

-.LP

-.IN "XFontStruct" "" "@DEF@"

-.EX

-typedef struct {

-	XExtData *ext_data;	/\&* hook for extension to hang data */

-	Font fid;	/\&* Font id for this font */

-	unsigned direction;	/\&* hint about the direction font is painted */

-	unsigned min_char_or_byte2;	/\&* first character */

-	unsigned max_char_or_byte2;	/\&* last character */

-	unsigned min_byte1;	/\&* first row that exists */

-	unsigned max_byte1;	/\&* last row that exists */

-	Bool all_chars_exist;	/\&* flag if all characters have nonzero size */

-	unsigned default_char;	/\&* char to print for undefined character */

-	int n_properties;	/\&* how many properties there are */

-	XFontProp *properties;	/\&* pointer to array of additional properties */

-	XCharStruct min_bounds;	/\&* minimum bounds over all existing char */

-	XCharStruct max_bounds;	/\&* maximum bounds over all existing char */

-	XCharStruct *per_char;	/\&* first_char to last_char information */

-	int ascent;	/\&* logical extent above baseline for spacing */

-	int descent;	/\&* logical decent below baseline for spacing */

-} XFontStruct;

-.EE

-.LP

-X supports single byte/character, two bytes/character matrix,

-and 16-bit character text operations.

-Note that any of these forms can be used with a font, but a

-single byte/character text request can only specify a single byte

-(that is, the first row of a 2-byte font).

-You should view 2-byte fonts as a two-dimensional matrix of defined

-characters: byte1 specifies the range of defined rows and

-byte2 defines the range of defined columns of the font.

-Single byte/character fonts have one row defined, and the byte2 range

-specified in the structure defines a range of characters.

-.LP

-The bounding box of a character is defined by the 

-.ZN XCharStruct 

-of that character.

-When characters are absent from a font,

-the default_char is used.

-When fonts have all characters of the same size,

-only the information in the

-.ZN XFontStruct

-min and max bounds are used.

-.LP

-The members of the 

-.ZN XFontStruct 

-have the following semantics:

-.IP \(bu 5

-The direction member can be either 

-.ZN FontLeftToRight 

-or 

-.ZN FontRightToLeft . 

-It is just a hint as to whether most 

-.ZN XCharStruct 

-elements 

-have a positive 

-.Pn ( FontLeftToRight ) 

-or a negative 

-.Pn ( FontRightToLeft )

-character width 

-metric.

-The core protocol defines no support for vertical text.

-.IP \(bu 5

-If the min_byte1 and max_byte1 members are both zero, min_char_or_byte2

-specifies the linear character index corresponding to the first element

-of the per_char array, and max_char_or_byte2 specifies the linear character

-index of the last element.

-.IP

-If either min_byte1 or max_byte1 are nonzero, both

-min_char_or_byte2 and max_char_or_byte2 are less than 256, 

-and the 2-byte character index values corresponding to the

-per_char array element N (counting from 0) are:

-.IP

-.EX

-	byte1 = N/D + min_byte1

-	byte2 = N\\D + min_char_or_byte2

-.EE

-where:

-.EX

-        D = max_char_or_byte2 \- min_char_or_byte2 + 1

-        / = integer division

-        \e\e = integer modulus

-.EE

-.IP \(bu 5

-If the per_char pointer is NULL, 

-all glyphs between the first and last character indexes

-inclusive have the same information,

-as given by both min_bounds and max_bounds.

-.IP \(bu 5

-If all_chars_exist is 

-.ZN True ,

-all characters in the per_char array have nonzero bounding boxes.

-.IP \(bu 5

-The default_char member specifies the character that will be used when an

-undefined or nonexistent character is printed.  

-The default_char is a 16-bit character (not a 2-byte character).

-For a font using 2-byte matrix format, 

-the default_char has byte1 in the most-significant byte

-and byte2 in the least significant byte.

-If the default_char itself specifies an undefined or nonexistent character, 

-no printing is performed for an undefined or nonexistent character.

-.IP \(bu 5

-The min_bounds and max_bounds members contain the most extreme values of

-each individual 

-.ZN XCharStruct 

-component over all elements of this array

-(and ignore nonexistent characters).

-The bounding box of the font (the smallest

-rectangle enclosing the shape obtained by superimposing all of the

-characters at the same origin [x,y]) has its upper-left coordinate at:

-.Ds

-	[x + min_bounds.lbearing, y \- max_bounds.ascent]

-.De

-.IP

-Its width is:

-.Ds

-	max_bounds.rbearing \- min_bounds.lbearing

-.De

-.IP

-Its height is:

-.Ds

-	max_bounds.ascent + max_bounds.descent

-.De

-.IP \(bu 5

-The ascent member is the logical extent of the font above the baseline that is

-used for determining line spacing.

-Specific characters may extend beyond

-this.

-.IP \(bu 5

-The descent member is the logical extent of the font at or below the

-baseline that is used for determining line spacing.

-Specific characters may extend beyond this.

-.IP \(bu 5

-If the baseline is at Y-coordinate y,

-the logical extent of the font is inclusive between the Y-coordinate 

-values (y \- font.ascent) and (y + font.descent \- 1).

-Typically,

-the minimum interline spacing between rows of text is given

-by ascent + descent.

-.LP

-For a character origin at [x,y],

-the bounding box of a character (that is, 

-the smallest rectangle that encloses the character's shape)

-described in terms of 

-.ZN XCharStruct 

-components is a rectangle with its upper-left corner at:

-.LP

-.Ds

-[x + lbearing, y \- ascent]

-.De

-.LP

-Its width is:

-.LP

-.Ds

-rbearing \- lbearing

-.De

-.LP

-Its height is:

-.LP

-.Ds

-ascent + descent

-.De

-.LP

-The origin for the next character is defined to be:

-.LP

-.Ds

-[x + width, y]

-.De

-.LP

-The lbearing member defines the extent of the left edge of the character ink

-from the origin.

-The rbearing member defines the extent of the right edge of the character ink

-from the origin.

-The ascent member defines the extent of the top edge of the character ink

-from the origin.

-The descent member defines the extent of the bottom edge of the character ink

-from the origin.

-The width member defines the logical width of the character.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadName

-A font or color of the specified name does not exist.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XListFonts(__libmansuffix__),

-XSetFontPath(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
+.TH XLoadFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
+.SH SYNTAX
+.HP
+Font XLoadFont\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP\^); 
+.HP
+XFontStruct *XQueryFont\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^); 
+.HP
+XFontStruct *XLoadQueryFont\^(\^Display *\fIdisplay\fP\^, char
+*\fIname\fP\^); 
+.HP
+int XFreeFont\^(\^Display *\fIdisplay\fP\^, XFontStruct *\fIfont_struct\fP\^);
+.HP
+Bool XGetFontProperty\^(\^XFontStruct *\fIfont_struct\fP\^, Atom \fIatom\fP\^,
+unsigned long *\fIvalue_return\fP\^); 
+.HP
+int XUnloadFont\^(\^Display *\fIdisplay\fP\^, Font \fIfont\fP\^); 
+.SH ARGUMENTS
+.IP \fIatom\fP 1i
+Specifies the atom for the property name you want returned.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfont\fP 1i
+Specifies the font.
+.IP \fIfont_ID\fP 1i
+Specifies the font ID or the 
+.ZN GContext
+ID.
+.IP \fIfont_struct\fP 1i
+Specifies the storage associated with the font.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIname\fP 1i
+Specifies the name of the font,
+which is a null-terminated string.
+.IP \fIvalue_return\fP 1i
+Returns the value of the font property.
+.SH DESCRIPTION
+The
+.ZN XLoadFont
+function loads the specified font and returns its associated font ID.
+If the font name is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+When the characters ``?'' and ``*'' are used in a font name, a
+pattern match is performed and any matching font is used.
+In the pattern, 
+the ``?'' character will match any single character, 
+and the ``*'' character will match any number of characters.
+A structured format for font names is specified in the X Consortium standard 
+\fIX Logical Font Description Conventions\fP.
+If 
+.ZN XLoadFont
+was unsuccessful at loading the specified font, 
+a 
+.ZN BadName 
+error results.
+Fonts are not associated with a particular screen 
+and can be stored as a component
+of any GC.
+When the font is no longer needed, call 
+.ZN XUnloadFont .
+.LP
+.ZN XLoadFont
+can generate
+.ZN BadAlloc 
+and
+.ZN BadName 
+errors.
+.LP
+The
+.ZN XQueryFont
+function returns a pointer to the
+.ZN XFontStruct
+structure, which contains information associated with the font.
+You can query a font or the font stored in a GC.
+The font ID stored in the 
+.ZN XFontStruct
+structure will be the 
+.ZN GContext 
+ID, and you need to be careful when using this ID in other functions
+(see
+.ZN XGContextFromGC ).
+If the font does not exist,
+.ZN XQueryFont
+returns NULL.
+To free this data, use
+.ZN XFreeFontInfo .
+.LP
+.ZN XLoadQueryFont
+can generate a
+.ZN BadAlloc 
+error.
+.LP
+The
+.ZN XLoadQueryFont
+function provides the most common way for accessing a font.
+.ZN XLoadQueryFont
+both opens (loads) the specified font and returns a pointer to the
+appropriate
+.ZN XFontStruct
+structure.
+If the font name is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+If the font does not exist,
+.ZN XLoadQueryFont
+returns NULL.
+.LP
+The
+.ZN XFreeFont
+function deletes the association between the font resource ID and the specified 
+font and frees the
+.ZN XFontStruct
+structure.
+The font itself will be freed when no other resource references it.
+The data and the font should not be referenced again.
+.LP
+.ZN XFreeFont
+can generate a
+.ZN BadFont 
+error.
+.LP
+Given the atom for that property,
+the
+.ZN XGetFontProperty
+function returns the value of the specified font property. 
+.ZN XGetFontProperty
+also returns 
+.ZN False
+if the property was not defined or 
+.ZN True
+if it was defined.
+A set of predefined atoms exists for font properties,
+which can be found in
+.hN X11/Xatom.h .
+This set contains the standard properties associated with
+a font.
+Although it is not guaranteed,
+it is likely that the predefined font properties will be present.
+.LP
+The
+.ZN XUnloadFont
+function deletes the association between the font resource ID and the specified font.
+The font itself will be freed when no other resource references it.
+The font should not be referenced again.
+.LP
+.ZN XUnloadFont
+can generate a
+.ZN BadFont 
+error.
+.SH STRUCTURES
+The
+.ZN XFontStruct
+structure contains all of the information for the font
+and consists of the font-specific information as well as
+a pointer to an array of
+.ZN XCharStruct
+structures for the
+characters contained in the font.
+The
+.ZN XFontStruct ,
+.ZN XFontProp ,
+and
+.ZN XCharStruct
+structures contain:
+.LP
+.IN "XCharStruct" "" "@DEF@"
+.EX
+typedef struct {
+	short lbearing;	/\&* origin to left edge of raster */
+	short rbearing;	/\&* origin to right edge of raster */
+	short width;	/\&* advance to next char's origin */
+	short ascent;	/\&* baseline to top edge of raster */
+	short descent;	/\&* baseline to bottom edge of raster */
+	unsigned short attributes;	/\&* per char flags (not predefined) */
+} XCharStruct;
+.EE
+.LP
+.IN "XFontProp" "" "@DEF@"
+.EX
+typedef struct {
+	Atom	name;
+	unsigned long card32;
+} XFontProp;
+.EE
+.LP
+.IN "XChar2b" "" "@DEF@"
+.EX
+typedef struct {	/\&* normal 16 bit characters are two bytes */
+    unsigned char byte1;
+    unsigned char byte2;
+} XChar2b;
+.EE
+.LP
+.IN "XFontStruct" "" "@DEF@"
+.EX
+typedef struct {
+	XExtData *ext_data;	/\&* hook for extension to hang data */
+	Font fid;	/\&* Font id for this font */
+	unsigned direction;	/\&* hint about the direction font is painted */
+	unsigned min_char_or_byte2;	/\&* first character */
+	unsigned max_char_or_byte2;	/\&* last character */
+	unsigned min_byte1;	/\&* first row that exists */
+	unsigned max_byte1;	/\&* last row that exists */
+	Bool all_chars_exist;	/\&* flag if all characters have nonzero size */
+	unsigned default_char;	/\&* char to print for undefined character */
+	int n_properties;	/\&* how many properties there are */
+	XFontProp *properties;	/\&* pointer to array of additional properties */
+	XCharStruct min_bounds;	/\&* minimum bounds over all existing char */
+	XCharStruct max_bounds;	/\&* maximum bounds over all existing char */
+	XCharStruct *per_char;	/\&* first_char to last_char information */
+	int ascent;	/\&* logical extent above baseline for spacing */
+	int descent;	/\&* logical decent below baseline for spacing */
+} XFontStruct;
+.EE
+.LP
+X supports single byte/character, two bytes/character matrix,
+and 16-bit character text operations.
+Note that any of these forms can be used with a font, but a
+single byte/character text request can only specify a single byte
+(that is, the first row of a 2-byte font).
+You should view 2-byte fonts as a two-dimensional matrix of defined
+characters: byte1 specifies the range of defined rows and
+byte2 defines the range of defined columns of the font.
+Single byte/character fonts have one row defined, and the byte2 range
+specified in the structure defines a range of characters.
+.LP
+The bounding box of a character is defined by the 
+.ZN XCharStruct 
+of that character.
+When characters are absent from a font,
+the default_char is used.
+When fonts have all characters of the same size,
+only the information in the
+.ZN XFontStruct
+min and max bounds are used.
+.LP
+The members of the 
+.ZN XFontStruct 
+have the following semantics:
+.IP \(bu 5
+The direction member can be either 
+.ZN FontLeftToRight 
+or 
+.ZN FontRightToLeft . 
+It is just a hint as to whether most 
+.ZN XCharStruct 
+elements 
+have a positive 
+.Pn ( FontLeftToRight ) 
+or a negative 
+.Pn ( FontRightToLeft )
+character width 
+metric.
+The core protocol defines no support for vertical text.
+.IP \(bu 5
+If the min_byte1 and max_byte1 members are both zero, min_char_or_byte2
+specifies the linear character index corresponding to the first element
+of the per_char array, and max_char_or_byte2 specifies the linear character
+index of the last element.
+.IP
+If either min_byte1 or max_byte1 are nonzero, both
+min_char_or_byte2 and max_char_or_byte2 are less than 256, 
+and the 2-byte character index values corresponding to the
+per_char array element N (counting from 0) are:
+.IP
+.EX
+	byte1 = N/D + min_byte1
+	byte2 = N\\D + min_char_or_byte2
+.EE
+where:
+.EX
+        D = max_char_or_byte2 \- min_char_or_byte2 + 1
+        / = integer division
+        \e\e = integer modulus
+.EE
+.IP \(bu 5
+If the per_char pointer is NULL, 
+all glyphs between the first and last character indexes
+inclusive have the same information,
+as given by both min_bounds and max_bounds.
+.IP \(bu 5
+If all_chars_exist is 
+.ZN True ,
+all characters in the per_char array have nonzero bounding boxes.
+.IP \(bu 5
+The default_char member specifies the character that will be used when an
+undefined or nonexistent character is printed.  
+The default_char is a 16-bit character (not a 2-byte character).
+For a font using 2-byte matrix format, 
+the default_char has byte1 in the most-significant byte
+and byte2 in the least significant byte.
+If the default_char itself specifies an undefined or nonexistent character, 
+no printing is performed for an undefined or nonexistent character.
+.IP \(bu 5
+The min_bounds and max_bounds members contain the most extreme values of
+each individual 
+.ZN XCharStruct 
+component over all elements of this array
+(and ignore nonexistent characters).
+The bounding box of the font (the smallest
+rectangle enclosing the shape obtained by superimposing all of the
+characters at the same origin [x,y]) has its upper-left coordinate at:
+.Ds
+	[x + min_bounds.lbearing, y \- max_bounds.ascent]
+.De
+.IP
+Its width is:
+.Ds
+	max_bounds.rbearing \- min_bounds.lbearing
+.De
+.IP
+Its height is:
+.Ds
+	max_bounds.ascent + max_bounds.descent
+.De
+.IP \(bu 5
+The ascent member is the logical extent of the font above the baseline that is
+used for determining line spacing.
+Specific characters may extend beyond
+this.
+.IP \(bu 5
+The descent member is the logical extent of the font at or below the
+baseline that is used for determining line spacing.
+Specific characters may extend beyond this.
+.IP \(bu 5
+If the baseline is at Y-coordinate y,
+the logical extent of the font is inclusive between the Y-coordinate 
+values (y \- font.ascent) and (y + font.descent \- 1).
+Typically,
+the minimum interline spacing between rows of text is given
+by ascent + descent.
+.LP
+For a character origin at [x,y],
+the bounding box of a character (that is, 
+the smallest rectangle that encloses the character's shape)
+described in terms of 
+.ZN XCharStruct 
+components is a rectangle with its upper-left corner at:
+.LP
+.Ds
+[x + lbearing, y \- ascent]
+.De
+.LP
+Its width is:
+.LP
+.Ds
+rbearing \- lbearing
+.De
+.LP
+Its height is:
+.LP
+.Ds
+ascent + descent
+.De
+.LP
+The origin for the next character is defined to be:
+.LP
+.Ds
+[x + width, y]
+.De
+.LP
+The lbearing member defines the extent of the left edge of the character ink
+from the origin.
+The rbearing member defines the extent of the right edge of the character ink
+from the origin.
+The ascent member defines the extent of the top edge of the character ink
+from the origin.
+The descent member defines the extent of the bottom edge of the character ink
+from the origin.
+The width member defines the logical width of the character.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadName
+A font or color of the specified name does not exist.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XListFonts(__libmansuffix__),
+XSetFontPath(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XLookupKeysym.man b/libX11/man/XLookupKeysym.man
index bdbfe3170..0ec8f4fda 100644
--- a/libX11/man/XLookupKeysym.man
+++ b/libX11/man/XLookupKeysym.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH XLookupKeysym __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
diff --git a/libX11/man/XMapEvent.man b/libX11/man/XMapEvent.man
index afebe0e1c..1251c24d9 100644
--- a/libX11/man/XMapEvent.man
+++ b/libX11/man/XMapEvent.man
@@ -1,290 +1,225 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XMapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XMapEvent, XMappingEvent \- MapNotify and MappingNotify event structures

-.SH STRUCTURES

-The structure for

-.ZN MapNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* MapNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	Bool override_redirect;	/\&* boolean, is override set... */

-} XMapEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the window that was mapped or to its parent,

-depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected.

-The window member is set to the window that was mapped.

-The override_redirect member is set to the override-redirect attribute

-of the window.

-Window manager clients normally should ignore this window 

-if the override-redirect attribute is

-.ZN True ,

-because these events usually are generated from pop-ups,

-which override structure control.

-.LP

-The structure for

-.ZN MappingNotify

-events is:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* MappingNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;	/\&* unused */

-	int request;	/\&* one of MappingModifier, MappingKeyboard,

-		   MappingPointer */

-	int first_keycode;	/\&* first keycode */

-	int count;	/\&* defines range of change w. first_keycode*/

-} XMappingEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The request member is set to indicate the kind of mapping change that occurred

-and can be

-.ZN MappingModifier ,

-.ZN MappingKeyboard ,

-.ZN MappingPointer .

-If it is

-.ZN MappingModifier ,

-the modifier mapping was changed.

-If it is

-.ZN MappingKeyboard ,

-the keyboard mapping was changed.

-If it is

-.ZN MappingPointer ,

-the pointer button mapping was changed. 

-The first_keycode and count members are set only 

-if the request member was set to

-.ZN MappingKeyboard .

-The number in first_keycode represents the first number in the range 

-of the altered mapping, 

-and count represents the number of keycodes altered.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XMapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XMapEvent, XMappingEvent \- MapNotify and MappingNotify event structures
+.SH STRUCTURES
+The structure for
+.ZN MapNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* MapNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        Bool override_redirect; /\&* boolean, is override set... */
+} XMapEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the window that was mapped or to its parent,
+depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected.
+The window member is set to the window that was mapped.
+The override_redirect member is set to the override-redirect attribute
+of the window.
+Window manager clients normally should ignore this window 
+if the override-redirect attribute is
+.ZN True ,
+because these events usually are generated from pop-ups,
+which override structure control.
+.LP
+The structure for
+.ZN MappingNotify
+events is:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* MappingNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;  /\&* unused */
+        int request;    /\&* one of MappingModifier, MappingKeyboard,
+                   MappingPointer */
+        int first_keycode;      /\&* first keycode */
+        int count;      /\&* defines range of change w. first_keycode*/
+} XMappingEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The request member is set to indicate the kind of mapping change that occurred
+and can be
+.ZN MappingModifier ,
+.ZN MappingKeyboard ,
+.ZN MappingPointer .
+If it is
+.ZN MappingModifier ,
+the modifier mapping was changed.
+If it is
+.ZN MappingKeyboard ,
+the keyboard mapping was changed.
+If it is
+.ZN MappingPointer ,
+the pointer button mapping was changed. 
+The first_keycode and count members are set only 
+if the request member was set to
+.ZN MappingKeyboard .
+The number in first_keycode represents the first number in the range 
+of the altered mapping, 
+and count represents the number of keycodes altered.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XMapRequestEvent.man b/libX11/man/XMapRequestEvent.man
index eddaefd52..30fc860aa 100644
--- a/libX11/man/XMapRequestEvent.man
+++ b/libX11/man/XMapRequestEvent.man
@@ -1,214 +1,151 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XMapRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XMapRequestEvent \- MapRequest event structure

-.SH STRUCTURES

-The structure for

-.ZN MapRequest

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* MapRequest */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window parent;

-	Window window;

-} XMapRequestEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The parent member is set to the parent window.

-The window member is set to the window to be mapped.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XMapRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XMapRequestEvent \- MapRequest event structure
+.SH STRUCTURES
+The structure for
+.ZN MapRequest
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* MapRequest */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window parent;
+        Window window;
+} XMapRequestEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The parent member is set to the parent window.
+The window member is set to the window to be mapped.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XMapWindow.man b/libX11/man/XMapWindow.man
index 1719715ae..94d28f18d 100644
--- a/libX11/man/XMapWindow.man
+++ b/libX11/man/XMapWindow.man
@@ -1,277 +1,216 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XMapWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XMapWindow, XMapRaised, XMapSubwindows \- map windows

-.SH SYNTAX

-.HP

-int XMapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XMapRaised\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XMapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XMapWindow

-function

-maps the window and all of its

-subwindows that have had map requests.

-Mapping a window that has an unmapped ancestor does not display the

-window but marks it as eligible for display when the ancestor becomes

-mapped.

-Such a window is called unviewable.

-When all its ancestors are mapped,

-the window becomes viewable

-and will be visible on the screen if it is not obscured by another window.

-This function has no effect if the window is already mapped.

-.LP

-If the override-redirect of the window is

-.ZN False 

-and if some other client has selected

-.ZN SubstructureRedirectMask

-on the parent window, then the X server generates a

-.ZN MapRequest

-event, and the

-.ZN XMapWindow

-function does not map the window.

-Otherwise, the window is mapped, and the X server generates a

-.ZN MapNotify

-event.

-.LP

-If the window becomes viewable and no earlier contents for it are remembered,

-the X server tiles the window with its background.

-If the window's background is undefined,

-the existing screen contents are not

-altered, and the X server generates zero or more 

-.ZN Expose

-events.

-If backing-store was maintained while the window was unmapped, no 

-.ZN Expose

-events

-are generated.

-If backing-store will now be maintained, 

-a full-window exposure is always generated.

-Otherwise, only visible regions may be reported.

-Similar tiling and exposure take place for any newly viewable inferiors.

-.LP

-.IN "XMapWindow"

-If the window is an

-.ZN InputOutput 

-window,

-.ZN XMapWindow

-generates 

-.ZN Expose 

-events on each 

-.ZN InputOutput

-window that it causes to be displayed.

-If the client maps and paints the window 

-and if the client begins processing events, 

-the window is painted twice.

-To avoid this,

-first ask for 

-.ZN Expose 

-events and then map the window,

-so the client processes input events as usual.

-The event list will include 

-.ZN Expose 

-for each

-window that has appeared on the screen. 

-The client's normal response to

-an 

-.ZN Expose 

-event should be to repaint the window.

-This method usually leads to simpler programs and to proper interaction

-with window managers.

-.LP

-.ZN XMapWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XMapRaised

-function

-essentially is similar to

-.ZN XMapWindow

-in that it maps the window and all of its

-subwindows that have had map requests.

-However, it also raises the specified window to the top of the stack.

-.LP

-.ZN XMapRaised

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XMapSubwindows

-.IN "XMapSubwindows"

-function maps all subwindows for a specified window in top-to-bottom stacking 

-order.

-The X server generates

-.ZN Expose

-events on each newly displayed window.

-This may be much more efficient than mapping many windows

-one at a time because the server needs to perform much of the work

-only once, for all of the windows, rather than for each window.

-.LP

-.ZN XMapSubwindows

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XRaiseWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XMapWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XMapWindow, XMapRaised, XMapSubwindows \- map windows
+.SH SYNTAX
+.HP
+int XMapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XMapRaised\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XMapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XMapWindow
+function
+maps the window and all of its
+subwindows that have had map requests.
+Mapping a window that has an unmapped ancestor does not display the
+window but marks it as eligible for display when the ancestor becomes
+mapped.
+Such a window is called unviewable.
+When all its ancestors are mapped,
+the window becomes viewable
+and will be visible on the screen if it is not obscured by another window.
+This function has no effect if the window is already mapped.
+.LP
+If the override-redirect of the window is
+.ZN False 
+and if some other client has selected
+.ZN SubstructureRedirectMask
+on the parent window, then the X server generates a
+.ZN MapRequest
+event, and the
+.ZN XMapWindow
+function does not map the window.
+Otherwise, the window is mapped, and the X server generates a
+.ZN MapNotify
+event.
+.LP
+If the window becomes viewable and no earlier contents for it are remembered,
+the X server tiles the window with its background.
+If the window's background is undefined,
+the existing screen contents are not
+altered, and the X server generates zero or more 
+.ZN Expose
+events.
+If backing-store was maintained while the window was unmapped, no 
+.ZN Expose
+events
+are generated.
+If backing-store will now be maintained, 
+a full-window exposure is always generated.
+Otherwise, only visible regions may be reported.
+Similar tiling and exposure take place for any newly viewable inferiors.
+.LP
+.IN "XMapWindow"
+If the window is an
+.ZN InputOutput 
+window,
+.ZN XMapWindow
+generates 
+.ZN Expose 
+events on each 
+.ZN InputOutput
+window that it causes to be displayed.
+If the client maps and paints the window 
+and if the client begins processing events, 
+the window is painted twice.
+To avoid this,
+first ask for 
+.ZN Expose 
+events and then map the window,
+so the client processes input events as usual.
+The event list will include 
+.ZN Expose 
+for each
+window that has appeared on the screen. 
+The client's normal response to
+an 
+.ZN Expose 
+event should be to repaint the window.
+This method usually leads to simpler programs and to proper interaction
+with window managers.
+.LP
+.ZN XMapWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XMapRaised
+function
+essentially is similar to
+.ZN XMapWindow
+in that it maps the window and all of its
+subwindows that have had map requests.
+However, it also raises the specified window to the top of the stack.
+.LP
+.ZN XMapRaised
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XMapSubwindows
+.IN "XMapSubwindows"
+function maps all subwindows for a specified window in top-to-bottom stacking 
+order.
+The X server generates
+.ZN Expose
+events on each newly displayed window.
+This may be much more efficient than mapping many windows
+one at a time because the server needs to perform much of the work
+only once, for all of the windows, rather than for each window.
+.LP
+.ZN XMapSubwindows
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XRaiseWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XNextEvent.man b/libX11/man/XNextEvent.man
index fbffdb40a..2435789e5 100644
--- a/libX11/man/XNextEvent.man
+++ b/libX11/man/XNextEvent.man
@@ -1,309 +1,248 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XNextEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XNextEvent, XPeekEvent, XWindowEvent, XCheckWindowEvent, XMaskEvent, XCheckMaskEvent, XCheckTypedEvent, XCheckTypedWindowEvent \- select events by type

-.SH SYNTAX

-.HP

-int XNextEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 

-.HP

-int XPeekEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 

-.HP

-int XWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long

-\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 

-.HP

-Bool XCheckWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long

-\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 

-.HP

-int XMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^, XEvent

-*\fIevent_return\fP\^); 

-.HP

-Bool XCheckMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^,

-XEvent *\fIevent_return\fP\^); 

-.HP

-Bool XCheckTypedEvent\^(\^Display *\fIdisplay\fP\^, int \fIevent_type\fP\^,

-XEvent *\fIevent_return\fP\^); 

-.HP

-Bool XCheckTypedWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-int \fIevent_type\fP\^, XEvent *\fIevent_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mask\fP 1i

-Specifies the event mask.

-.IP \fIevent_return\fP 1i

-Returns the matched event's associated structure.

-.IP \fIevent_return\fP 1i

-Returns the next event in the queue.

-.IP \fIevent_return\fP 1i

-Returns a copy of the matched event's associated structure.

-.IP \fIevent_type\fP 1i

-Specifies the event type to be compared.

-

-.ds Wi \ whose event uou are interested in

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XNextEvent

-function copies the first event from the event queue into the specified

-.ZN XEvent

-structure and then removes it from the queue.

-If the event queue is empty,

-.ZN XNextEvent

-flushes the output buffer and blocks until an event is received.

-.LP

-The

-.ZN XPeekEvent

-function returns the first event from the event queue,

-but it does not remove the event from the queue.

-If the queue is empty,

-.ZN XPeekEvent

-flushes the output buffer and blocks until an event is received.

-It then copies the event into the client-supplied

-.ZN XEvent

-structure without removing it from the event queue.

-.LP

-The

-.ZN XWindowEvent

-function searches the event queue for an event that matches both the specified

-window and event mask.

-When it finds a match,

-.ZN XWindowEvent

-removes that event from the queue and copies it into the specified

-.ZN XEvent

-structure.

-The other events stored in the queue are not discarded.

-If a matching event is not in the queue,

-.ZN XWindowEvent

-flushes the output buffer and blocks until one is received.

-.LP

-The

-.ZN XCheckWindowEvent

-function searches the event queue and then the events available 

-on the server connection for the first event that matches the specified window

-and event mask.

-If it finds a match,

-.ZN XCheckWindowEvent

-removes that event, copies it into the specified

-.ZN XEvent

-structure, and returns

-.ZN True .

-The other events stored in the queue are not discarded.

-If the event you requested is not available,

-.ZN XCheckWindowEvent

-returns

-.ZN False ,

-and the output buffer will have been flushed.

-.LP

-The

-.ZN XMaskEvent

-function searches the event queue for the events associated with the 

-specified mask.

-When it finds a match,

-.ZN XMaskEvent

-removes that event and copies it into the specified

-.ZN XEvent

-structure.

-The other events stored in the queue are not discarded.

-If the event you requested is not in the queue,

-.ZN XMaskEvent

-flushes the output buffer and blocks until one is received.

-.LP

-The

-.ZN XCheckMaskEvent

-function searches the event queue and then any events available on the

-server connection for the first event that matches the specified mask.

-If it finds a match,

-.ZN XCheckMaskEvent

-removes that event, copies it into the specified

-.ZN XEvent

-structure, and returns

-.ZN True .

-The other events stored in the queue are not discarded.

-If the event you requested is not available,

-.ZN XCheckMaskEvent

-returns

-.ZN False ,

-and the output buffer will have been flushed.

-.LP

-The

-.ZN XCheckTypedEvent

-function searches the event queue and then any events available  

-on the server connection for the first event that matches the specified type.

-If it finds a match,

-.ZN XCheckTypedEvent

-removes that event, copies it into the specified

-.ZN XEvent

-structure, and returns

-.ZN True .

-The other events in the queue are not discarded.

-If the event is not available,

-.ZN XCheckTypedEvent

-returns

-.ZN False ,

-and the output buffer will have been flushed.

-.LP

-The

-.ZN XCheckTypedWindowEvent

-function searches the event queue and then any events available  

-on the server connection for the first event that matches the specified

-type and window.

-If it finds a match,

-.ZN XCheckTypedWindowEvent

-removes the event from the queue, copies it into the specified

-.ZN XEvent

-structure, and returns

-.ZN True .

-The other events in the queue are not discarded.

-If the event is not available,

-.ZN XCheckTypedWindowEvent

-returns

-.ZN False ,

-and the output buffer will have been flushed.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XIfEvent(__libmansuffix__),

-XPutBackEvent(__libmansuffix__),

-XSendEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XNextEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XNextEvent, XPeekEvent, XWindowEvent, XCheckWindowEvent, XMaskEvent, XCheckMaskEvent, XCheckTypedEvent, XCheckTypedWindowEvent \- select events by type
+.SH SYNTAX
+.HP
+int XNextEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XPeekEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^, XEvent *\fIevent_return\fP\^); 
+.HP
+int XMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^, XEvent
+*\fIevent_return\fP\^); 
+.HP
+Bool XCheckMaskEvent\^(\^Display *\fIdisplay\fP\^, long \fIevent_mask\fP\^,
+XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckTypedEvent\^(\^Display *\fIdisplay\fP\^, int \fIevent_type\fP\^,
+XEvent *\fIevent_return\fP\^); 
+.HP
+Bool XCheckTypedWindowEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+int \fIevent_type\fP\^, XEvent *\fIevent_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mask\fP 1i
+Specifies the event mask.
+.IP \fIevent_return\fP 1i
+Returns the matched event's associated structure.
+.IP \fIevent_return\fP 1i
+Returns the next event in the queue.
+.IP \fIevent_return\fP 1i
+Returns a copy of the matched event's associated structure.
+.IP \fIevent_type\fP 1i
+Specifies the event type to be compared.
+
+.ds Wi \ whose event uou are interested in
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XNextEvent
+function copies the first event from the event queue into the specified
+.ZN XEvent
+structure and then removes it from the queue.
+If the event queue is empty,
+.ZN XNextEvent
+flushes the output buffer and blocks until an event is received.
+.LP
+The
+.ZN XPeekEvent
+function returns the first event from the event queue,
+but it does not remove the event from the queue.
+If the queue is empty,
+.ZN XPeekEvent
+flushes the output buffer and blocks until an event is received.
+It then copies the event into the client-supplied
+.ZN XEvent
+structure without removing it from the event queue.
+.LP
+The
+.ZN XWindowEvent
+function searches the event queue for an event that matches both the specified
+window and event mask.
+When it finds a match,
+.ZN XWindowEvent
+removes that event from the queue and copies it into the specified
+.ZN XEvent
+structure.
+The other events stored in the queue are not discarded.
+If a matching event is not in the queue,
+.ZN XWindowEvent
+flushes the output buffer and blocks until one is received.
+.LP
+The
+.ZN XCheckWindowEvent
+function searches the event queue and then the events available 
+on the server connection for the first event that matches the specified window
+and event mask.
+If it finds a match,
+.ZN XCheckWindowEvent
+removes that event, copies it into the specified
+.ZN XEvent
+structure, and returns
+.ZN True .
+The other events stored in the queue are not discarded.
+If the event you requested is not available,
+.ZN XCheckWindowEvent
+returns
+.ZN False ,
+and the output buffer will have been flushed.
+.LP
+The
+.ZN XMaskEvent
+function searches the event queue for the events associated with the 
+specified mask.
+When it finds a match,
+.ZN XMaskEvent
+removes that event and copies it into the specified
+.ZN XEvent
+structure.
+The other events stored in the queue are not discarded.
+If the event you requested is not in the queue,
+.ZN XMaskEvent
+flushes the output buffer and blocks until one is received.
+.LP
+The
+.ZN XCheckMaskEvent
+function searches the event queue and then any events available on the
+server connection for the first event that matches the specified mask.
+If it finds a match,
+.ZN XCheckMaskEvent
+removes that event, copies it into the specified
+.ZN XEvent
+structure, and returns
+.ZN True .
+The other events stored in the queue are not discarded.
+If the event you requested is not available,
+.ZN XCheckMaskEvent
+returns
+.ZN False ,
+and the output buffer will have been flushed.
+.LP
+The
+.ZN XCheckTypedEvent
+function searches the event queue and then any events available  
+on the server connection for the first event that matches the specified type.
+If it finds a match,
+.ZN XCheckTypedEvent
+removes that event, copies it into the specified
+.ZN XEvent
+structure, and returns
+.ZN True .
+The other events in the queue are not discarded.
+If the event is not available,
+.ZN XCheckTypedEvent
+returns
+.ZN False ,
+and the output buffer will have been flushed.
+.LP
+The
+.ZN XCheckTypedWindowEvent
+function searches the event queue and then any events available  
+on the server connection for the first event that matches the specified
+type and window.
+If it finds a match,
+.ZN XCheckTypedWindowEvent
+removes the event from the queue, copies it into the specified
+.ZN XEvent
+structure, and returns
+.ZN True .
+The other events in the queue are not discarded.
+If the event is not available,
+.ZN XCheckTypedWindowEvent
+returns
+.ZN False ,
+and the output buffer will have been flushed.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__),
+XSendEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XNoOp.man b/libX11/man/XNoOp.man
index 7772e6cd3..6851ff3e9 100644
--- a/libX11/man/XNoOp.man
+++ b/libX11/man/XNoOp.man
@@ -1,158 +1,97 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XNoOp __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XNoOp \- No Operation

-.SH SYNTAX

-int XNoOp\^(\^Display *\fIdisplay\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.SH DESCRIPTION

-The

-.ZN XNoOp

-function sends a 

-.ZN NoOperation 

-protocol request to the X server,

-thereby exercising the connection.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XNoOp __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XNoOp \- No Operation
+.SH SYNTAX
+int XNoOp\^(\^Display *\fIdisplay\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.SH DESCRIPTION
+The
+.ZN XNoOp
+function sends a 
+.ZN NoOperation 
+protocol request to the X server,
+thereby exercising the connection.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XOpenDisplay.man b/libX11/man/XOpenDisplay.man
index 4ab7ac24b..30859b21f 100644
--- a/libX11/man/XOpenDisplay.man
+++ b/libX11/man/XOpenDisplay.man
@@ -1,256 +1,195 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XOpenDisplay __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XOpenDisplay, XCloseDisplay \- connect or disconnect to X server

-.SH SYNTAX

-.HP

-Display *XOpenDisplay\^(\^char *\fIdisplay_name\fP\^); 

-.HP

-int XCloseDisplay\^(Display *\fIdisplay\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIdisplay_name\fP 1i

-Specifies the hardware display name, which determines the display

-and communications domain to be used.

-On a POSIX-conformant system, if the display_name is NULL, 

-it defaults to the value of the DISPLAY environment variable. 

-.IN "Environment" "DISPLAY"

-.SH DESCRIPTION

-The

-.ZN XOpenDisplay

-function returns a 

-.ZN Display 

-structure that serves as the

-connection to the X server and that contains all the information

-about that X server.

-.ZN XOpenDisplay

-connects your application to the X server through TCP 

-or DECnet communications protocols,

-or through some local inter-process communication protocol.

-.IN "Protocol" "TCP"

-.IN "Protocol" "DECnet"

-If the hostname is a host machine name and a single colon (:)

-separates the hostname and display number,

-.ZN XOpenDisplay

-connects using TCP streams.

-If the hostname is not specified,

-Xlib uses whatever it believes is the fastest transport.

-If the hostname is a host machine name and a double colon (::)

-separates the hostname and display number,

-.ZN XOpenDisplay

-connects using DECnet.

-A single X server can support any or all of these transport mechanisms

-simultaneously.

-A particular Xlib implementation can support many more of these transport

-mechanisms.

-.LP

-.IN "Display"

-If successful, 

-.ZN XOpenDisplay 

-returns a pointer to a 

-.ZN Display 

-structure,

-which is defined in 

-.hN X11/Xlib.h .

-If 

-.ZN XOpenDisplay 

-does not succeed, it returns NULL.

-After a successful call to

-.ZN XOpenDisplay ,

-all of the screens in the display can be used by the client.

-The screen number specified in the display_name argument is returned 

-by the 

-.ZN DefaultScreen

-macro (or the

-.ZN XDefaultScreen

-function).

-You can access elements of the

-.ZN Display

-and

-.ZN Screen

-structures only by using the information macros or functions.

-For information about using macros and functions to obtain information from 

-the

-.ZN Display 

-structure,

-see section 2.2.1.

-.LP

-The

-.ZN XCloseDisplay

-function closes the connection to the X server for the display specified in the

-.ZN Display

-structure and destroys all windows, resource IDs

-.Pn ( Window ,

-.ZN Font ,

-.ZN Pixmap ,

-.ZN Colormap ,

-.ZN Cursor ,

-and

-.ZN GContext ),

-or other resources that the client has created

-on this display, unless the close-down mode of the resource has been changed

-(see

-.ZN XSetCloseDownMode ).

-Therefore, these windows, resource IDs, and other resources should never be 

-referenced again or an error will be generated.

-Before exiting, you should call

-.ZN XCloseDisplay

-explicitly so that any pending errors are reported as

-.ZN XCloseDisplay

-performs a final

-.ZN XSync

-operation.

-.IN "Resource IDs"

-.IN "XCloseDisplay"

-.LP

-.ZN XCloseDisplay

-can generate a

-.ZN BadGC

-error.

-.SH "SEE ALSO"

-AllPlanes(__libmansuffix__),

-XFlush(__libmansuffix__),

-XSetCloseDownMode(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XOpenDisplay __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XOpenDisplay, XCloseDisplay \- connect or disconnect to X server
+.SH SYNTAX
+.HP
+Display *XOpenDisplay\^(\^char *\fIdisplay_name\fP\^); 
+.HP
+int XCloseDisplay\^(Display *\fIdisplay\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIdisplay_name\fP 1i
+Specifies the hardware display name, which determines the display
+and communications domain to be used.
+On a POSIX-conformant system, if the display_name is NULL, 
+it defaults to the value of the DISPLAY environment variable. 
+.IN "Environment" "DISPLAY"
+.SH DESCRIPTION
+The
+.ZN XOpenDisplay
+function returns a 
+.ZN Display 
+structure that serves as the
+connection to the X server and that contains all the information
+about that X server.
+.ZN XOpenDisplay
+connects your application to the X server through TCP 
+or DECnet communications protocols,
+or through some local inter-process communication protocol.
+.IN "Protocol" "TCP"
+.IN "Protocol" "DECnet"
+If the hostname is a host machine name and a single colon (:)
+separates the hostname and display number,
+.ZN XOpenDisplay
+connects using TCP streams.
+If the hostname is not specified,
+Xlib uses whatever it believes is the fastest transport.
+If the hostname is a host machine name and a double colon (::)
+separates the hostname and display number,
+.ZN XOpenDisplay
+connects using DECnet.
+A single X server can support any or all of these transport mechanisms
+simultaneously.
+A particular Xlib implementation can support many more of these transport
+mechanisms.
+.LP
+.IN "Display"
+If successful, 
+.ZN XOpenDisplay 
+returns a pointer to a 
+.ZN Display 
+structure,
+which is defined in 
+.hN X11/Xlib.h .
+If 
+.ZN XOpenDisplay 
+does not succeed, it returns NULL.
+After a successful call to
+.ZN XOpenDisplay ,
+all of the screens in the display can be used by the client.
+The screen number specified in the display_name argument is returned 
+by the 
+.ZN DefaultScreen
+macro (or the
+.ZN XDefaultScreen
+function).
+You can access elements of the
+.ZN Display
+and
+.ZN Screen
+structures only by using the information macros or functions.
+For information about using macros and functions to obtain information from 
+the
+.ZN Display 
+structure,
+see section 2.2.1.
+.LP
+The
+.ZN XCloseDisplay
+function closes the connection to the X server for the display specified in the
+.ZN Display
+structure and destroys all windows, resource IDs
+.Pn ( Window ,
+.ZN Font ,
+.ZN Pixmap ,
+.ZN Colormap ,
+.ZN Cursor ,
+and
+.ZN GContext ),
+or other resources that the client has created
+on this display, unless the close-down mode of the resource has been changed
+(see
+.ZN XSetCloseDownMode ).
+Therefore, these windows, resource IDs, and other resources should never be 
+referenced again or an error will be generated.
+Before exiting, you should call
+.ZN XCloseDisplay
+explicitly so that any pending errors are reported as
+.ZN XCloseDisplay
+performs a final
+.ZN XSync
+operation.
+.IN "Resource IDs"
+.IN "XCloseDisplay"
+.LP
+.ZN XCloseDisplay
+can generate a
+.ZN BadGC
+error.
+.SH "SEE ALSO"
+AllPlanes(__libmansuffix__),
+XFlush(__libmansuffix__),
+XSetCloseDownMode(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XOpenIM.man b/libX11/man/XOpenIM.man
index c22df9f84..50e84d0e9 100644
--- a/libX11/man/XOpenIM.man
+++ b/libX11/man/XOpenIM.man
@@ -1,304 +1,243 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information

-.SH SYNTAX

-.HP

-XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char

-*\fIres_name\fP\^, char *\fIres_class\fP\^); 

-.HP

-Status XCloseIM\^(\^XIM \fIim\fP\^); 

-.HP

-char *XSetIMValues\^(\^XIM \fIim\fP\^, ...); 

-.HP

-char *XGetIMValues\^(\^XIM \fIim\fP\^, ...); 

-.HP

-Display *XDisplayOfIM\^(\^XIM \fIim\fP\^); 

-.HP

-char *XLocaleOfIM\^(\^XIM \fIim\fP\^); 

-.HP

-Bool XRegisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^, XrmDatabase

-\fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^, XIDProc

-\fIcallback\fP\^, XPointer \fIclient_data\fP\^); 

-.HP

-Bool XUnregisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^,

-XrmDatabase \fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^,

-XIDProc \fIcallback\fP\^, XPointer \fIclient_data\fP\^); 

-.LP

-.SH ARGUMENTS

-.IP \fIcallback\fP 1i

-Specifies a pointer to the input method instantiate callback.

-.IP \fIclient_data\fP 1i

-Specifies the additional client data.

-.IP \fIdb\fP 1i

-Specifies a pointer to the resource database.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIim\fP 1i

-Specifies the input method.

-.IP \fIres_class\fP 1i

-Specifies the full class name of the application.

-.IP \fIres_name\fP 1i

-Specifies the full resource name of the application.

-.ds Al \ to set or get XIM values

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XOpenIM

-function opens an input method, 

-matching the current locale and modifiers specification.

-Current locale and modifiers are bound to the input method at opening time.

-The locale associated with an input method cannot be changed dynamically.

-This implies that the strings returned by

-.ZN XmbLookupString

-or

-.ZN XwcLookupString ,

-for any input context affiliated with a given input method

-will be encoded in the locale current at the time the input method is opened.

-.LP

-The specific input method to which this call will be routed

-is identified on the basis of the current locale. 

-.ZN XOpenIM

-will identify a default input method corresponding to the

-current locale.

-That default can be modified using 

-.ZN XSetLocaleModifiers

-for the input method modifier.

-.LP

-The db argument is the resource database to be used by the input method

-for looking up resources that are private to the input method.

-It is not intended that this database be used to look

-up values that can be set as IC values in an input context.

-If db is NULL,

-no database is passed to the input method.

-.LP

-The res_name and res_class arguments specify the resource name 

-and class of the application. 

-They are intended to be used as prefixes by the input method

-when looking up resources that are common to all input contexts

-that may be created for this input method.

-The characters used for resource names and classes must be in the

-X Portable Character Set.

-The resources looked up are not fully specified

-if res_name or res_class is NULL.

-.LP

-The res_name and res_class arguments are not assumed to exist beyond

-the call to

-.ZN XOpenIM .

-The specified resource database is assumed to exist for the lifetime

-of the input method.

-.LP

-.ZN XOpenIM

-returns NULL if no input method could be opened.

-.LP

-The

-.ZN XCloseIM

-function closes the specified input method.

-.LP

-The

-.ZN XSetIMValues

-function presents a variable argument list programming interface

-for setting attributes of the specified input method.

-It returns NULL if it succeeds;

-otherwise,

-it returns the name of the first argument that could not be set.

-Xlib does not attempt to set arguments from the supplied list that

-follow the failed argument;

-all arguments in the list preceding the failed argument have been set

-correctly.

-.LP

-The

-.ZN XGetIMValues

-function presents a variable argument list programming interface

-for querying properties or features of the specified input method.

-This function returns NULL if it succeeds;

-otherwise,

-it returns the name of the first argument that could not be obtained.

-.LP

-Each XIM value argument (following a name) must point to

-a location where the XIM value is to be stored.

-That is, if the XIM value is of type T,

-the argument must be of type T*.

-If T itself is a pointer type,

-then

-.ZN XGetIMValues

-allocates memory to store the actual data,

-and the client is responsible for freeing this data by calling

-.ZN XFree

-with the returned pointer.

-.LP

-The

-.ZN XDisplayOfIM

-function returns the display associated with the specified input method.

-.LP

-The

-.ZN XLocaleOfIM

-function returns the locale associated with the specified input method.

-.LP

-The

-.ZN XRegisterIMInstantiateCallback

-function registers a callback to be invoked whenever a new input method

-becomes available for the specified display that matches the current

-locale and modifiers.

-.LP

-The function returns 

-.ZN True

-if it succeeds; otherwise, it returns 

-.ZN False .

-.LP

-The

-.ZN XUnregisterIMInstantiateCallback

-function removes an input method instantiation callback previously

-registered.

-The function returns

-.ZN True

-if it succeeds; otherwise, it returns 

-.ZN False .

-.SH "SEE ALSO"

-XCreateIC(__libmansuffix__),

-XSetICFocus(__libmansuffix__),

-XSetICValues(__libmansuffix__),

-XmbResetIC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information
+.SH SYNTAX
+.HP
+XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
+*\fIres_name\fP\^, char *\fIres_class\fP\^); 
+.HP
+Status XCloseIM\^(\^XIM \fIim\fP\^); 
+.HP
+char *XSetIMValues\^(\^XIM \fIim\fP\^, ...); 
+.HP
+char *XGetIMValues\^(\^XIM \fIim\fP\^, ...); 
+.HP
+Display *XDisplayOfIM\^(\^XIM \fIim\fP\^); 
+.HP
+char *XLocaleOfIM\^(\^XIM \fIim\fP\^); 
+.HP
+Bool XRegisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^, XrmDatabase
+\fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^, XIDProc
+\fIcallback\fP\^, XPointer \fIclient_data\fP\^); 
+.HP
+Bool XUnregisterIMInstantiateCallback\^(\^Display *\fIdisplay\fP\^,
+XrmDatabase \fIdb\fP\^, char *\fIres_name\fP\^, char *\fIres_class\fP\^,
+XIDProc \fIcallback\fP\^, XPointer \fIclient_data\fP\^); 
+.LP
+.SH ARGUMENTS
+.IP \fIcallback\fP 1i
+Specifies a pointer to the input method instantiate callback.
+.IP \fIclient_data\fP 1i
+Specifies the additional client data.
+.IP \fIdb\fP 1i
+Specifies a pointer to the resource database.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIim\fP 1i
+Specifies the input method.
+.IP \fIres_class\fP 1i
+Specifies the full class name of the application.
+.IP \fIres_name\fP 1i
+Specifies the full resource name of the application.
+.ds Al \ to set or get XIM values
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XOpenIM
+function opens an input method, 
+matching the current locale and modifiers specification.
+Current locale and modifiers are bound to the input method at opening time.
+The locale associated with an input method cannot be changed dynamically.
+This implies that the strings returned by
+.ZN XmbLookupString
+or
+.ZN XwcLookupString ,
+for any input context affiliated with a given input method
+will be encoded in the locale current at the time the input method is opened.
+.LP
+The specific input method to which this call will be routed
+is identified on the basis of the current locale. 
+.ZN XOpenIM
+will identify a default input method corresponding to the
+current locale.
+That default can be modified using 
+.ZN XSetLocaleModifiers
+for the input method modifier.
+.LP
+The db argument is the resource database to be used by the input method
+for looking up resources that are private to the input method.
+It is not intended that this database be used to look
+up values that can be set as IC values in an input context.
+If db is NULL,
+no database is passed to the input method.
+.LP
+The res_name and res_class arguments specify the resource name 
+and class of the application. 
+They are intended to be used as prefixes by the input method
+when looking up resources that are common to all input contexts
+that may be created for this input method.
+The characters used for resource names and classes must be in the
+X Portable Character Set.
+The resources looked up are not fully specified
+if res_name or res_class is NULL.
+.LP
+The res_name and res_class arguments are not assumed to exist beyond
+the call to
+.ZN XOpenIM .
+The specified resource database is assumed to exist for the lifetime
+of the input method.
+.LP
+.ZN XOpenIM
+returns NULL if no input method could be opened.
+.LP
+The
+.ZN XCloseIM
+function closes the specified input method.
+.LP
+The
+.ZN XSetIMValues
+function presents a variable argument list programming interface
+for setting attributes of the specified input method.
+It returns NULL if it succeeds;
+otherwise,
+it returns the name of the first argument that could not be set.
+Xlib does not attempt to set arguments from the supplied list that
+follow the failed argument;
+all arguments in the list preceding the failed argument have been set
+correctly.
+.LP
+The
+.ZN XGetIMValues
+function presents a variable argument list programming interface
+for querying properties or features of the specified input method.
+This function returns NULL if it succeeds;
+otherwise,
+it returns the name of the first argument that could not be obtained.
+.LP
+Each XIM value argument (following a name) must point to
+a location where the XIM value is to be stored.
+That is, if the XIM value is of type T,
+the argument must be of type T*.
+If T itself is a pointer type,
+then
+.ZN XGetIMValues
+allocates memory to store the actual data,
+and the client is responsible for freeing this data by calling
+.ZN XFree
+with the returned pointer.
+.LP
+The
+.ZN XDisplayOfIM
+function returns the display associated with the specified input method.
+.LP
+The
+.ZN XLocaleOfIM
+function returns the locale associated with the specified input method.
+.LP
+The
+.ZN XRegisterIMInstantiateCallback
+function registers a callback to be invoked whenever a new input method
+becomes available for the specified display that matches the current
+locale and modifiers.
+.LP
+The function returns 
+.ZN True
+if it succeeds; otherwise, it returns 
+.ZN False .
+.LP
+The
+.ZN XUnregisterIMInstantiateCallback
+function removes an input method instantiation callback previously
+registered.
+The function returns
+.ZN True
+if it succeeds; otherwise, it returns 
+.ZN False .
+.SH "SEE ALSO"
+XCreateIC(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XOpenOM.man b/libX11/man/XOpenOM.man
index f847f34a0..e91159901 100644
--- a/libX11/man/XOpenOM.man
+++ b/libX11/man/XOpenOM.man
@@ -1,257 +1,196 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XOpenOM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XOpenOM, XCloseOM, XSetOMValues, XGetOMValues, XDisplayOfOM, XLocaleOfOM \- open output methods

-.SH SYNTAX

-.HP

-XOM XOpenOM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char

-*\fIres_name\fP\^, char *\fIres_class\fP\^); 

-.HP

-Status XCloseOM\^(\^XOM \fIom\fP\^); 

-.HP

-char *XSetOMValues\^(\^XOM \fIom\fP\^); 

-.HP

-char *XGetOMValues\^(\^XOM \fIom\fP\^); 

-.HP

-Display *XDisplayOfOM\^(\^XOM \fIom\fP\^); 

-.HP

-char *XLocaleOfOM\^(\^XOM \fIom\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIdb\fP 1i

-Specifies a pointer to the resource database.

-.IP \fIres_name\fP 1i

-Specifies the full resource name of the application.

-.IP \fIres_class\fP 1i

-Specifies the full class name of the application.

-.IP \fIom\fP 1i

-Specifies the output method.

-.ds Al \ to set or get XOM values

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XOpenOM

-function opens an output method

-matching the current locale and modifiers specification.

-The current locale and modifiers are bound to the output method

-when

-.ZN XOpenOM

-is called.

-The locale associated with an output method cannot be changed.

-.LP

-The specific output method to which this call will be routed

-is identified on the basis of the current locale and modifiers.

-.ZN XOpenOM

-will identify a default output method corresponding to the

-current locale.

-That default can be modified using 

-.ZN XSetLocaleModifiers

-to set the output method modifier.

-.LP

-The db argument is the resource database to be used by the output method

-for looking up resources that are private to the output method.

-It is not intended that this database be used to look

-up values that can be set as OC values in an output context.

-If db is NULL,

-no database is passed to the output method.

-.LP

-The res_name and res_class arguments specify the resource name 

-and class of the application. 

-They are intended to be used as prefixes by the output method

-when looking up resources that are common to all output contexts

-that may be created for this output method.

-The characters used for resource names and classes must be in the

-X Portable Character Set.

-The resources looked up are not fully specified

-if res_name or res_class is NULL.

-.LP

-The res_name and res_class arguments are not assumed to exist beyond

-the call to

-.ZN XOpenOM .

-The specified resource database is assumed to exist for the lifetime

-of the output method.

-.LP

-.ZN XOpenOM

-returns NULL if no output method could be opened.

-.LP

-The

-.ZN XCloseOM

-function closes the specified output method.

-.LP

-The

-.ZN XSetOMValues

-function presents a variable argument list programming interface

-for setting properties or features of the specified output method.

-This function returns NULL if it succeeds;

-otherwise,

-it returns the name of the first argument that could not be set.

-Xlib does not attempt to set arguments from the supplied list that

-follow the failed argument;

-all arguments in the list preceding the failed argument have been set

-correctly.

-.LP

-No standard arguments are currently defined by Xlib.

-.LP

-The

-.ZN XGetOMValues

-function presents a variable argument list programming interface

-for querying properties or features of the specified output method.

-This function returns NULL if it succeeds;

-otherwise,

-it returns the name of the first argument that could not be obtained.

-.LP

-The

-.ZN XDisplayOfOM

-function returns the display associated with the specified output method.

-.LP

-The

-.ZN XLocaleOfOM

-returns the locale associated with the specified output method.

-.SH "SEE ALSO"

-XCreateOC(__libmansuffix__),

-XCreateFontSet(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XOpenOM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XOpenOM, XCloseOM, XSetOMValues, XGetOMValues, XDisplayOfOM, XLocaleOfOM \- open output methods
+.SH SYNTAX
+.HP
+XOM XOpenOM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char
+*\fIres_name\fP\^, char *\fIres_class\fP\^); 
+.HP
+Status XCloseOM\^(\^XOM \fIom\fP\^); 
+.HP
+char *XSetOMValues\^(\^XOM \fIom\fP\^); 
+.HP
+char *XGetOMValues\^(\^XOM \fIom\fP\^); 
+.HP
+Display *XDisplayOfOM\^(\^XOM \fIom\fP\^); 
+.HP
+char *XLocaleOfOM\^(\^XOM \fIom\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIdb\fP 1i
+Specifies a pointer to the resource database.
+.IP \fIres_name\fP 1i
+Specifies the full resource name of the application.
+.IP \fIres_class\fP 1i
+Specifies the full class name of the application.
+.IP \fIom\fP 1i
+Specifies the output method.
+.ds Al \ to set or get XOM values
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XOpenOM
+function opens an output method
+matching the current locale and modifiers specification.
+The current locale and modifiers are bound to the output method
+when
+.ZN XOpenOM
+is called.
+The locale associated with an output method cannot be changed.
+.LP
+The specific output method to which this call will be routed
+is identified on the basis of the current locale and modifiers.
+.ZN XOpenOM
+will identify a default output method corresponding to the
+current locale.
+That default can be modified using 
+.ZN XSetLocaleModifiers
+to set the output method modifier.
+.LP
+The db argument is the resource database to be used by the output method
+for looking up resources that are private to the output method.
+It is not intended that this database be used to look
+up values that can be set as OC values in an output context.
+If db is NULL,
+no database is passed to the output method.
+.LP
+The res_name and res_class arguments specify the resource name 
+and class of the application. 
+They are intended to be used as prefixes by the output method
+when looking up resources that are common to all output contexts
+that may be created for this output method.
+The characters used for resource names and classes must be in the
+X Portable Character Set.
+The resources looked up are not fully specified
+if res_name or res_class is NULL.
+.LP
+The res_name and res_class arguments are not assumed to exist beyond
+the call to
+.ZN XOpenOM .
+The specified resource database is assumed to exist for the lifetime
+of the output method.
+.LP
+.ZN XOpenOM
+returns NULL if no output method could be opened.
+.LP
+The
+.ZN XCloseOM
+function closes the specified output method.
+.LP
+The
+.ZN XSetOMValues
+function presents a variable argument list programming interface
+for setting properties or features of the specified output method.
+This function returns NULL if it succeeds;
+otherwise,
+it returns the name of the first argument that could not be set.
+Xlib does not attempt to set arguments from the supplied list that
+follow the failed argument;
+all arguments in the list preceding the failed argument have been set
+correctly.
+.LP
+No standard arguments are currently defined by Xlib.
+.LP
+The
+.ZN XGetOMValues
+function presents a variable argument list programming interface
+for querying properties or features of the specified output method.
+This function returns NULL if it succeeds;
+otherwise,
+it returns the name of the first argument that could not be obtained.
+.LP
+The
+.ZN XDisplayOfOM
+function returns the display associated with the specified output method.
+.LP
+The
+.ZN XLocaleOfOM
+returns the locale associated with the specified output method.
+.SH "SEE ALSO"
+XCreateOC(__libmansuffix__),
+XCreateFontSet(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XParseGeometry.man b/libX11/man/XParseGeometry.man
index 173a4f569..50a95aba5 100644
--- a/libX11/man/XParseGeometry.man
+++ b/libX11/man/XParseGeometry.man
@@ -1,283 +1,222 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XParseGeometry __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XParseGeometry, XWMGeometry \- parse window geometry

-.SH SYNTAX

-.HP

-int XParseGeometry\^(\^char *\fIparsestring\fP\^, int *\fIx_return\fP\^, int

-*\fIy_return\fP\^, unsigned int *\fIwidth_return\fP\^, unsigned int

-*\fIheight_return\fP\^); 

-.HP

-int XWMGeometry\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, char

-*\fIuser_geom\fP\^, char *\fIdef_geom\fP\^, unsigned int \fIbwidth\fP\^,

-XSizeHints *\fIhints\fP\^, int *\fIx_return\fP, int *\fIy_return\fP\^, int

-*\fIwidth_return\fP\^, int *\fIheight_return\fP\^, int

-*\fIgravity_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIposition\fP 1i

-.br

-.ns

-.IP \fIdefault_position\fP 1i

-Specify the geometry specifications.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfheight\fP 1i

-.br

-.ns

-.IP \fIfwidth\fP 1i

-Specify the font height and width in pixels (increment size).

-.IP \fIparsestring\fP 1i

-Specifies the string you want to parse.

-.IP \fIscreen\fP 1i

-Specifies the screen.

-.IP \fIwidth_return\fP 1i

-.br

-.ns

-.IP \fIheight_return\fP 1i

-Return the width and height determined.

-.IP \fIxadder\fP 1i

-.br

-.ns

-.IP \fIyadder\fP 1i

-Specify additional interior padding needed in the window.

-.IP \fIx_return\fP 1i

-.br

-.ns

-.IP \fIy_return\fP 1i

-Return the x and y offsets.

-.IP \fIbwidth\fP 1i

-Specifies the border width.

-.IP \fIhints\fP 1i

-Specifies the size hints for the window in its normal state.

-.IP \fIdef_geom\fP 1i

-Specifies the application's default geometry or NULL.

-.IP \fIgravity_return\fP 1i

-Returns the window gravity.

-.IP \fIuser_geom\fP 1i

-Specifies the user-specified geometry or NULL.

-.SH DESCRIPTION

-By convention,

-X applications use a standard string to indicate window size and placement.

-.ZN XParseGeometry

-makes it easier to conform to this standard because it allows you

-to parse the standard window geometry.

-Specifically, this function lets you parse strings of the form:

-.LP

-.\" Start marker code here

-.Ds

-[=][<\fIwidth\fP>{xX}<\fIheight\fP>][{+-}<\fIxoffset\fP>{+-}<\fIyoffset\fP>] 

-.De

-.\" End marker code here

-.LP

-The fields map into the arguments associated with this function.

-(Items enclosed in <\^> are integers, items in [\^] are optional, and

-items enclosed in {\^} indicate ``choose one of.''

-Note that the brackets should not appear in the actual string.)

-If the string is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-.LP

-The

-.ZN XParseGeometry

-function returns a bitmask that indicates which of the four values (width,

-height, xoffset, and yoffset) were actually found in the string 

-and whether the x and y values are negative. 

-By convention, \-0 is not equal to +0, because the user needs to

-be able to say ``position the window relative to the right or bottom edge.''

-For each value found, the corresponding argument is updated.

-For each value not found, the argument is left unchanged.

-The bits are represented by

-.ZN XValue , 

-.ZN YValue , 

-.ZN WidthValue , 

-.ZN HeightValue ,

-.ZN XNegative , 

-or

-.ZN YNegative

-and are defined in 

-.hN X11/Xutil.h .

-They will be set whenever one of the values is defined 

-or one of the signs is set.

-.LP

-If the function returns either the 

-.ZN XValue 

-or 

-.ZN YValue 

-flag,

-you should place the window at the requested position.

-.LP

-The 

-.ZN XWMGeometry 

-function combines any geometry information (given in the format used by 

-.ZN XParseGeometry )

-specified by the user and by the calling program with size hints 

-(usually the ones to be stored in WM_NORMAL_HINTS) and returns the position, 

-size, and gravity

-.Pn ( NorthWestGravity , 

-.ZN NorthEastGravity , 

-.ZN SouthEastGravity ,

-or

-.ZN SouthWestGravity ) 

-that describe the window.

-If the base size is not set in the 

-.ZN XSizeHints

-structure, 

-the minimum size is used if set.

-Otherwise, a base size of zero is assumed.

-If no minimum size is set in the hints structure, 

-the base size is used.

-A mask (in the form returned by 

-.ZN XParseGeometry ) 

-that describes which values came from the user specification 

-and whether or not the position coordinates are relative

-to the right and bottom edges is returned.

-Note that these coordinates will have already been accounted for 

-in the x_return and y_return values.

-.LP

-Note that invalid geometry specifications can cause a width or height 

-of zero to be returned.

-The caller may pass the address of the hints win_gravity field 

-as gravity_return to update the hints directly.

-.SH "SEE ALSO"

-XSetWMProperties(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XParseGeometry __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XParseGeometry, XWMGeometry \- parse window geometry
+.SH SYNTAX
+.HP
+int XParseGeometry\^(\^char *\fIparsestring\fP\^, int *\fIx_return\fP\^, int
+*\fIy_return\fP\^, unsigned int *\fIwidth_return\fP\^, unsigned int
+*\fIheight_return\fP\^); 
+.HP
+int XWMGeometry\^(\^Display *\fIdisplay\fP\^, int \fIscreen\fP\^, char
+*\fIuser_geom\fP\^, char *\fIdef_geom\fP\^, unsigned int \fIbwidth\fP\^,
+XSizeHints *\fIhints\fP\^, int *\fIx_return\fP, int *\fIy_return\fP\^, int
+*\fIwidth_return\fP\^, int *\fIheight_return\fP\^, int
+*\fIgravity_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIposition\fP 1i
+.br
+.ns
+.IP \fIdefault_position\fP 1i
+Specify the geometry specifications.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfheight\fP 1i
+.br
+.ns
+.IP \fIfwidth\fP 1i
+Specify the font height and width in pixels (increment size).
+.IP \fIparsestring\fP 1i
+Specifies the string you want to parse.
+.IP \fIscreen\fP 1i
+Specifies the screen.
+.IP \fIwidth_return\fP 1i
+.br
+.ns
+.IP \fIheight_return\fP 1i
+Return the width and height determined.
+.IP \fIxadder\fP 1i
+.br
+.ns
+.IP \fIyadder\fP 1i
+Specify additional interior padding needed in the window.
+.IP \fIx_return\fP 1i
+.br
+.ns
+.IP \fIy_return\fP 1i
+Return the x and y offsets.
+.IP \fIbwidth\fP 1i
+Specifies the border width.
+.IP \fIhints\fP 1i
+Specifies the size hints for the window in its normal state.
+.IP \fIdef_geom\fP 1i
+Specifies the application's default geometry or NULL.
+.IP \fIgravity_return\fP 1i
+Returns the window gravity.
+.IP \fIuser_geom\fP 1i
+Specifies the user-specified geometry or NULL.
+.SH DESCRIPTION
+By convention,
+X applications use a standard string to indicate window size and placement.
+.ZN XParseGeometry
+makes it easier to conform to this standard because it allows you
+to parse the standard window geometry.
+Specifically, this function lets you parse strings of the form:
+.LP
+.\" Start marker code here
+.Ds
+[=][<\fIwidth\fP>{xX}<\fIheight\fP>][{+-}<\fIxoffset\fP>{+-}<\fIyoffset\fP>] 
+.De
+.\" End marker code here
+.LP
+The fields map into the arguments associated with this function.
+(Items enclosed in <\^> are integers, items in [\^] are optional, and
+items enclosed in {\^} indicate ``choose one of.''
+Note that the brackets should not appear in the actual string.)
+If the string is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+.LP
+The
+.ZN XParseGeometry
+function returns a bitmask that indicates which of the four values (width,
+height, xoffset, and yoffset) were actually found in the string 
+and whether the x and y values are negative. 
+By convention, \-0 is not equal to +0, because the user needs to
+be able to say ``position the window relative to the right or bottom edge.''
+For each value found, the corresponding argument is updated.
+For each value not found, the argument is left unchanged.
+The bits are represented by
+.ZN XValue , 
+.ZN YValue , 
+.ZN WidthValue , 
+.ZN HeightValue ,
+.ZN XNegative , 
+or
+.ZN YNegative
+and are defined in 
+.hN X11/Xutil.h .
+They will be set whenever one of the values is defined 
+or one of the signs is set.
+.LP
+If the function returns either the 
+.ZN XValue 
+or 
+.ZN YValue 
+flag,
+you should place the window at the requested position.
+.LP
+The 
+.ZN XWMGeometry 
+function combines any geometry information (given in the format used by 
+.ZN XParseGeometry )
+specified by the user and by the calling program with size hints 
+(usually the ones to be stored in WM_NORMAL_HINTS) and returns the position, 
+size, and gravity
+.Pn ( NorthWestGravity , 
+.ZN NorthEastGravity , 
+.ZN SouthEastGravity ,
+or
+.ZN SouthWestGravity ) 
+that describe the window.
+If the base size is not set in the 
+.ZN XSizeHints
+structure, 
+the minimum size is used if set.
+Otherwise, a base size of zero is assumed.
+If no minimum size is set in the hints structure, 
+the base size is used.
+A mask (in the form returned by 
+.ZN XParseGeometry ) 
+that describes which values came from the user specification 
+and whether or not the position coordinates are relative
+to the right and bottom edges is returned.
+Note that these coordinates will have already been accounted for 
+in the x_return and y_return values.
+.LP
+Note that invalid geometry specifications can cause a width or height 
+of zero to be returned.
+The caller may pass the address of the hints win_gravity field 
+as gravity_return to update the hints directly.
+.SH "SEE ALSO"
+XSetWMProperties(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XPolygonRegion.man b/libX11/man/XPolygonRegion.man
index 30493eb2c..81bb1439d 100644
--- a/libX11/man/XPolygonRegion.man
+++ b/libX11/man/XPolygonRegion.man
@@ -1,182 +1,121 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XPolygonRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XPolygonRegion, XClipBox \- generate regions

-.SH SYNTAX

-.HP

-Region XPolygonRegion\^(\^XPoint \fIpoints\fP[]\^, int \fIn\fP\^, int

-\fIfill_rule\fP\^); 

-.HP

-int XClipBox\^(\^Region \fIr\fP\^, XRectangle *\fIrect_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIfill_rule\fP 1i

-Specifies the fill-rule you want to set for the specified GC.

-You can pass 

-.ZN EvenOddRule

-or

-.ZN WindingRule .

-.IP \fIn\fP 1i

-Specifies the number of points in the polygon. 

-.IP \fIpoints\fP 1i

-Specifies an array of points.

-.IP \fIr\fP 1i

-Specifies the region.

-.IP \fIrect_return\fP 1i

-Returns the smallest enclosing rectangle.

-.SH DESCRIPTION

-The

-.ZN XPolygonRegion

-function returns a region for the polygon defined by the points array.

-For an explanation of fill_rule,

-see

-.ZN XCreateGC .

-.LP

-The

-.ZN XClipBox

-function returns the smallest rectangle enclosing the specified region.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XDrawPoint(__libmansuffix__),

-XDrawRectangle(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XPolygonRegion __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XPolygonRegion, XClipBox \- generate regions
+.SH SYNTAX
+.HP
+Region XPolygonRegion\^(\^XPoint \fIpoints\fP[]\^, int \fIn\fP\^, int
+\fIfill_rule\fP\^); 
+.HP
+int XClipBox\^(\^Region \fIr\fP\^, XRectangle *\fIrect_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIfill_rule\fP 1i
+Specifies the fill-rule you want to set for the specified GC.
+You can pass 
+.ZN EvenOddRule
+or
+.ZN WindingRule .
+.IP \fIn\fP 1i
+Specifies the number of points in the polygon. 
+.IP \fIpoints\fP 1i
+Specifies an array of points.
+.IP \fIr\fP 1i
+Specifies the region.
+.IP \fIrect_return\fP 1i
+Returns the smallest enclosing rectangle.
+.SH DESCRIPTION
+The
+.ZN XPolygonRegion
+function returns a region for the polygon defined by the points array.
+For an explanation of fill_rule,
+see
+.ZN XCreateGC .
+.LP
+The
+.ZN XClipBox
+function returns the smallest rectangle enclosing the specified region.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XDrawPoint(__libmansuffix__),
+XDrawRectangle(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XPropertyEvent.man b/libX11/man/XPropertyEvent.man
index 2c25da950..e9a40c25d 100644
--- a/libX11/man/XPropertyEvent.man
+++ b/libX11/man/XPropertyEvent.man
@@ -1,244 +1,181 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XPropertyEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XPropertyEvent \- PropertyNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN PropertyNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* PropertyNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	Atom atom;

-	Time time;

-	int state;	/\&* PropertyNewValue or PropertyDelete */

-} XPropertyEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window whose associated 

-property was changed.

-The atom member is set to the property's atom and indicates which

-property was changed or desired.

-The time member is set to the server time when the property was changed.

-The state member is set to indicate whether the property was changed 

-to a new value or deleted and can be

-.ZN PropertyNewValue

-or

-.ZN PropertyDelete .

-The state member is set to

-.ZN PropertyNewValue

-when a property of the window is changed using

-.ZN XChangeProperty

-or

-.ZN XRotateWindowProperties

-(even when adding zero-length data using

-.ZN XChangeProperty )

-and when replacing all or part of a property with identical data using

-.ZN XChangeProperty

-or 

-.ZN XRotateWindowProperties .

-The state member is set to

-.ZN PropertyDelete

-when a property of the window is deleted using

-.ZN XDeleteProperty

-or, if the delete argument is 

-.ZN True ,

-.ZN XGetWindowProperty .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGetWindowProperty(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XPropertyEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XPropertyEvent \- PropertyNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN PropertyNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* PropertyNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        Atom atom;
+        Time time;
+        int state;      /\&* PropertyNewValue or PropertyDelete */
+} XPropertyEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window whose associated 
+property was changed.
+The atom member is set to the property's atom and indicates which
+property was changed or desired.
+The time member is set to the server time when the property was changed.
+The state member is set to indicate whether the property was changed 
+to a new value or deleted and can be
+.ZN PropertyNewValue
+or
+.ZN PropertyDelete .
+The state member is set to
+.ZN PropertyNewValue
+when a property of the window is changed using
+.ZN XChangeProperty
+or
+.ZN XRotateWindowProperties
+(even when adding zero-length data using
+.ZN XChangeProperty )
+and when replacing all or part of a property with identical data using
+.ZN XChangeProperty
+or 
+.ZN XRotateWindowProperties .
+The state member is set to
+.ZN PropertyDelete
+when a property of the window is deleted using
+.ZN XDeleteProperty
+or, if the delete argument is 
+.ZN True ,
+.ZN XGetWindowProperty .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGetWindowProperty(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XPutBackEvent.man b/libX11/man/XPutBackEvent.man
index 53d736655..9360ebe1f 100644
--- a/libX11/man/XPutBackEvent.man
+++ b/libX11/man/XPutBackEvent.man
@@ -1,168 +1,107 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XPutBackEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XPutBackEvent \- put events back on the queue

-.SH SYNTAX

-.HP

-XPutBackEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent\fP 1i

-Specifies the event.

-.SH DESCRIPTION

-The

-.ZN XPutBackEvent

-function pushes an event back onto the head of the display's event queue

-by copying the event into the queue.

-This can be useful if you read an event and then decide that you

-would rather deal with it later.

-There is no limit to the number of times in succession that you can call

-.ZN XPutBackEvent .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XIfEvent(__libmansuffix__),

-XNextEvent(__libmansuffix__),

-XSendEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XPutBackEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XPutBackEvent \- put events back on the queue
+.SH SYNTAX
+.HP
+XPutBackEvent\^(\^Display *\fIdisplay\fP\^, XEvent *\fIevent\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent\fP 1i
+Specifies the event.
+.SH DESCRIPTION
+The
+.ZN XPutBackEvent
+function pushes an event back onto the head of the display's event queue
+by copying the event into the queue.
+This can be useful if you read an event and then decide that you
+would rather deal with it later.
+There is no limit to the number of times in succession that you can call
+.ZN XPutBackEvent .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XSendEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XPutImage.man b/libX11/man/XPutImage.man
index 131dcb32a..3fec85092 100644
--- a/libX11/man/XPutImage.man
+++ b/libX11/man/XPutImage.man
@@ -1,403 +1,342 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XPutImage __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XPutImage, XGetImage, XGetSubImage \- transfer images

-.SH SYNTAX

-.HP

-int XPutImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,

-XImage *\fIimage\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int

-\fIdest_x\fP\^, int \fIdest_y\fP\^, unsigned int \fIwidth\fP\^, unsigned int

-\fIheight\fP\^); 

-.HP

-XImage *XGetImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int

-\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int

-\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^); 

-.HP

-XImage *XGetSubImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int

-\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int

-\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^, XImage

-*\fIdest_image\fP\^, int \fIdest_x\fP\^, \fIdest_y\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdest_image\fP 1i

-Specifies the destination image.

-.ds Dx , which are relative to the origin of the drawable \

-and are the coordinates of the subimage \

-or which are relative to the origin of the destination rectangle, \

-specify its upper-left corner, and determine where the subimage \

-is placed in the destination image

-.IP \fIdest_x\fP 1i

-.br

-.ns

-.IP \fIdest_y\fP 1i

-Specify the x and y coordinates\*(Dx.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIformat\fP 1i

-Specifies the format for the image.

-You can pass

-.ZN XYPixmap

-or 

-.ZN ZPixmap .

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIimage\fP 1i

-Specifies the image you want combined with the rectangle. 

-.IP \fIplane_mask\fP 1i

-Specifies the plane mask.

-.\" *** JIM: NEED MORE INFO FOR THIS. ***

-.IP \fIsrc_x\fP 1i

-Specifies the offset in X from the left edge of the image defined

-by the 

-.ZN XImage 

-structure.

-.IP \fIsrc_y\fP 1i

-Specifies the offset in Y from the top edge of the image defined

-by the 

-.ZN XImage 

-structure.

-.ds Wh \ of the subimage, which define the dimensions of the rectangle

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.ds Xy , which are relative to the origin of the drawable \

-and define the upper-left corner of the rectangle

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XPutImage

-function

-combines an image with a rectangle of the specified drawable.

-The section of the image defined by the src_x, src_y, width, and height 

-arguments is drawn on the specified part of the drawable.

-If 

-.ZN XYBitmap 

-format is used, the depth of the image must be one,

-or a

-.ZN BadMatch 

-error results.

-The foreground pixel in the GC defines the source for the one bits in the image,

-and the background pixel defines the source for the zero bits.

-For 

-.ZN XYPixmap 

-and 

-.ZN ZPixmap , 

-the depth of the image must match the depth of the drawable,

-or a

-.ZN BadMatch

-error results.

-.LP

-If the characteristics of the image (for example, byte_order and bitmap_unit)

-differ from what the server requires,

-.ZN XPutImage 

-automatically makes the appropriate

-conversions.

-.LP

-This function uses these GC components: 

-function, plane-mask, subwindow-mode, clip-x-origin, clip-y-origin, 

-and clip-mask.

-It also uses these GC mode-dependent components:

-foreground and background.

-.LP

-.ZN XPutImage

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XGetImage

-function returns a pointer to an

-.ZN XImage

-structure.

-This structure provides you with the contents of the specified rectangle of

-the drawable in the format you specify.

-If the format argument is 

-.ZN XYPixmap ,

-the image contains only the bit planes you passed to the plane_mask argument.

-If the plane_mask argument only requests a subset of the planes of the

-display, the depth of the returned image will be the number of planes

-requested.

-If the format argument is 

-.ZN ZPixmap ,

-.ZN XGetImage

-returns as zero the bits in all planes not 

-specified in the plane_mask argument.

-The function performs no range checking on the values in plane_mask and ignores

-extraneous bits.

-.LP

-.ZN XGetImage

-returns the depth of the image to the depth member of the

-.ZN XImage

-structure.

-The depth of the image is as specified when the drawable was created,

-except when getting a subset of the planes in 

-.ZN XYPixmap

-format, when the depth is given by the number of bits set to 1 in plane_mask.

-.LP

-If the drawable is a pixmap, 

-the given rectangle must be wholly contained within the pixmap, 

-or a

-.ZN BadMatch

-error results.

-If the drawable is a window, 

-the window must be viewable, 

-and it must be the case that if there were no inferiors or overlapping windows,

-the specified rectangle of the window would be fully visible on the screen

-and wholly contained within the outside edges of the window,

-or a

-.ZN BadMatch

-error results.

-Note that the borders of the window can be included and read with

-this request.

-If the window has backing-store, the backing-store contents are

-returned for regions of the window that are obscured by noninferior

-windows. 

-If the window does not have backing-store,

-the returned contents of such obscured regions are undefined.

-The returned contents of visible regions of inferiors

-of a different depth than the specified window's depth are also undefined.

-The pointer cursor image is not included in the returned contents.

-If a problem occurs,

-.ZN XGetImage

-returns NULL.

-.LP

-.ZN XGetImage

-can generate

-.ZN BadDrawable ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.LP

-The 

-.ZN XGetSubImage 

-function updates dest_image with the specified subimage in the same manner as 

-.ZN XGetImage . 

-If the format argument is 

-.ZN XYPixmap ,

-the image contains only the bit planes you passed to the plane_mask argument.

-If the format argument is 

-.ZN ZPixmap ,

-.ZN XGetSubImage

-returns as zero the bits in all planes not 

-specified in the plane_mask argument.

-The function performs no range checking on the values in plane_mask and ignores

-extraneous bits.

-As a convenience,

-.ZN XGetSubImage

-returns a pointer to the same

-.ZN XImage

-structure specified by dest_image.

-.LP

-The depth of the destination

-.ZN XImage

-structure must be the same as that of the drawable.

-If the specified subimage does not fit at the specified location

-on the destination image, the right and bottom edges are clipped.

-If the drawable is a pixmap,

-the given rectangle must be wholly contained within the pixmap,

-or a

-.ZN BadMatch

-error results.

-If the drawable is a window, 

-the window must be viewable, 

-and it must be the case that if there were no inferiors or overlapping windows,

-the specified rectangle of the window would be fully visible on the screen

-and wholly contained within the outside edges of the window,

-or a

-.ZN BadMatch

-error results.

-If the window has backing-store, 

-then the backing-store contents are returned for regions of the window 

-that are obscured by noninferior windows. 

-If the window does not have backing-store, 

-the returned contents of such obscured regions are undefined.

-The returned contents of visible regions of inferiors

-of a different depth than the specified window's depth are also undefined.

-If a problem occurs,

-.ZN XGetSubImage

-returns NULL.

-.LP

-.ZN XGetSubImage

-can generate

-.ZN BadDrawable ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XPutImage __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XPutImage, XGetImage, XGetSubImage \- transfer images
+.SH SYNTAX
+.HP
+int XPutImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC \fIgc\fP\^,
+XImage *\fIimage\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int
+\fIdest_x\fP\^, int \fIdest_y\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^); 
+.HP
+XImage *XGetImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^); 
+.HP
+XImage *XGetSubImage\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, int
+\fIx\fP\^, int \fIy\fP\^, unsigned int \fIwidth\fP\^, unsigned int
+\fIheight\fP\^, unsigned long \fIplane_mask\fP\^, int \fIformat\fP\^, XImage
+*\fIdest_image\fP\^, int \fIdest_x\fP\^, \fIdest_y\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdest_image\fP 1i
+Specifies the destination image.
+.ds Dx , which are relative to the origin of the drawable \
+and are the coordinates of the subimage \
+or which are relative to the origin of the destination rectangle, \
+specify its upper-left corner, and determine where the subimage \
+is placed in the destination image
+.IP \fIdest_x\fP 1i
+.br
+.ns
+.IP \fIdest_y\fP 1i
+Specify the x and y coordinates\*(Dx.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIformat\fP 1i
+Specifies the format for the image.
+You can pass
+.ZN XYPixmap
+or 
+.ZN ZPixmap .
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIimage\fP 1i
+Specifies the image you want combined with the rectangle. 
+.IP \fIplane_mask\fP 1i
+Specifies the plane mask.
+.\" *** JIM: NEED MORE INFO FOR THIS. ***
+.IP \fIsrc_x\fP 1i
+Specifies the offset in X from the left edge of the image defined
+by the 
+.ZN XImage 
+structure.
+.IP \fIsrc_y\fP 1i
+Specifies the offset in Y from the top edge of the image defined
+by the 
+.ZN XImage 
+structure.
+.ds Wh \ of the subimage, which define the dimensions of the rectangle
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.ds Xy , which are relative to the origin of the drawable \
+and define the upper-left corner of the rectangle
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XPutImage
+function
+combines an image with a rectangle of the specified drawable.
+The section of the image defined by the src_x, src_y, width, and height 
+arguments is drawn on the specified part of the drawable.
+If 
+.ZN XYBitmap 
+format is used, the depth of the image must be one,
+or a
+.ZN BadMatch 
+error results.
+The foreground pixel in the GC defines the source for the one bits in the image,
+and the background pixel defines the source for the zero bits.
+For 
+.ZN XYPixmap 
+and 
+.ZN ZPixmap , 
+the depth of the image must match the depth of the drawable,
+or a
+.ZN BadMatch
+error results.
+.LP
+If the characteristics of the image (for example, byte_order and bitmap_unit)
+differ from what the server requires,
+.ZN XPutImage 
+automatically makes the appropriate
+conversions.
+.LP
+This function uses these GC components: 
+function, plane-mask, subwindow-mode, clip-x-origin, clip-y-origin, 
+and clip-mask.
+It also uses these GC mode-dependent components:
+foreground and background.
+.LP
+.ZN XPutImage
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XGetImage
+function returns a pointer to an
+.ZN XImage
+structure.
+This structure provides you with the contents of the specified rectangle of
+the drawable in the format you specify.
+If the format argument is 
+.ZN XYPixmap ,
+the image contains only the bit planes you passed to the plane_mask argument.
+If the plane_mask argument only requests a subset of the planes of the
+display, the depth of the returned image will be the number of planes
+requested.
+If the format argument is 
+.ZN ZPixmap ,
+.ZN XGetImage
+returns as zero the bits in all planes not 
+specified in the plane_mask argument.
+The function performs no range checking on the values in plane_mask and ignores
+extraneous bits.
+.LP
+.ZN XGetImage
+returns the depth of the image to the depth member of the
+.ZN XImage
+structure.
+The depth of the image is as specified when the drawable was created,
+except when getting a subset of the planes in 
+.ZN XYPixmap
+format, when the depth is given by the number of bits set to 1 in plane_mask.
+.LP
+If the drawable is a pixmap, 
+the given rectangle must be wholly contained within the pixmap, 
+or a
+.ZN BadMatch
+error results.
+If the drawable is a window, 
+the window must be viewable, 
+and it must be the case that if there were no inferiors or overlapping windows,
+the specified rectangle of the window would be fully visible on the screen
+and wholly contained within the outside edges of the window,
+or a
+.ZN BadMatch
+error results.
+Note that the borders of the window can be included and read with
+this request.
+If the window has backing-store, the backing-store contents are
+returned for regions of the window that are obscured by noninferior
+windows. 
+If the window does not have backing-store,
+the returned contents of such obscured regions are undefined.
+The returned contents of visible regions of inferiors
+of a different depth than the specified window's depth are also undefined.
+The pointer cursor image is not included in the returned contents.
+If a problem occurs,
+.ZN XGetImage
+returns NULL.
+.LP
+.ZN XGetImage
+can generate
+.ZN BadDrawable ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.LP
+The 
+.ZN XGetSubImage 
+function updates dest_image with the specified subimage in the same manner as 
+.ZN XGetImage . 
+If the format argument is 
+.ZN XYPixmap ,
+the image contains only the bit planes you passed to the plane_mask argument.
+If the format argument is 
+.ZN ZPixmap ,
+.ZN XGetSubImage
+returns as zero the bits in all planes not 
+specified in the plane_mask argument.
+The function performs no range checking on the values in plane_mask and ignores
+extraneous bits.
+As a convenience,
+.ZN XGetSubImage
+returns a pointer to the same
+.ZN XImage
+structure specified by dest_image.
+.LP
+The depth of the destination
+.ZN XImage
+structure must be the same as that of the drawable.
+If the specified subimage does not fit at the specified location
+on the destination image, the right and bottom edges are clipped.
+If the drawable is a pixmap,
+the given rectangle must be wholly contained within the pixmap,
+or a
+.ZN BadMatch
+error results.
+If the drawable is a window, 
+the window must be viewable, 
+and it must be the case that if there were no inferiors or overlapping windows,
+the specified rectangle of the window would be fully visible on the screen
+and wholly contained within the outside edges of the window,
+or a
+.ZN BadMatch
+error results.
+If the window has backing-store, 
+then the backing-store contents are returned for regions of the window 
+that are obscured by noninferior windows. 
+If the window does not have backing-store, 
+the returned contents of such obscured regions are undefined.
+The returned contents of visible regions of inferiors
+of a different depth than the specified window's depth are also undefined.
+If a problem occurs,
+.ZN XGetSubImage
+returns NULL.
+.LP
+.ZN XGetSubImage
+can generate
+.ZN BadDrawable ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XQueryBestSize.man b/libX11/man/XQueryBestSize.man
index 1dcf74930..d6c450466 100644
--- a/libX11/man/XQueryBestSize.man
+++ b/libX11/man/XQueryBestSize.man
@@ -1,287 +1,226 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XQueryBestSize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XQueryBestSize, XQueryBestTile, XQueryBestStipple \- determine efficient sizes

-.SH SYNTAX

-.HP

-Status XQueryBestSize\^(\^Display *\fIdisplay\fP\^, int \fIclass\fP\^,

-Drawable \fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int

-\fIheight\fP\^, unsigned int *\fIwidth_return\fP, unsigned int

-*\fIheight_return\fP\^); 

-.HP

-Status XQueryBestTile\^(\^Display *\fIdisplay\fP\^, Drawable

-\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,

-unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^);

-.HP

-Status XQueryBestStipple\^(\^Display *\fIdisplay\fP\^, Drawable

-\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,

-unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIclass\fP 1i

-Specifies the class that you are interested in.

-You can pass 

-.ZN TileShape , 

-.ZN CursorShape , 

-or 

-.ZN StippleShape .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height.

-.IP \fIwhich_screen\fP 1i

-Specifies any drawable on the screen.

-.IP \fIwidth_return\fP 1i

-.br

-.ns

-.IP \fIheight_return\fP 1i

-Return the width and height of the object best supported 

-by the display hardware.

-.SH DESCRIPTION

-The

-.ZN XQueryBestSize

-function returns the best or closest size to the specified size.

-For 

-.ZN CursorShape ,

-this is the largest size that can be fully displayed on the screen specified by

-which_screen.

-For 

-.ZN TileShape ,

-this is the size that can be tiled fastest.

-For 

-.ZN StippleShape ,

-this is the size that can be stippled fastest.

-For 

-.ZN CursorShape ,

-the drawable indicates the desired screen.

-For 

-.ZN TileShape 

-and 

-.ZN StippleShape ,

-the drawable indicates the screen and possibly the window class and depth.

-An 

-.ZN InputOnly 

-window cannot be used as the drawable for 

-.ZN TileShape

-or 

-.ZN StippleShape ,

-or a

-.ZN BadMatch 

-error results.

-.LP

-.ZN XQueryBestSize

-can generate

-.ZN BadDrawable ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XQueryBestTile

-function returns the best or closest size, that is, the size that can be

-tiled fastest on the screen specified by which_screen.

-The drawable indicates the screen and possibly the window class and depth.

-If an 

-.ZN InputOnly 

-window is used as the drawable, a 

-.ZN BadMatch 

-error results.

-.LP

-.ZN XQueryBestTile

-can generate

-.ZN BadDrawable

-and

-.ZN BadMatch 

-errors.

-.LP

-The

-.ZN XQueryBestStipple

-function returns the best or closest size, that is, the size that can be

-stippled fastest on the screen specified by which_screen.

-The drawable indicates the screen and possibly the window class and depth.

-If an

-.ZN InputOnly

-window is used as the drawable, a

-.ZN BadMatch

-error results.

-.LP

-.ZN XQueryBestStipple

-can generate

-.ZN BadDrawable

-and

-.ZN BadMatch 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadMatch

-The values do not exist for an

-.ZN InputOnly

-window.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XQueryBestSize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XQueryBestSize, XQueryBestTile, XQueryBestStipple \- determine efficient sizes
+.SH SYNTAX
+.HP
+Status XQueryBestSize\^(\^Display *\fIdisplay\fP\^, int \fIclass\fP\^,
+Drawable \fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int
+\fIheight\fP\^, unsigned int *\fIwidth_return\fP, unsigned int
+*\fIheight_return\fP\^); 
+.HP
+Status XQueryBestTile\^(\^Display *\fIdisplay\fP\^, Drawable
+\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^);
+.HP
+Status XQueryBestStipple\^(\^Display *\fIdisplay\fP\^, Drawable
+\fIwhich_screen\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+unsigned int *\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIclass\fP 1i
+Specifies the class that you are interested in.
+You can pass 
+.ZN TileShape , 
+.ZN CursorShape , 
+or 
+.ZN StippleShape .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height.
+.IP \fIwhich_screen\fP 1i
+Specifies any drawable on the screen.
+.IP \fIwidth_return\fP 1i
+.br
+.ns
+.IP \fIheight_return\fP 1i
+Return the width and height of the object best supported 
+by the display hardware.
+.SH DESCRIPTION
+The
+.ZN XQueryBestSize
+function returns the best or closest size to the specified size.
+For 
+.ZN CursorShape ,
+this is the largest size that can be fully displayed on the screen specified by
+which_screen.
+For 
+.ZN TileShape ,
+this is the size that can be tiled fastest.
+For 
+.ZN StippleShape ,
+this is the size that can be stippled fastest.
+For 
+.ZN CursorShape ,
+the drawable indicates the desired screen.
+For 
+.ZN TileShape 
+and 
+.ZN StippleShape ,
+the drawable indicates the screen and possibly the window class and depth.
+An 
+.ZN InputOnly 
+window cannot be used as the drawable for 
+.ZN TileShape
+or 
+.ZN StippleShape ,
+or a
+.ZN BadMatch 
+error results.
+.LP
+.ZN XQueryBestSize
+can generate
+.ZN BadDrawable ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XQueryBestTile
+function returns the best or closest size, that is, the size that can be
+tiled fastest on the screen specified by which_screen.
+The drawable indicates the screen and possibly the window class and depth.
+If an 
+.ZN InputOnly 
+window is used as the drawable, a 
+.ZN BadMatch 
+error results.
+.LP
+.ZN XQueryBestTile
+can generate
+.ZN BadDrawable
+and
+.ZN BadMatch 
+errors.
+.LP
+The
+.ZN XQueryBestStipple
+function returns the best or closest size, that is, the size that can be
+stippled fastest on the screen specified by which_screen.
+The drawable indicates the screen and possibly the window class and depth.
+If an
+.ZN InputOnly
+window is used as the drawable, a
+.ZN BadMatch
+error results.
+.LP
+.ZN XQueryBestStipple
+can generate
+.ZN BadDrawable
+and
+.ZN BadMatch 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadMatch
+The values do not exist for an
+.ZN InputOnly
+window.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XQueryColor.man b/libX11/man/XQueryColor.man
index 65424421e..f1fa461f1 100644
--- a/libX11/man/XQueryColor.man
+++ b/libX11/man/XQueryColor.man
@@ -1,344 +1,283 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XQueryColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XQueryColor, XQueryColors, XLookupColor, XParseColor \- obtain color values

-.SH SYNTAX

-.HP

-int XQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^, XColor

-*\fIdef_in_out\fP\^); 

-.HP

-int XQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XColor \fIdefs_in_out\fP[\^]\^, int \fIncolors\fP\^); 

-.HP

-Status XLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-char *\fIcolor_name\fP\^, XColor *\fIexact_def_return\fP\^, XColor

-*\fIscreen_def_return\fP\^); 

-.HP

-Status XParseColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-char *\fIspec\fP\^, XColor *\fIexact_def_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIcolor_name\fP 1i

-Specifies the color name string (for example, red) whose color 

-definition structure you want returned.

-.IP \fIdef_in_out\fP 1i

-Specifies and returns the RGB values for the pixel specified in the structure.

-.IP \fIdefs_in_out\fP 1i

-Specifies and returns an array of color definition structures for the pixel

-specified in the structure.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIexact_def_return\fP 1i

-Returns the exact RGB values.

-.IP \fIncolors\fP 1i

-.\"Specifies the number of color definition structures. 

-Specifies the number of 

-.ZN XColor

-structures in the color definition array.

-.IP \fIscreen_def_return\fP 1i

-Returns the closest RGB values provided by the hardware.

-.IP \fIspec\fP 1i

-Specifies the color name string;

-case is ignored.

-.IP \fIexact_def_return\fP 1i

-Returns the exact color value for later use and sets the

-.ZN DoRed ,

-.ZN DoGreen ,

-and

-.ZN DoBlue

-flags.

-.SH DESCRIPTION

-The

-.ZN XQueryColor

-function returns the current RGB value for the pixel in the

-.ZN XColor

-structure and sets the

-.ZN DoRed ,

-.ZN DoGreen ,

-and

-.ZN DoBlue

-flags.

-The

-.ZN XQueryColors

-function returns the RGB value for each pixel in each

-.ZN XColor

-structure and sets the

-.ZN DoRed ,

-.ZN DoGreen ,

-and

-.ZN DoBlue

-flags in each structure.

-

-.LP

-.ZN XQueryColor

-and

-.ZN XQueryColors

-can generate

-.ZN BadColor

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XLookupColor

-function looks up the string name of a color with respect to the screen

-associated with the specified colormap.

-It returns both the exact color values and

-the closest values provided by the screen 

-with respect to the visual type of the specified colormap.

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-.ZN XLookupColor

-returns nonzero if the name is resolved;

-otherwise, it returns zero.

-.LP

-The

-.ZN XParseColor

-function looks up the string name of a color with respect to the screen

-associated with the specified colormap.

-It returns the exact color value.

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-.ZN XParseColor

-returns nonzero if the name is resolved;

-otherwise, it returns zero.

-.LP

-.ZN XLookupColor

-and

-.ZN XParseColor

-can generate

-.ZN BadColor 

-error.

-.SH "COLOR NAMES"

-An RGB Device specification is identified by

-the prefix ``rgb:'' and conforms to the following syntax:

-.LP

-.\" Start marker code here

-.Ds 0

-rgb:\fI<red>/<green>/<blue>\fP

-

-    \fI<red>\fP, \fI<green>\fP, \fI<blue>\fP := \fIh\fP | \fIhh\fP | \fIhhh\fP | \fIhhhh\fP

-    \fIh\fP := single hexadecimal digits (case insignificant)

-.De

-.\" End marker code here

-.LP

-Note that \fIh\fP indicates the value scaled in 4 bits, 

-\fIhh\fP the value scaled in 8 bits,

-\fIhhh\fP the value scaled in 12 bits,

-and \fIhhhh\fP the value scaled in 16 bits, respectively.

-.LP

-For backward compatibility, an older syntax for RGB Device is

-supported, but its continued use is not encouraged.

-The syntax is an initial sharp sign character followed by

-a numeric specification, in one of the following formats:

-.LP

-.TS

-l l.

-\&#RGB	(4 bits each)

-\&#RRGGBB	(8 bits each)

-\&#RRRGGGBBB	(12 bits each)

-\&#RRRRGGGGBBBB	(16 bits each)

-.TE

-.LP

-The R, G, and B represent single hexadecimal digits.

-When fewer than 16 bits each are specified, 

-they represent the most significant bits of the value

-(unlike the ``rgb:'' syntax, in which values are scaled).

-For example, the string ``#3a7'' is the same as ``#3000a0007000''.

-.LP

-An RGB intensity specification is identified

-by the prefix ``rgbi:'' and conforms to the following syntax:

-.LP

-.\" Start marker code here

-.Ds 0

-rgbi:\fI<red>/<green>/<blue>\fP

-.De

-.\" End marker code here

-.LP

-Note that red, green, and blue are floating-point values

-between 0.0 and 1.0, inclusive.

-The input format for these values is an optional sign,

-a string of numbers possibly containing a decimal point,

-and an optional exponent field containing an E or e 

-followed by a possibly signed integer string.

-.LP

-The standard device-independent string specifications have

-the following syntax:

-.LP

-.\" Start marker code here

-.Ds 0

-CIEXYZ:\fI<X>/<Y>/<Z>\fP

-CIEuvY:\fI<u>/<v>/<Y>\fP

-CIExyY:\fI<x>/<y>/<Y>\fP

-CIELab:\fI<L>/<a>/<b>\fP

-CIELuv:\fI<L>/<u>/<v>\fP

-TekHVC:\fI<H>/<V>/<C>\fP

-.De

-.\" End marker code here

-.LP

-All of the values (C, H, V, X, Y, Z, a, b, u, v, y, x) are

-floating-point values.

-The syntax for these values is an optional plus or minus sign,

-a string of digits possibly containing a decimal point,

-and an optional exponent field consisting of an ``E'' or ``e''

-followed by an optional plus or minus followed by a string of digits.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XAllocColor(__libmansuffix__),

-XCreateColormap(__libmansuffix__),

-XStoreColors(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XQueryColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XQueryColor, XQueryColors, XLookupColor, XParseColor \- obtain color values
+.SH SYNTAX
+.HP
+int XQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^, XColor
+*\fIdef_in_out\fP\^); 
+.HP
+int XQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor \fIdefs_in_out\fP[\^]\^, int \fIncolors\fP\^); 
+.HP
+Status XLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\fIcolor_name\fP\^, XColor *\fIexact_def_return\fP\^, XColor
+*\fIscreen_def_return\fP\^); 
+.HP
+Status XParseColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\fIspec\fP\^, XColor *\fIexact_def_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIcolor_name\fP 1i
+Specifies the color name string (for example, red) whose color 
+definition structure you want returned.
+.IP \fIdef_in_out\fP 1i
+Specifies and returns the RGB values for the pixel specified in the structure.
+.IP \fIdefs_in_out\fP 1i
+Specifies and returns an array of color definition structures for the pixel
+specified in the structure.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIexact_def_return\fP 1i
+Returns the exact RGB values.
+.IP \fIncolors\fP 1i
+.\"Specifies the number of color definition structures. 
+Specifies the number of 
+.ZN XColor
+structures in the color definition array.
+.IP \fIscreen_def_return\fP 1i
+Returns the closest RGB values provided by the hardware.
+.IP \fIspec\fP 1i
+Specifies the color name string;
+case is ignored.
+.IP \fIexact_def_return\fP 1i
+Returns the exact color value for later use and sets the
+.ZN DoRed ,
+.ZN DoGreen ,
+and
+.ZN DoBlue
+flags.
+.SH DESCRIPTION
+The
+.ZN XQueryColor
+function returns the current RGB value for the pixel in the
+.ZN XColor
+structure and sets the
+.ZN DoRed ,
+.ZN DoGreen ,
+and
+.ZN DoBlue
+flags.
+The
+.ZN XQueryColors
+function returns the RGB value for each pixel in each
+.ZN XColor
+structure and sets the
+.ZN DoRed ,
+.ZN DoGreen ,
+and
+.ZN DoBlue
+flags in each structure.
+
+.LP
+.ZN XQueryColor
+and
+.ZN XQueryColors
+can generate
+.ZN BadColor
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XLookupColor
+function looks up the string name of a color with respect to the screen
+associated with the specified colormap.
+It returns both the exact color values and
+the closest values provided by the screen 
+with respect to the visual type of the specified colormap.
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+.ZN XLookupColor
+returns nonzero if the name is resolved;
+otherwise, it returns zero.
+.LP
+The
+.ZN XParseColor
+function looks up the string name of a color with respect to the screen
+associated with the specified colormap.
+It returns the exact color value.
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+.ZN XParseColor
+returns nonzero if the name is resolved;
+otherwise, it returns zero.
+.LP
+.ZN XLookupColor
+and
+.ZN XParseColor
+can generate
+.ZN BadColor 
+error.
+.SH "COLOR NAMES"
+An RGB Device specification is identified by
+the prefix ``rgb:'' and conforms to the following syntax:
+.LP
+.\" Start marker code here
+.Ds 0
+rgb:\fI<red>/<green>/<blue>\fP
+
+    \fI<red>\fP, \fI<green>\fP, \fI<blue>\fP := \fIh\fP | \fIhh\fP | \fIhhh\fP | \fIhhhh\fP
+    \fIh\fP := single hexadecimal digits (case insignificant)
+.De
+.\" End marker code here
+.LP
+Note that \fIh\fP indicates the value scaled in 4 bits, 
+\fIhh\fP the value scaled in 8 bits,
+\fIhhh\fP the value scaled in 12 bits,
+and \fIhhhh\fP the value scaled in 16 bits, respectively.
+.LP
+For backward compatibility, an older syntax for RGB Device is
+supported, but its continued use is not encouraged.
+The syntax is an initial sharp sign character followed by
+a numeric specification, in one of the following formats:
+.LP
+.TS
+l l.
+\&#RGB	(4 bits each)
+\&#RRGGBB	(8 bits each)
+\&#RRRGGGBBB	(12 bits each)
+\&#RRRRGGGGBBBB	(16 bits each)
+.TE
+.LP
+The R, G, and B represent single hexadecimal digits.
+When fewer than 16 bits each are specified, 
+they represent the most significant bits of the value
+(unlike the ``rgb:'' syntax, in which values are scaled).
+For example, the string ``#3a7'' is the same as ``#3000a0007000''.
+.LP
+An RGB intensity specification is identified
+by the prefix ``rgbi:'' and conforms to the following syntax:
+.LP
+.\" Start marker code here
+.Ds 0
+rgbi:\fI<red>/<green>/<blue>\fP
+.De
+.\" End marker code here
+.LP
+Note that red, green, and blue are floating-point values
+between 0.0 and 1.0, inclusive.
+The input format for these values is an optional sign,
+a string of numbers possibly containing a decimal point,
+and an optional exponent field containing an E or e 
+followed by a possibly signed integer string.
+.LP
+The standard device-independent string specifications have
+the following syntax:
+.LP
+.\" Start marker code here
+.Ds 0
+CIEXYZ:\fI<X>/<Y>/<Z>\fP
+CIEuvY:\fI<u>/<v>/<Y>\fP
+CIExyY:\fI<x>/<y>/<Y>\fP
+CIELab:\fI<L>/<a>/<b>\fP
+CIELuv:\fI<L>/<u>/<v>\fP
+TekHVC:\fI<H>/<V>/<C>\fP
+.De
+.\" End marker code here
+.LP
+All of the values (C, H, V, X, Y, Z, a, b, u, v, y, x) are
+floating-point values.
+The syntax for these values is an optional plus or minus sign,
+a string of digits possibly containing a decimal point,
+and an optional exponent field consisting of an ``E'' or ``e''
+followed by an optional plus or minus followed by a string of digits.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XStoreColors(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XQueryPointer.man b/libX11/man/XQueryPointer.man
index c8b35b2cb..dd25486da 100644
--- a/libX11/man/XQueryPointer.man
+++ b/libX11/man/XQueryPointer.man
@@ -1,219 +1,158 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XQueryPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XQueryPointer \- get pointer coordinates

-.SH SYNTAX

-.HP

-Bool XQueryPointer\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window

-*\fIroot_return\fP\^, Window *\fIchild_return\fP\^, int

-*\fIroot_x_return\fP\^, int *\fIroot_y_return\fP\^, int *\fIwin_x_return\fP\^,

-int *\fIwin_y_return\fP\^, unsigned int *\fImask_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIchild_return\fP 1i

-Returns the child window that the pointer is located in, if any.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fImask_return\fP 1i

-Returns the current state of the modifier keys and pointer buttons.

-.ds Ro that the pointer is in

-.IP \fIroot_return\fP 1i

-Returns the root window \*(Ro.

-.IP \fIroot_x_return\fP 1i

-.br

-.ns

-.IP \fIroot_y_return\fP 1i

-Return the pointer coordinates relative to the root window's origin.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIwin_x_return\fP 1i

-.br

-.ns

-.IP \fIwin_y_return\fP 1i

-Return the pointer coordinates relative to the specified window.

-.SH DESCRIPTION

-The

-.ZN XQueryPointer

-function returns the root window the pointer is logically on and the pointer

-coordinates relative to the root window's origin.

-If

-.ZN XQueryPointer

-returns 

-.ZN False , 

-the pointer is not on the same screen as the specified window, and

-.ZN XQueryPointer

-returns 

-.ZN None

-to child_return and zero to win_x_return and win_y_return.

-If 

-.ZN XQueryPointer

-returns 

-.ZN True , 

-the pointer coordinates returned to win_x_return and win_y_return

-are relative to the origin of the specified window.

-In this case, 

-.ZN XQueryPointer

-returns the child that contains the pointer, if any,

-or else

-.ZN None

-to child_return.

-.LP

-.ZN XQueryPointer

-returns the current logical state of the keyboard buttons 

-and the modifier keys in mask_return.

-It sets mask_return to the bitwise inclusive OR of one or more

-of the button or modifier key bitmasks to match 

-the current state of the mouse buttons and the modifier keys.

-.LP

-.ZN XQueryPointer

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XGetWindowAttributes(__libmansuffix__),

-XQueryTree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XQueryPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XQueryPointer \- get pointer coordinates
+.SH SYNTAX
+.HP
+Bool XQueryPointer\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+*\fIroot_return\fP\^, Window *\fIchild_return\fP\^, int
+*\fIroot_x_return\fP\^, int *\fIroot_y_return\fP\^, int *\fIwin_x_return\fP\^,
+int *\fIwin_y_return\fP\^, unsigned int *\fImask_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIchild_return\fP 1i
+Returns the child window that the pointer is located in, if any.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fImask_return\fP 1i
+Returns the current state of the modifier keys and pointer buttons.
+.ds Ro that the pointer is in
+.IP \fIroot_return\fP 1i
+Returns the root window \*(Ro.
+.IP \fIroot_x_return\fP 1i
+.br
+.ns
+.IP \fIroot_y_return\fP 1i
+Return the pointer coordinates relative to the root window's origin.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwin_x_return\fP 1i
+.br
+.ns
+.IP \fIwin_y_return\fP 1i
+Return the pointer coordinates relative to the specified window.
+.SH DESCRIPTION
+The
+.ZN XQueryPointer
+function returns the root window the pointer is logically on and the pointer
+coordinates relative to the root window's origin.
+If
+.ZN XQueryPointer
+returns 
+.ZN False , 
+the pointer is not on the same screen as the specified window, and
+.ZN XQueryPointer
+returns 
+.ZN None
+to child_return and zero to win_x_return and win_y_return.
+If 
+.ZN XQueryPointer
+returns 
+.ZN True , 
+the pointer coordinates returned to win_x_return and win_y_return
+are relative to the origin of the specified window.
+In this case, 
+.ZN XQueryPointer
+returns the child that contains the pointer, if any,
+or else
+.ZN None
+to child_return.
+.LP
+.ZN XQueryPointer
+returns the current logical state of the keyboard buttons 
+and the modifier keys in mask_return.
+It sets mask_return to the bitwise inclusive OR of one or more
+of the button or modifier key bitmasks to match 
+the current state of the mouse buttons and the modifier keys.
+.LP
+.ZN XQueryPointer
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XGetWindowAttributes(__libmansuffix__),
+XQueryTree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XQueryTree.man b/libX11/man/XQueryTree.man
index 203cc9a4e..24ca96558 100644
--- a/libX11/man/XQueryTree.man
+++ b/libX11/man/XQueryTree.man
@@ -1,194 +1,133 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XQueryTree __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XQueryTree \- query window tree information

-.SH SYNTAX

-.HP

-Status XQueryTree\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window

-*\fIroot_return\fP\^, Window *\fIparent_return\fP\^, Window

-**\fIchildren_return\fP\^, unsigned int *\fInchildren_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIchildren_return\fP 1i

-Returns the list of children.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fInchildren_return\fP 1i

-Returns the number of children.

-.IP \fIparent_return\fP 1i

-Returns the parent window.

-.IP \fIroot_return\fP 1i

-Returns the root window.

-.ds Wi whose list of children, root, parent, and number of children \

-you want to obtain

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XQueryTree

-function returns the root ID, the parent window ID, 

-a pointer to the list of children windows

-(NULL when there are no children), 

-and the number of children in the list for the specified window.

-The children are listed in current stacking order, from bottom-most 

-(first) to top-most (last).

-.ZN XQueryTree

-returns zero if it fails and nonzero if it succeeds.

-To free a non-NULL children list when it is no longer needed, use 

-.ZN XFree .

-.LP

-.ZN XQueryTree

-can generate a

-.ZN BadWindow

-error.

-.SH BUGS

-This really should return a screen *, not a root window ID.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XFree(__libmansuffix__),

-XGetWindowAttributes(__libmansuffix__),

-XQueryPointer(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XQueryTree __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XQueryTree \- query window tree information
+.SH SYNTAX
+.HP
+Status XQueryTree\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+*\fIroot_return\fP\^, Window *\fIparent_return\fP\^, Window
+**\fIchildren_return\fP\^, unsigned int *\fInchildren_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIchildren_return\fP 1i
+Returns the list of children.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInchildren_return\fP 1i
+Returns the number of children.
+.IP \fIparent_return\fP 1i
+Returns the parent window.
+.IP \fIroot_return\fP 1i
+Returns the root window.
+.ds Wi whose list of children, root, parent, and number of children \
+you want to obtain
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XQueryTree
+function returns the root ID, the parent window ID, 
+a pointer to the list of children windows
+(NULL when there are no children), 
+and the number of children in the list for the specified window.
+The children are listed in current stacking order, from bottom-most 
+(first) to top-most (last).
+.ZN XQueryTree
+returns zero if it fails and nonzero if it succeeds.
+To free a non-NULL children list when it is no longer needed, use 
+.ZN XFree .
+.LP
+.ZN XQueryTree
+can generate a
+.ZN BadWindow
+error.
+.SH BUGS
+This really should return a screen *, not a root window ID.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XFree(__libmansuffix__),
+XGetWindowAttributes(__libmansuffix__),
+XQueryPointer(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XRaiseWindow.man b/libX11/man/XRaiseWindow.man
index 071a884bc..4dcd6a756 100644
--- a/libX11/man/XRaiseWindow.man
+++ b/libX11/man/XRaiseWindow.man
@@ -1,346 +1,285 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XRaiseWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XRaiseWindow, XLowerWindow, XCirculateSubwindows, XCirculateSubwindowsUp, XCirculateSubwindowsDown, XRestackWindows \- change window stacking order

-.SH SYNTAX

-.HP

-int XRaiseWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XLowerWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XCirculateSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int

-\fIdirection\fP\^); 

-.HP

-int XCirculateSubwindowsUp\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XCirculateSubwindowsDown\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XRestackWindows\^(\^Display *\fIdisplay\fP\^, Window \fIwindows\fP\^[], int

-\fInwindows\fP\^); 

-.SH ARGUMENTS

-.IP \fIdirection\fP 1i

-Specifies the direction (up or down) that you want to circulate

-the window. 

-You can pass 

-.ZN RaiseLowest

-or

-.ZN LowerHighest .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fInwindows\fP 1i

-Specifies the number of windows to be restacked.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIwindows\fP 1i

-Specifies an array containing the windows to be restacked.

-.SH DESCRIPTION

-The

-.ZN XRaiseWindow

-function

-raises the specified window to the top of the stack so that no sibling window

-obscures it.

-If the windows are regarded as overlapping sheets of paper stacked 

-on a desk,

-then raising a window is analogous to moving the sheet to the top of

-the stack but leaving its x and y location on the desk constant.

-Raising a mapped window may generate 

-.ZN Expose

-events for the window and any mapped subwindows that were formerly obscured.  

-.LP

-If the override-redirect attribute of the window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates a

-.ZN ConfigureRequest 

-event, and no processing is performed.

-Otherwise, the window is raised.

-.LP

-.ZN XRaiseWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XLowerWindow

-function lowers the specified window to the bottom of the stack

-so that it does not obscure any sibling

-windows.

-If the windows are regarded as overlapping sheets of paper

-stacked on a desk, then lowering a window is analogous to moving the

-sheet to the bottom of the stack but leaving its x and y location on

-the desk constant.

-Lowering a mapped window will generate 

-.ZN Expose 

-events on any windows it formerly obscured.

-.LP

-If the override-redirect attribute of the window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates a

-.ZN ConfigureRequest 

-event, and no processing is performed.  

-Otherwise, the window is lowered to the bottom of the

-stack.

-.LP

-.ZN XLowerWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XCirculateSubwindows

-function circulates children of the specified window in the specified 

-direction.

-If you specify

-.ZN RaiseLowest ,

-.ZN XCirculateSubwindows

-raises the lowest mapped child (if any) that is occluded 

-by another child to the top of the stack.

-If you specify

-.ZN LowerHighest ,

-.ZN XCirculateSubwindows

-lowers the highest mapped child (if any) that occludes another child

-to the bottom of the stack.

-Exposure processing is then performed on formerly obscured windows.

-If some other client has selected 

-.ZN SubstructureRedirectMask 

-on the window, the X server generates a 

-.ZN CirculateRequest 

-event, and no further processing is performed.

-If a child is actually restacked,

-the X server generates a

-.ZN CirculateNotify

-event. 

-.LP

-.ZN XCirculateSubwindows

-can generate

-.ZN BadValue

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XCirculateSubwindowsUp

-function raises the lowest mapped child of the specified window that

-is partially

-or completely

-occluded by another child.

-Completely unobscured children are not affected.

-This is a convenience function equivalent to

-.ZN XCirculateSubwindows

-with

-.ZN RaiseLowest

-specified.

-.LP

-.ZN XCirculateSubwindowsUp

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XCirculateSubwindowsDown

-function lowers the highest mapped child of the specified window that partially

-or completely occludes another child.

-Completely unobscured children are not affected.

-This is a convenience function equivalent to

-.ZN XCirculateSubwindows

-with

-.ZN LowerHighest

-specified.

-.LP

-.ZN XCirculateSubwindowsDown

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XRestackWindows

-function restacks the windows in the order specified,

-from top to bottom.

-The stacking order of the first window in the windows array is unaffected,

-but the other windows in the array are stacked underneath the first window,

-in the order of the array.

-The stacking order of the other windows is not affected.

-For each window in the window array that is not a sibling of the first window,

-a

-.ZN BadMatch

-error results.

-.LP

-If the override-redirect attribute of a window is 

-.ZN False 

-and some

-other client has selected 

-.ZN SubstructureRedirectMask 

-on the parent, the X server generates 

-.ZN ConfigureRequest 

-events for each window whose override-redirect flag is not set, 

-and no further processing is performed.

-Otherwise, the windows will be restacked in top-to-bottom order.

-.LP

-.ZN XRestackWindows

-can generate

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XMapWindow(__libmansuffix__),

-XUnmapWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XRaiseWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XRaiseWindow, XLowerWindow, XCirculateSubwindows, XCirculateSubwindowsUp, XCirculateSubwindowsDown, XRestackWindows \- change window stacking order
+.SH SYNTAX
+.HP
+int XRaiseWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XLowerWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XCirculateSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIdirection\fP\^); 
+.HP
+int XCirculateSubwindowsUp\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XCirculateSubwindowsDown\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XRestackWindows\^(\^Display *\fIdisplay\fP\^, Window \fIwindows\fP\^[], int
+\fInwindows\fP\^); 
+.SH ARGUMENTS
+.IP \fIdirection\fP 1i
+Specifies the direction (up or down) that you want to circulate
+the window. 
+You can pass 
+.ZN RaiseLowest
+or
+.ZN LowerHighest .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInwindows\fP 1i
+Specifies the number of windows to be restacked.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwindows\fP 1i
+Specifies an array containing the windows to be restacked.
+.SH DESCRIPTION
+The
+.ZN XRaiseWindow
+function
+raises the specified window to the top of the stack so that no sibling window
+obscures it.
+If the windows are regarded as overlapping sheets of paper stacked 
+on a desk,
+then raising a window is analogous to moving the sheet to the top of
+the stack but leaving its x and y location on the desk constant.
+Raising a mapped window may generate 
+.ZN Expose
+events for the window and any mapped subwindows that were formerly obscured.  
+.LP
+If the override-redirect attribute of the window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates a
+.ZN ConfigureRequest 
+event, and no processing is performed.
+Otherwise, the window is raised.
+.LP
+.ZN XRaiseWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XLowerWindow
+function lowers the specified window to the bottom of the stack
+so that it does not obscure any sibling
+windows.
+If the windows are regarded as overlapping sheets of paper
+stacked on a desk, then lowering a window is analogous to moving the
+sheet to the bottom of the stack but leaving its x and y location on
+the desk constant.
+Lowering a mapped window will generate 
+.ZN Expose 
+events on any windows it formerly obscured.
+.LP
+If the override-redirect attribute of the window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates a
+.ZN ConfigureRequest 
+event, and no processing is performed.  
+Otherwise, the window is lowered to the bottom of the
+stack.
+.LP
+.ZN XLowerWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XCirculateSubwindows
+function circulates children of the specified window in the specified 
+direction.
+If you specify
+.ZN RaiseLowest ,
+.ZN XCirculateSubwindows
+raises the lowest mapped child (if any) that is occluded 
+by another child to the top of the stack.
+If you specify
+.ZN LowerHighest ,
+.ZN XCirculateSubwindows
+lowers the highest mapped child (if any) that occludes another child
+to the bottom of the stack.
+Exposure processing is then performed on formerly obscured windows.
+If some other client has selected 
+.ZN SubstructureRedirectMask 
+on the window, the X server generates a 
+.ZN CirculateRequest 
+event, and no further processing is performed.
+If a child is actually restacked,
+the X server generates a
+.ZN CirculateNotify
+event. 
+.LP
+.ZN XCirculateSubwindows
+can generate
+.ZN BadValue
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XCirculateSubwindowsUp
+function raises the lowest mapped child of the specified window that
+is partially
+or completely
+occluded by another child.
+Completely unobscured children are not affected.
+This is a convenience function equivalent to
+.ZN XCirculateSubwindows
+with
+.ZN RaiseLowest
+specified.
+.LP
+.ZN XCirculateSubwindowsUp
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XCirculateSubwindowsDown
+function lowers the highest mapped child of the specified window that partially
+or completely occludes another child.
+Completely unobscured children are not affected.
+This is a convenience function equivalent to
+.ZN XCirculateSubwindows
+with
+.ZN LowerHighest
+specified.
+.LP
+.ZN XCirculateSubwindowsDown
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XRestackWindows
+function restacks the windows in the order specified,
+from top to bottom.
+The stacking order of the first window in the windows array is unaffected,
+but the other windows in the array are stacked underneath the first window,
+in the order of the array.
+The stacking order of the other windows is not affected.
+For each window in the window array that is not a sibling of the first window,
+a
+.ZN BadMatch
+error results.
+.LP
+If the override-redirect attribute of a window is 
+.ZN False 
+and some
+other client has selected 
+.ZN SubstructureRedirectMask 
+on the parent, the X server generates 
+.ZN ConfigureRequest 
+events for each window whose override-redirect flag is not set, 
+and no further processing is performed.
+Otherwise, the windows will be restacked in top-to-bottom order.
+.LP
+.ZN XRestackWindows
+can generate
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XReadBitmapFile.man b/libX11/man/XReadBitmapFile.man
index 6028e6c70..163c80394 100644
--- a/libX11/man/XReadBitmapFile.man
+++ b/libX11/man/XReadBitmapFile.man
@@ -1,356 +1,295 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XReadBitmapFile __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XReadBitmapFile, XReadBitmapFileData, XWriteBitmapFile, XCreatePixmapFromBitmapData, XCreateBitmapFromData \- manipulate bitmaps

-.SH SYNTAX

-.HP

-int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, char

-*\fIfilename\fP\^, unsigned int *\fIwidth_return\fP, unsigned int

-*\fIheight_return\fP\^, Pixmap *\fIbitmap_return\fP\^, int

-*\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 

-.HP

-int XReadBitmapFileData(\^char *\fIfilename\fP\^, unsigned int

-*\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^, unsigned char

-*\fIdata_return\fP\^, int *\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 

-.HP

-int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, char *\fIfilename\fP\^,

-Pixmap \fIbitmap\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,

-int \fIx_hot\fP, int \fIy_hot\fP\^); 

-.HP

-Pixmap XCreatePixmapFromBitmapData\^(\^Display *\fIdisplay\fP\^, Drawable

-\fId\fP\^, char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int

-\fIheight\fP\^, unsigned long \fIfg\fP, unsigned long \fIbg\fP\^, unsigned int

-\fIdepth\fP\^); 

-.HP

-Pixmap XCreateBitmapFromData(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^); 

-.SH ARGUMENTS

-.IP \fIbitmap\fP 1i

-Specifies the bitmap.

-.IP \fIbitmap_return\fP 1i

-Returns the bitmap that is created.

-.ds Dr \ that indicates the screen

-.IP \fId\fP 1i

-Specifies the drawable\*(Dr. 

-.IP \fIdata\fP 1i

-Specifies the data in bitmap format.

-.IP \fIdata\fP 1i

-Specifies the location of the bitmap data.

-.IP \fIdata_return\fP 1i

-Returns the bitmap data.

-.IP \fIdepth\fP 1i

-Specifies the depth of the pixmap.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfg\fP 1i

-.br

-.ns

-.IP \fIbg\fP 1i

-Specify the foreground and background pixel values to use.

-.IP \fIfilename\fP 1i

-Specifies the file name to use.

-The format of the file name is operating-system dependent.

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height.

-.IP \fIwidth_return\fP 1i

-.br

-.ns

-.IP \fIheight_return\fP 1i

-Return the width and height values of the read in bitmap file.

-.IP \fIx_hot\fP 1i

-.br

-.ns

-.IP \fIy_hot\fP 1i

-Specify where to place the hotspot coordinates (or \-1,\-1 if none are present)

-in the file.

-.IP \fIx_hot_return\fP 1i

-.br

-.ns

-.IP \fIy_hot_return\fP 1i

-Return the hotspot coordinates.

-.SH DESCRIPTION

-The

-.ZN XReadBitmapFile

-function reads in a file containing a bitmap.

-The file is parsed in the encoding of the current locale.

-The ability to read other than the standard format 

-is implementation-dependent.

-If the file cannot be opened, 

-.ZN XReadBitmapFile 

-returns 

-.ZN BitmapOpenFailed .  

-If the file can be opened but does not contain valid bitmap data, 

-it returns 

-.ZN BitmapFileInvalid .  

-If insufficient working storage is allocated,

-it returns

-.ZN BitmapNoMemory .  

-If the file is readable and valid,

-it returns 

-.ZN BitmapSuccess .

-.LP

-.ZN XReadBitmapFile 

-returns the bitmap's height and width, as read

-from the file, to width_return and height_return.

-It then creates a pixmap of the appropriate size, 

-reads the bitmap data from the file into the pixmap,

-and assigns the pixmap to the caller's variable bitmap.  

-The caller must free the bitmap using 

-.ZN XFreePixmap 

-when finished.

-If \fIname\fP_x_hot and \fIname\fP_y_hot exist,

-.ZN XReadBitmapFile 

-returns them to x_hot_return and y_hot_return;

-otherwise, it returns \-1,\-1.

-.LP

-.ZN XReadBitmapFile

-can generate

-.ZN BadAlloc

-and

-.ZN BadDrawable

-errors.

-.LP

-The

-.ZN XReadBitmapFileData

-function reads in a file containing a bitmap, in the same manner as

-.ZN XReadBitmapFile ,

-but returns the data directly rather than creating a pixmap in the server.

-The bitmap data is returned in data_return; the client must free this

-storage when finished with it by calling

-.ZN XFree .

-The status and other return values are the same as for

-.ZN XReadBitmapFile .

-.LP

-The

-.ZN XWriteBitmapFile

-function writes a bitmap out to a file in the X Version 11 format.

-The name used in the output file is derived from the file name

-by deleting the directory prefix.

-The file is written in the encoding of the current locale.

-If the file cannot be opened for writing, 

-it returns 

-.ZN BitmapOpenFailed .  

-If insufficient memory is allocated,

-.ZN XWriteBitmapFile

-returns

-.ZN BitmapNoMemory ;

-otherwise, on no error,

-it returns

-.ZN BitmapSuccess .

-If x_hot and y_hot are not \-1, \-1, 

-.ZN XWriteBitmapFile

-writes them out as the hotspot coordinates for the bitmap.

-.LP

-.ZN XWriteBitmapFile

-can generate

-.ZN BadDrawable

-and

-.ZN BadMatch

-errors.

-.LP

-The

-.ZN XCreatePixmapFromBitmapData

-function creates a pixmap of the given depth and then does a bitmap-format

-.ZN XPutImage

-of the data into it.

-The depth must be supported by the screen of the specified drawable,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XCreatePixmapFromBitmapData

-can generate

-.ZN BadAlloc

-and

-.ZN BadMatch

-errors.

-.LP

-The

-.ZN XCreateBitmapFromData

-function allows you to include in your C program (using

-.ZN #include )

-a bitmap file that was written out by

-.ZN XWriteBitmapFile

-(X version 11 format only) without reading in the bitmap file.

-The following example creates a gray bitmap:

-.LP

-.Ds 0

-\&#include "gray.bitmap"

-.sp 6p

-Pixmap bitmap;

-bitmap = XCreateBitmapFromData(display, window, gray_bits, gray_width, gray_height);

-.De

-.LP

-If insufficient working storage was allocated,

-.ZN XCreateBitmapFromData

-returns

-.ZN None .

-It is your responsibility to free the

-bitmap using

-.ZN XFreePixmap

-when finished.

-.LP

-.ZN XCreateBitmapFromData

-can generate a

-.ZN BadAlloc

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.TP 1i

-.ZN BadMatch

-An

-.ZN InputOnly

-window is used as a Drawable.

-.SH "SEE ALSO"

-XCreatePixmap(__libmansuffix__),

-XPutImage(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XReadBitmapFile __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XReadBitmapFile, XReadBitmapFileData, XWriteBitmapFile, XCreatePixmapFromBitmapData, XCreateBitmapFromData \- manipulate bitmaps
+.SH SYNTAX
+.HP
+int XReadBitmapFile(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, char
+*\fIfilename\fP\^, unsigned int *\fIwidth_return\fP, unsigned int
+*\fIheight_return\fP\^, Pixmap *\fIbitmap_return\fP\^, int
+*\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XReadBitmapFileData(\^char *\fIfilename\fP\^, unsigned int
+*\fIwidth_return\fP, unsigned int *\fIheight_return\fP\^, unsigned char
+*\fIdata_return\fP\^, int *\fIx_hot_return\fP, int *\fIy_hot_return\fP\^); 
+.HP
+int XWriteBitmapFile(\^Display *\fIdisplay\fP\^, char *\fIfilename\fP\^,
+Pixmap \fIbitmap\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^,
+int \fIx_hot\fP, int \fIy_hot\fP\^); 
+.HP
+Pixmap XCreatePixmapFromBitmapData\^(\^Display *\fIdisplay\fP\^, Drawable
+\fId\fP\^, char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int
+\fIheight\fP\^, unsigned long \fIfg\fP, unsigned long \fIbg\fP\^, unsigned int
+\fIdepth\fP\^); 
+.HP
+Pixmap XCreateBitmapFromData(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+char *\fIdata\fP\^, unsigned int \fIwidth\fP, unsigned int \fIheight\fP\^); 
+.SH ARGUMENTS
+.IP \fIbitmap\fP 1i
+Specifies the bitmap.
+.IP \fIbitmap_return\fP 1i
+Returns the bitmap that is created.
+.ds Dr \ that indicates the screen
+.IP \fId\fP 1i
+Specifies the drawable\*(Dr. 
+.IP \fIdata\fP 1i
+Specifies the data in bitmap format.
+.IP \fIdata\fP 1i
+Specifies the location of the bitmap data.
+.IP \fIdata_return\fP 1i
+Returns the bitmap data.
+.IP \fIdepth\fP 1i
+Specifies the depth of the pixmap.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfg\fP 1i
+.br
+.ns
+.IP \fIbg\fP 1i
+Specify the foreground and background pixel values to use.
+.IP \fIfilename\fP 1i
+Specifies the file name to use.
+The format of the file name is operating-system dependent.
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height.
+.IP \fIwidth_return\fP 1i
+.br
+.ns
+.IP \fIheight_return\fP 1i
+Return the width and height values of the read in bitmap file.
+.IP \fIx_hot\fP 1i
+.br
+.ns
+.IP \fIy_hot\fP 1i
+Specify where to place the hotspot coordinates (or \-1,\-1 if none are present)
+in the file.
+.IP \fIx_hot_return\fP 1i
+.br
+.ns
+.IP \fIy_hot_return\fP 1i
+Return the hotspot coordinates.
+.SH DESCRIPTION
+The
+.ZN XReadBitmapFile
+function reads in a file containing a bitmap.
+The file is parsed in the encoding of the current locale.
+The ability to read other than the standard format 
+is implementation-dependent.
+If the file cannot be opened, 
+.ZN XReadBitmapFile 
+returns 
+.ZN BitmapOpenFailed .  
+If the file can be opened but does not contain valid bitmap data, 
+it returns 
+.ZN BitmapFileInvalid .  
+If insufficient working storage is allocated,
+it returns
+.ZN BitmapNoMemory .  
+If the file is readable and valid,
+it returns 
+.ZN BitmapSuccess .
+.LP
+.ZN XReadBitmapFile 
+returns the bitmap's height and width, as read
+from the file, to width_return and height_return.
+It then creates a pixmap of the appropriate size, 
+reads the bitmap data from the file into the pixmap,
+and assigns the pixmap to the caller's variable bitmap.  
+The caller must free the bitmap using 
+.ZN XFreePixmap 
+when finished.
+If \fIname\fP_x_hot and \fIname\fP_y_hot exist,
+.ZN XReadBitmapFile 
+returns them to x_hot_return and y_hot_return;
+otherwise, it returns \-1,\-1.
+.LP
+.ZN XReadBitmapFile
+can generate
+.ZN BadAlloc
+and
+.ZN BadDrawable
+errors.
+.LP
+The
+.ZN XReadBitmapFileData
+function reads in a file containing a bitmap, in the same manner as
+.ZN XReadBitmapFile ,
+but returns the data directly rather than creating a pixmap in the server.
+The bitmap data is returned in data_return; the client must free this
+storage when finished with it by calling
+.ZN XFree .
+The status and other return values are the same as for
+.ZN XReadBitmapFile .
+.LP
+The
+.ZN XWriteBitmapFile
+function writes a bitmap out to a file in the X Version 11 format.
+The name used in the output file is derived from the file name
+by deleting the directory prefix.
+The file is written in the encoding of the current locale.
+If the file cannot be opened for writing, 
+it returns 
+.ZN BitmapOpenFailed .  
+If insufficient memory is allocated,
+.ZN XWriteBitmapFile
+returns
+.ZN BitmapNoMemory ;
+otherwise, on no error,
+it returns
+.ZN BitmapSuccess .
+If x_hot and y_hot are not \-1, \-1, 
+.ZN XWriteBitmapFile
+writes them out as the hotspot coordinates for the bitmap.
+.LP
+.ZN XWriteBitmapFile
+can generate
+.ZN BadDrawable
+and
+.ZN BadMatch
+errors.
+.LP
+The
+.ZN XCreatePixmapFromBitmapData
+function creates a pixmap of the given depth and then does a bitmap-format
+.ZN XPutImage
+of the data into it.
+The depth must be supported by the screen of the specified drawable,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XCreatePixmapFromBitmapData
+can generate
+.ZN BadAlloc
+and
+.ZN BadMatch
+errors.
+.LP
+The
+.ZN XCreateBitmapFromData
+function allows you to include in your C program (using
+.ZN #include )
+a bitmap file that was written out by
+.ZN XWriteBitmapFile
+(X version 11 format only) without reading in the bitmap file.
+The following example creates a gray bitmap:
+.LP
+.Ds 0
+\&#include "gray.bitmap"
+.sp 6p
+Pixmap bitmap;
+bitmap = XCreateBitmapFromData(display, window, gray_bits, gray_width, gray_height);
+.De
+.LP
+If insufficient working storage was allocated,
+.ZN XCreateBitmapFromData
+returns
+.ZN None .
+It is your responsibility to free the
+bitmap using
+.ZN XFreePixmap
+when finished.
+.LP
+.ZN XCreateBitmapFromData
+can generate a
+.ZN BadAlloc
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.TP 1i
+.ZN BadMatch
+An
+.ZN InputOnly
+window is used as a Drawable.
+.SH "SEE ALSO"
+XCreatePixmap(__libmansuffix__),
+XPutImage(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XRecolorCursor.man b/libX11/man/XRecolorCursor.man
index f9900f0a7..dfaec988a 100644
--- a/libX11/man/XRecolorCursor.man
+++ b/libX11/man/XRecolorCursor.man
@@ -1,232 +1,171 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XRecolorCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XRecolorCursor, XFreeCursor, XQueryBestCursor \- manipulate cursors

-.SH SYNTAX

-.HP

-int XRecolorCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^, XColor

-*\fIforeground_color\fP\^, XColor *\fIbackground_color\fP\^); 

-.HP

-int XFreeCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^); 

-.HP

-Status XQueryBestCursor\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int

-*\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIbackground_color\fP 1i

-Specifies the RGB values for the background of the source.

-.IP \fIcursor\fP 1i

-Specifies the cursor. 

-.ds Dr , which indicates the screen

-.IP \fId\fP 1i

-Specifies the drawable\*(Dr. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIforeground_color\fP 1i

-Specifies the RGB values for the foreground of the source. 

-.ds Wh  of the cursor that you want the size information for

-.IP \fIwidth\fP 1i

-.br

-.ns

-.IP \fIheight\fP 1i

-Specify the width and height\*(Wh.

-.IP \fIwidth_return\fP 1i

-.br

-.ns

-.IP \fIheight_return\fP 1i

-Return the best width and height that is closest to the specified width 

-and height.

-.SH DESCRIPTION

-The

-.ZN XRecolorCursor

-function changes the color of the specified cursor, and

-if the cursor is being displayed on a screen,

-the change is visible immediately.

-The pixel members of the

-.ZN XColor

-structures are ignored; only the RGB values are used.

-.LP

-.ZN XRecolorCursor

-can generate a

-.ZN BadCursor 

-error.

-.LP

-The

-.ZN XFreeCursor

-function deletes the association between the cursor resource ID 

-and the specified cursor.

-The cursor storage is freed when no other resource references it.

-The specified cursor ID should not be referred to again.

-.LP

-.ZN XFreeCursor

-can generate a

-.ZN BadCursor 

-error.

-.LP

-Some displays allow larger cursors than other displays.

-The

-.ZN XQueryBestCursor

-function provides a way to find out what size cursors are actually

-possible on the display.

-.IN "Cursor" "limitations" 

-It returns the largest size that can be displayed.

-Applications should be prepared to use smaller cursors on displays that

-cannot support large ones.

-.LP

-.ZN XQueryBestCursor

-can generate a

-.ZN BadDrawable 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadDrawable

-A value for a Drawable argument does not name a defined Window or Pixmap.

-.SH "SEE ALSO"

-XCreateColormap(__libmansuffix__),

-XCreateFontCursor(__libmansuffix__),

-XDefineCursor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XRecolorCursor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XRecolorCursor, XFreeCursor, XQueryBestCursor \- manipulate cursors
+.SH SYNTAX
+.HP
+int XRecolorCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^, XColor
+*\fIforeground_color\fP\^, XColor *\fIbackground_color\fP\^); 
+.HP
+int XFreeCursor\^(\^Display *\fIdisplay\fP\^, Cursor \fIcursor\fP\^); 
+.HP
+Status XQueryBestCursor\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+unsigned int \fIwidth\fP\^, unsigned int \fIheight\fP\^, unsigned int
+*\fIwidth_return\fP\^, unsigned int *\fIheight_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIbackground_color\fP 1i
+Specifies the RGB values for the background of the source.
+.IP \fIcursor\fP 1i
+Specifies the cursor. 
+.ds Dr , which indicates the screen
+.IP \fId\fP 1i
+Specifies the drawable\*(Dr. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIforeground_color\fP 1i
+Specifies the RGB values for the foreground of the source. 
+.ds Wh  of the cursor that you want the size information for
+.IP \fIwidth\fP 1i
+.br
+.ns
+.IP \fIheight\fP 1i
+Specify the width and height\*(Wh.
+.IP \fIwidth_return\fP 1i
+.br
+.ns
+.IP \fIheight_return\fP 1i
+Return the best width and height that is closest to the specified width 
+and height.
+.SH DESCRIPTION
+The
+.ZN XRecolorCursor
+function changes the color of the specified cursor, and
+if the cursor is being displayed on a screen,
+the change is visible immediately.
+The pixel members of the
+.ZN XColor
+structures are ignored; only the RGB values are used.
+.LP
+.ZN XRecolorCursor
+can generate a
+.ZN BadCursor 
+error.
+.LP
+The
+.ZN XFreeCursor
+function deletes the association between the cursor resource ID 
+and the specified cursor.
+The cursor storage is freed when no other resource references it.
+The specified cursor ID should not be referred to again.
+.LP
+.ZN XFreeCursor
+can generate a
+.ZN BadCursor 
+error.
+.LP
+Some displays allow larger cursors than other displays.
+The
+.ZN XQueryBestCursor
+function provides a way to find out what size cursors are actually
+possible on the display.
+.IN "Cursor" "limitations" 
+It returns the largest size that can be displayed.
+Applications should be prepared to use smaller cursors on displays that
+cannot support large ones.
+.LP
+.ZN XQueryBestCursor
+can generate a
+.ZN BadDrawable 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadDrawable
+A value for a Drawable argument does not name a defined Window or Pixmap.
+.SH "SEE ALSO"
+XCreateColormap(__libmansuffix__),
+XCreateFontCursor(__libmansuffix__),
+XDefineCursor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XReparentEvent.man b/libX11/man/XReparentEvent.man
index d4dbdb867..459391c75 100644
--- a/libX11/man/XReparentEvent.man
+++ b/libX11/man/XReparentEvent.man
@@ -1,231 +1,168 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XReparentEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XReparentEvent \- ReparentNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN ReparentNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ReparentNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	Window parent;

-	int x, y;

-	Bool override_redirect;

-} XReparentEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the reparented window

-or to the old or the new parent, depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected. 

-The window member is set to the window that was reparented.

-The parent member is set to the new parent window.

-The x and y members are set to the reparented window's coordinates relative 

-to the new parent window's

-origin and define the upper-left outer corner of the reparented window.

-The override_redirect member is set to the override-redirect attribute of the

-window specified by the window member.

-Window manager clients normally should ignore this window 

-if the override_redirect member is

-.ZN True .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XReparentEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XReparentEvent \- ReparentNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN ReparentNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ReparentNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        Window parent;
+        int x, y;
+        Bool override_redirect;
+} XReparentEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the reparented window
+or to the old or the new parent, depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected. 
+The window member is set to the window that was reparented.
+The parent member is set to the new parent window.
+The x and y members are set to the reparented window's coordinates relative 
+to the new parent window's
+origin and define the upper-left outer corner of the reparented window.
+The override_redirect member is set to the override-redirect attribute of the
+window specified by the window member.
+Window manager clients normally should ignore this window 
+if the override_redirect member is
+.ZN True .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XReparentWindow.man b/libX11/man/XReparentWindow.man
index 0883eb27f..4b66ed50a 100644
--- a/libX11/man/XReparentWindow.man
+++ b/libX11/man/XReparentWindow.man
@@ -1,228 +1,167 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XReparentWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XReparentWindow \- reparent windows

-.SH SYNTAX

-.HP

-int XReparentWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window

-\fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIparent\fP 1i

-Specifies the parent window.

-.IP \fIw\fP 1i

-Specifies the window.

-.ds Xy of the position in the new parent window

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-If the specified window is mapped,

-.ZN XReparentWindow

-automatically performs an

-.ZN UnmapWindow

-request on it, removes it from its current position in the hierarchy,

-and inserts it as the child of the specified parent.

-The window is placed in the stacking order on top with respect to

-sibling windows.

-.LP

-After reparenting the specified window,

-.ZN XReparentWindow

-causes the X server to generate a

-.ZN ReparentNotify

-event.

-The override_redirect member returned in this event is

-set to the window's corresponding attribute.

-Window manager clients usually should ignore this window if this member

-is set to

-.ZN True .

-Finally, if the specified window was originally mapped,

-the X server automatically performs a

-.ZN MapWindow

-request on it.

-.LP

-The X server performs normal exposure processing on formerly obscured

-windows.

-The X server might not generate 

-.ZN Expose 

-events for regions from the initial

-.ZN UnmapWindow

-request that are immediately obscured by the final

-.ZN MapWindow

-request.

-A

-.ZN BadMatch

-error results if:

-.IP \(bu 5

-The new parent window is not on the same screen as

-the old parent window.

-.IP \(bu 5

-The new parent window is the specified window or an inferior of the

-specified window.

-.IP \(bu 5

-The new parent is

-.ZN InputOnly ,

-and the window is not.

-.IP \(bu 5

-The specified window has a

-.ZN ParentRelative

-background, and the new parent window is not the same depth as the

-specified window.

-.LP

-.ZN XReparentWindow

-can generate

-.ZN BadMatch

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeSaveSet(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XReparentWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XReparentWindow \- reparent windows
+.SH SYNTAX
+.HP
+int XReparentWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Window
+\fIparent\fP\^, int \fIx\fP\^, int \fIy\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIparent\fP 1i
+Specifies the parent window.
+.IP \fIw\fP 1i
+Specifies the window.
+.ds Xy of the position in the new parent window
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+If the specified window is mapped,
+.ZN XReparentWindow
+automatically performs an
+.ZN UnmapWindow
+request on it, removes it from its current position in the hierarchy,
+and inserts it as the child of the specified parent.
+The window is placed in the stacking order on top with respect to
+sibling windows.
+.LP
+After reparenting the specified window,
+.ZN XReparentWindow
+causes the X server to generate a
+.ZN ReparentNotify
+event.
+The override_redirect member returned in this event is
+set to the window's corresponding attribute.
+Window manager clients usually should ignore this window if this member
+is set to
+.ZN True .
+Finally, if the specified window was originally mapped,
+the X server automatically performs a
+.ZN MapWindow
+request on it.
+.LP
+The X server performs normal exposure processing on formerly obscured
+windows.
+The X server might not generate 
+.ZN Expose 
+events for regions from the initial
+.ZN UnmapWindow
+request that are immediately obscured by the final
+.ZN MapWindow
+request.
+A
+.ZN BadMatch
+error results if:
+.IP \(bu 5
+The new parent window is not on the same screen as
+the old parent window.
+.IP \(bu 5
+The new parent window is the specified window or an inferior of the
+specified window.
+.IP \(bu 5
+The new parent is
+.ZN InputOnly ,
+and the window is not.
+.IP \(bu 5
+The specified window has a
+.ZN ParentRelative
+background, and the new parent window is not the same depth as the
+specified window.
+.LP
+.ZN XReparentWindow
+can generate
+.ZN BadMatch
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeSaveSet(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XResizeRequestEvent.man b/libX11/man/XResizeRequestEvent.man
index d3cd164f2..36ea8cfd2 100644
--- a/libX11/man/XResizeRequestEvent.man
+++ b/libX11/man/XResizeRequestEvent.man
@@ -1,216 +1,153 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XResizeRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XResizeRequestEvent \- ResizeRequest event structure

-.SH STRUCTURES

-The structure for

-.ZN ResizeRequest

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* ResizeRequest */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	int width, height;

-} XResizeRequestEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window whose size another 

-client attempted to change.

-The width and height members are set to the inside size of the window, 

-excluding the border.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XResizeRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XResizeRequestEvent \- ResizeRequest event structure
+.SH STRUCTURES
+The structure for
+.ZN ResizeRequest
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* ResizeRequest */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        int width, height;
+} XResizeRequestEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window whose size another 
+client attempted to change.
+The width and height members are set to the inside size of the window, 
+excluding the border.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XResourceManagerString.man b/libX11/man/XResourceManagerString.man
index 70530a447..7d4884b5d 100644
--- a/libX11/man/XResourceManagerString.man
+++ b/libX11/man/XResourceManagerString.man
@@ -1,184 +1,123 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XResourceManagerString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XResourceManagerString, XScreenResourceString \- obtain server resource properties

-.SH SYNTAX

-.HP

-char *XResourceManagerString\^(\^Display *\fIdisplay\fP\^); 

-.HP

-char *XScreenResourceString\^(\^Screen *\fIscreen\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIscreen\fP 1i

-Specifies the screen.

-.SH DESCRIPTION

-The

-.ZN XResourceManagerString

-function returns the RESOURCE_MANAGER property from the server's root

-window of screen zero, which was returned when the connection was opened using

-.ZN XOpenDisplay .

-The property is converted from type STRING to the current locale.

-The conversion is identical to that produced by 

-.ZN XmbTextPropertyToTextList

-for a single element STRING property.

-The returned string is owned by Xlib and should not be freed by the client.

-The property value must be in a format that is acceptable to

-.ZN XrmGetStringDatabase .

-If no property exists, NULL is returned.

-.LP

-The

-.ZN XScreenResourceString

-function returns the SCREEN_RESOURCES property from the root window of the

-specified screen.

-The property is converted from type STRING to the current locale.

-The conversion is identical to that produced by 

-.ZN XmbTextPropertyToTextList

-for a single element STRING property.

-The property value must be in a format that is acceptable to

-.ZN XrmGetStringDatabase .

-If no property exists, NULL is returned.

-The caller is responsible for freeing the returned string by using

-.ZN XFree .

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XResourceManagerString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XResourceManagerString, XScreenResourceString \- obtain server resource properties
+.SH SYNTAX
+.HP
+char *XResourceManagerString\^(\^Display *\fIdisplay\fP\^); 
+.HP
+char *XScreenResourceString\^(\^Screen *\fIscreen\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIscreen\fP 1i
+Specifies the screen.
+.SH DESCRIPTION
+The
+.ZN XResourceManagerString
+function returns the RESOURCE_MANAGER property from the server's root
+window of screen zero, which was returned when the connection was opened using
+.ZN XOpenDisplay .
+The property is converted from type STRING to the current locale.
+The conversion is identical to that produced by 
+.ZN XmbTextPropertyToTextList
+for a single element STRING property.
+The returned string is owned by Xlib and should not be freed by the client.
+The property value must be in a format that is acceptable to
+.ZN XrmGetStringDatabase .
+If no property exists, NULL is returned.
+.LP
+The
+.ZN XScreenResourceString
+function returns the SCREEN_RESOURCES property from the root window of the
+specified screen.
+The property is converted from type STRING to the current locale.
+The conversion is identical to that produced by 
+.ZN XmbTextPropertyToTextList
+for a single element STRING property.
+The property value must be in a format that is acceptable to
+.ZN XrmGetStringDatabase .
+If no property exists, NULL is returned.
+The caller is responsible for freeing the returned string by using
+.ZN XFree .
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSaveContext.man b/libX11/man/XSaveContext.man
index 77ddca9f1..de7482b24 100644
--- a/libX11/man/XSaveContext.man
+++ b/libX11/man/XSaveContext.man
@@ -1,205 +1,144 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSaveContext __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSaveContext, XFindContext, XDeleteContext, XUniqueContext \- associative look-up routines

-.SH SYNTAX

-.HP

-int XSaveContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext

-\fIcontext\fP\^, XPointer \fIdata\fP\^); 

-.HP

-int XFindContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext

-\fIcontext\fP\^, XPointer *\fIdata_return\fP\^); 

-.HP

-int XDeleteContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP, XContext

-\fIcontext\fP); 

-.LP

-XContext XUniqueContext(void); 

-.SH ARGUMENTS

-.IP \fIcontext\fP 1i

-Specifies the context type to which the data belongs. 

-.IP \fIdata\fP 1i

-Specifies the data to be associated with the window and type.

-.IP \fIdata_return\fP 1i

-Returns the data.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIrid\fP 1i

-Specifies the resource ID with which the data is associated.

-.SH DESCRIPTION

-If an entry with the specified resource ID and type already exists,

-.ZN XSaveContext

-overrides it with the specified context.

-The

-.ZN XSaveContext

-function returns a nonzero error code if an error has occurred

-and zero otherwise.

-Possible errors are

-.ZN XCNOMEM

-(out of memory).

-.LP

-Because it is a return value,

-the data is a pointer.

-The

-.ZN XFindContext

-function returns a nonzero error code if an error has occurred

-and zero otherwise.

-Possible errors are

-.ZN XCNOENT

-(context-not-found).

-.LP

-The

-.ZN XDeleteContext

-function deletes the entry for the given resource ID 

-and type from the data structure.

-This function returns the same error codes that

-.ZN XFindContext

-returns if called with the same arguments.

-.ZN XDeleteContext

-does not free the data whose address was saved.

-.LP

-The

-.ZN XUniqueContext

-function creates a unique context type that may be used in subsequent calls to

-.ZN XSaveContext .

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSaveContext __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSaveContext, XFindContext, XDeleteContext, XUniqueContext \- associative look-up routines
+.SH SYNTAX
+.HP
+int XSaveContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
+\fIcontext\fP\^, XPointer \fIdata\fP\^); 
+.HP
+int XFindContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP\^, XContext
+\fIcontext\fP\^, XPointer *\fIdata_return\fP\^); 
+.HP
+int XDeleteContext(\^Display *\fIdisplay\fP\^, XID \fIrid\fP, XContext
+\fIcontext\fP); 
+.LP
+XContext XUniqueContext(void); 
+.SH ARGUMENTS
+.IP \fIcontext\fP 1i
+Specifies the context type to which the data belongs. 
+.IP \fIdata\fP 1i
+Specifies the data to be associated with the window and type.
+.IP \fIdata_return\fP 1i
+Returns the data.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIrid\fP 1i
+Specifies the resource ID with which the data is associated.
+.SH DESCRIPTION
+If an entry with the specified resource ID and type already exists,
+.ZN XSaveContext
+overrides it with the specified context.
+The
+.ZN XSaveContext
+function returns a nonzero error code if an error has occurred
+and zero otherwise.
+Possible errors are
+.ZN XCNOMEM
+(out of memory).
+.LP
+Because it is a return value,
+the data is a pointer.
+The
+.ZN XFindContext
+function returns a nonzero error code if an error has occurred
+and zero otherwise.
+Possible errors are
+.ZN XCNOENT
+(context-not-found).
+.LP
+The
+.ZN XDeleteContext
+function deletes the entry for the given resource ID 
+and type from the data structure.
+This function returns the same error codes that
+.ZN XFindContext
+returns if called with the same arguments.
+.ZN XDeleteContext
+does not free the data whose address was saved.
+.LP
+The
+.ZN XUniqueContext
+function creates a unique context type that may be used in subsequent calls to
+.ZN XSaveContext .
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSelectInput.man b/libX11/man/XSelectInput.man
index bbd3438dc..6913c35ef 100644
--- a/libX11/man/XSelectInput.man
+++ b/libX11/man/XSelectInput.man
@@ -1,212 +1,151 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSelectInput __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSelectInput \- select input events

-.SH SYNTAX

-.HP

-int XSelectInput\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long

-\fIevent_mask\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mask\fP 1i

-Specifies the event mask.

-.ds Wi whose events you are interested in

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XSelectInput

-function requests that the X server report the events associated with the 

-specified event mask.

-Initially, X will not report any of these events.

-Events are reported relative to a window.

-If a window is not interested in a device event, it usually propagates to

-the closest ancestor that is interested,

-unless the do_not_propagate mask prohibits it.

-.IN "Event" "propagation"

-.LP

-Setting the event-mask attribute of a window overrides any previous call

-for the same window but not for other clients.

-Multiple clients can select for the same events on the same window

-with the following restrictions:

-.IP \(bu 5

-Multiple clients can select events on the same window because their event masks

-are disjoint.

-When the X server generates an event, it reports it

-to all interested clients.

-.IP \(bu 5

-Only one client at a time can select

-.ZN CirculateRequest ,

-.ZN ConfigureRequest ,

-or

-.ZN MapRequest

-events, which are associated with

-the event mask

-.ZN SubstructureRedirectMask . 

-.IP \(bu 5

-Only one client at a time can select

-a

-.ZN ResizeRequest

-event, which is associated with

-the event mask

-.ZN ResizeRedirectMask . 

-.IP \(bu 5

-Only one client at a time can select a 

-.ZN ButtonPress 

-event, which is associated with

-the event mask

-.ZN ButtonPressMask .

-.LP

-The server reports the event to all interested clients.

-.LP

-.ZN XSelectInput

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSelectInput __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSelectInput \- select input events
+.SH SYNTAX
+.HP
+int XSelectInput\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, long
+\fIevent_mask\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mask\fP 1i
+Specifies the event mask.
+.ds Wi whose events you are interested in
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XSelectInput
+function requests that the X server report the events associated with the 
+specified event mask.
+Initially, X will not report any of these events.
+Events are reported relative to a window.
+If a window is not interested in a device event, it usually propagates to
+the closest ancestor that is interested,
+unless the do_not_propagate mask prohibits it.
+.IN "Event" "propagation"
+.LP
+Setting the event-mask attribute of a window overrides any previous call
+for the same window but not for other clients.
+Multiple clients can select for the same events on the same window
+with the following restrictions:
+.IP \(bu 5
+Multiple clients can select events on the same window because their event masks
+are disjoint.
+When the X server generates an event, it reports it
+to all interested clients.
+.IP \(bu 5
+Only one client at a time can select
+.ZN CirculateRequest ,
+.ZN ConfigureRequest ,
+or
+.ZN MapRequest
+events, which are associated with
+the event mask
+.ZN SubstructureRedirectMask . 
+.IP \(bu 5
+Only one client at a time can select
+a
+.ZN ResizeRequest
+event, which is associated with
+the event mask
+.ZN ResizeRedirectMask . 
+.IP \(bu 5
+Only one client at a time can select a 
+.ZN ButtonPress 
+event, which is associated with
+the event mask
+.ZN ButtonPressMask .
+.LP
+The server reports the event to all interested clients.
+.LP
+.ZN XSelectInput
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSelectionClearEvent.man b/libX11/man/XSelectionClearEvent.man
index 32108e0f6..d8db1fc16 100644
--- a/libX11/man/XSelectionClearEvent.man
+++ b/libX11/man/XSelectionClearEvent.man
@@ -1,221 +1,158 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSelectionClearEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSelectionClearEvent \- SelectionClear event structure

-.SH STRUCTURES

-The structure for

-.ZN SelectionClear

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* SelectionClear */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	Atom selection;

-	Time time;

-} XSelectionClearEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The selection member is set to the selection atom.

-The time member is set to the last change time recorded for the 

-selection.

-The window member is the window that was specified by the current owner

-(the owner losing the selection) in its

-.ZN XSetSelectionOwner

-call.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XSetSelectionOwner(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSelectionClearEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSelectionClearEvent \- SelectionClear event structure
+.SH STRUCTURES
+The structure for
+.ZN SelectionClear
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* SelectionClear */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        Atom selection;
+        Time time;
+} XSelectionClearEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The selection member is set to the selection atom.
+The time member is set to the last change time recorded for the 
+selection.
+The window member is the window that was specified by the current owner
+(the owner losing the selection) in its
+.ZN XSetSelectionOwner
+call.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XSetSelectionOwner(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSelectionEvent.man b/libX11/man/XSelectionEvent.man
index c0a58020a..feb5dfcd4 100644
--- a/libX11/man/XSelectionEvent.man
+++ b/libX11/man/XSelectionEvent.man
@@ -1,229 +1,166 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSelectionEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSelectionEvent \- SelectionNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN SelectionNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* SelectionNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window requestor;

-	Atom selection;

-	Atom target;

-	Atom property;	/\&* atom or None */

-	Time time;

-} XSelectionEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The requestor member is set to the window associated with

-the requestor of the selection.

-The selection member is set to the atom that indicates the selection.

-For example, PRIMARY is used for the primary selection.

-The target member is set to the atom that indicates the converted type.

-For example, PIXMAP is used for a pixmap.

-The property member is set to the atom that indicates which

-property the result was stored on.

-If the conversion failed, 

-the property member is set to

-.ZN None .

-The time member is set to the time the conversion took place and

-can be a timestamp or

-.ZN CurrentTime .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSelectionEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSelectionEvent \- SelectionNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN SelectionNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* SelectionNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window requestor;
+        Atom selection;
+        Atom target;
+        Atom property;  /\&* atom or None */
+        Time time;
+} XSelectionEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The requestor member is set to the window associated with
+the requestor of the selection.
+The selection member is set to the atom that indicates the selection.
+For example, PRIMARY is used for the primary selection.
+The target member is set to the atom that indicates the converted type.
+For example, PIXMAP is used for a pixmap.
+The property member is set to the atom that indicates which
+property the result was stored on.
+If the conversion failed, 
+the property member is set to
+.ZN None .
+The time member is set to the time the conversion took place and
+can be a timestamp or
+.ZN CurrentTime .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSelectionRequestEvent.man b/libX11/man/XSelectionRequestEvent.man
index d6e016c05..35454c3df 100644
--- a/libX11/man/XSelectionRequestEvent.man
+++ b/libX11/man/XSelectionRequestEvent.man
@@ -1,233 +1,170 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSelectionRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSelectionRequestEvent \- SelectionRequest event structure

-.SH STRUCTURES

-The structure for

-.ZN SelectionRequest

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* SelectionRequest */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window owner;

-	Window requestor;

-	Atom selection;

-	Atom target;

-	Atom property;

-	Time time;

-} XSelectionRequestEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The owner member is set to the window

-that was specified by the current owner in its

-.ZN XSetSelectionOwner

-call.

-The requestor member is set to the window requesting the selection.

-The selection member is set to the atom that names the selection.

-For example, PRIMARY is used to indicate the primary selection.

-The target member is set to the atom that indicates the type

-the selection is desired in.

-The property member can be a property name or 

-.ZN None .

-The time member is set to the timestamp or 

-.ZN CurrentTime 

-value from the

-.ZN ConvertSelection

-request.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSetSelectionOwner(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSelectionRequestEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSelectionRequestEvent \- SelectionRequest event structure
+.SH STRUCTURES
+The structure for
+.ZN SelectionRequest
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* SelectionRequest */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window owner;
+        Window requestor;
+        Atom selection;
+        Atom target;
+        Atom property;
+        Time time;
+} XSelectionRequestEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The owner member is set to the window
+that was specified by the current owner in its
+.ZN XSetSelectionOwner
+call.
+The requestor member is set to the window requesting the selection.
+The selection member is set to the atom that names the selection.
+For example, PRIMARY is used to indicate the primary selection.
+The target member is set to the atom that indicates the type
+the selection is desired in.
+The property member can be a property name or 
+.ZN None .
+The time member is set to the timestamp or 
+.ZN CurrentTime 
+value from the
+.ZN ConvertSelection
+request.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSetSelectionOwner(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSendEvent.man b/libX11/man/XSendEvent.man
index a3293891a..2b21cdd3e 100644
--- a/libX11/man/XSendEvent.man
+++ b/libX11/man/XSendEvent.man
@@ -1,314 +1,251 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSendEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSendEvent, XDisplayMotionBufferSize, XGetMotionEvents, XTimeCoord \- send events and pointer motion history structure

-.SH SYNTAX

-.HP

-Status XSendEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Bool

-\fIpropagate\fP\^, long \fIevent_mask\fP\^, XEvent *\fIevent_send\fP\^); 

-.HP

-unsigned long XDisplayMotionBufferSize\^(\^Display *\fIdisplay\fP\^); 

-.HP

-XTimeCoord *XGetMotionEvents\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Time \fIstart\fP\^, Time \fIstop\fP\^, int *\fInevents_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIevent_mask\fP 1i

-Specifies the event mask.

-.IP \fIevent_send\fP 1i

-Specifies the event that is to be sent.

-.IP \fInevents_return\fP 1i

-Returns the number of events from the motion history buffer.

-.IP \fIpropagate\fP 1i

-Specifies a Boolean value.

-.IP \fIstart\fP 1i

-.br

-.ns

-.IP \fIstop\fP 1i

-Specify the time interval in which the events are returned from the motion

-history buffer.

-You can pass a timestamp or

-.ZN CurrentTime .

-.ds Wi the window the event is to be sent to,

-.ZN PointerWindow ,

-or

-.ZN InputFocus .

-.IP \fIw\fP 1i

-Specifies the window \*(Wi.

-.SH DESCRIPTION

-The

-.ZN XSendEvent

-function identifies the destination window, 

-determines which clients should receive the specified events, 

-and ignores any active grabs.

-This function requires you to pass an event mask.

-For a discussion of the valid event mask names,

-see section 10.3.

-This function uses the w argument to identify the destination window as follows:

-.IP \(bu 5

-If w is

-.ZN PointerWindow ,

-the destination window is the window that contains the pointer.

-.IP \(bu 5

-If w is

-.ZN InputFocus 

-and if the focus window contains the pointer, 

-the destination window is the window that contains the pointer; 

-otherwise, the destination window is the focus window.

-.LP

-To determine which clients should receive the specified events,

-.ZN XSendEvent

-uses the propagate argument as follows:

-.IP \(bu 5

-If event_mask is the empty set,

-the event is sent to the client that created the destination window.

-If that client no longer exists,

-no event is sent.

-.IP \(bu 5

-If propagate is 

-.ZN False ,

-the event is sent to every client selecting on destination any of the event

-types in the event_mask argument.

-.IP \(bu 5

-If propagate is 

-.ZN True 

-and no clients have selected on destination any of

-the event types in event-mask, the destination is replaced with the

-closest ancestor of destination for which some client has selected a

-type in event-mask and for which no intervening window has that type in its

-do-not-propagate-mask. 

-If no such window exists or if the window is

-an ancestor of the focus window and 

-.ZN InputFocus 

-was originally specified

-as the destination, the event is not sent to any clients.

-Otherwise, the event is reported to every client selecting on the final

-destination any of the types specified in event_mask.

-.LP

-The event in the

-.ZN XEvent

-structure must be one of the core events or one of the events

-defined by an extension (or a 

-.ZN BadValue

-error results) so that the X server can correctly byte-swap 

-the contents as necessary.  

-The contents of the event are

-otherwise unaltered and unchecked by the X server except to force send_event to

-.ZN True

-in the forwarded event and to set the serial number in the event correctly;

-therefore these fields

-and the display field are ignored by

-.ZN XSendEvent .

-.LP

-.ZN XSendEvent

-returns zero if the conversion to wire protocol format failed

-and returns nonzero otherwise.

-.ZN XSendEvent

-can generate

-.ZN BadValue 

-and

-.ZN BadWindow 

-errors.

-.LP

-The server may retain the recent history of the pointer motion

-and do so to a finer granularity than is reported by

-.ZN MotionNotify

-events.

-The

-.ZN XGetMotionEvents

-function makes this history available.

-.LP

-The

-.ZN XGetMotionEvents

-function returns all events in the motion history buffer that fall between the

-specified start and stop times, inclusive, and that have coordinates

-that lie within the specified window (including its borders) at its present

-placement.

-If the server does not support motion history, 

-if the start time is later than the stop time,

-or if the start time is in the future, 

-no events are returned;

-.ZN XGetMotionEvents

-returns NULL.

-If the stop time is in the future, it is equivalent to specifying

-.ZN CurrentTime .

-.ZN XGetMotionEvents

-can generate a

-.ZN BadWindow 

-error.

-.SH STRUCTURES

-The

-.ZN XTimeCoord

-structure contains:

-.LP

-.Ds 0

-.TA .5i

-.ta .5i

-typedef struct {

-	Time time;

-	short x, y;

-} XTimeCoord;

-.De

-.LP

-The time member is set to the time, in milliseconds. 

-The x and y members are set to the coordinates of the pointer and

-are reported relative to the origin

-of the specified window.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XIfEvent(__libmansuffix__),

-XNextEvent(__libmansuffix__),

-XPutBackEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSendEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSendEvent, XDisplayMotionBufferSize, XGetMotionEvents, XTimeCoord \- send events and pointer motion history structure
+.SH SYNTAX
+.HP
+Status XSendEvent\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Bool
+\fIpropagate\fP\^, long \fIevent_mask\fP\^, XEvent *\fIevent_send\fP\^); 
+.HP
+unsigned long XDisplayMotionBufferSize\^(\^Display *\fIdisplay\fP\^); 
+.HP
+XTimeCoord *XGetMotionEvents\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Time \fIstart\fP\^, Time \fIstop\fP\^, int *\fInevents_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIevent_mask\fP 1i
+Specifies the event mask.
+.IP \fIevent_send\fP 1i
+Specifies the event that is to be sent.
+.IP \fInevents_return\fP 1i
+Returns the number of events from the motion history buffer.
+.IP \fIpropagate\fP 1i
+Specifies a Boolean value.
+.IP \fIstart\fP 1i
+.br
+.ns
+.IP \fIstop\fP 1i
+Specify the time interval in which the events are returned from the motion
+history buffer.
+You can pass a timestamp or
+.ZN CurrentTime .
+.ds Wi the window the event is to be sent to,
+.ZN PointerWindow ,
+or
+.ZN InputFocus .
+.IP \fIw\fP 1i
+Specifies the window \*(Wi.
+.SH DESCRIPTION
+The
+.ZN XSendEvent
+function identifies the destination window, 
+determines which clients should receive the specified events, 
+and ignores any active grabs.
+This function requires you to pass an event mask.
+For a discussion of the valid event mask names,
+see section 10.3.
+This function uses the w argument to identify the destination window as follows:
+.IP \(bu 5
+If w is
+.ZN PointerWindow ,
+the destination window is the window that contains the pointer.
+.IP \(bu 5
+If w is
+.ZN InputFocus 
+and if the focus window contains the pointer, 
+the destination window is the window that contains the pointer; 
+otherwise, the destination window is the focus window.
+.LP
+To determine which clients should receive the specified events,
+.ZN XSendEvent
+uses the propagate argument as follows:
+.IP \(bu 5
+If event_mask is the empty set,
+the event is sent to the client that created the destination window.
+If that client no longer exists,
+no event is sent.
+.IP \(bu 5
+If propagate is 
+.ZN False ,
+the event is sent to every client selecting on destination any of the event
+types in the event_mask argument.
+.IP \(bu 5
+If propagate is 
+.ZN True 
+and no clients have selected on destination any of
+the event types in event-mask, the destination is replaced with the
+closest ancestor of destination for which some client has selected a
+type in event-mask and for which no intervening window has that type in its
+do-not-propagate-mask. 
+If no such window exists or if the window is
+an ancestor of the focus window and 
+.ZN InputFocus 
+was originally specified
+as the destination, the event is not sent to any clients.
+Otherwise, the event is reported to every client selecting on the final
+destination any of the types specified in event_mask.
+.LP
+The event in the
+.ZN XEvent
+structure must be one of the core events or one of the events
+defined by an extension (or a 
+.ZN BadValue
+error results) so that the X server can correctly byte-swap 
+the contents as necessary.  
+The contents of the event are
+otherwise unaltered and unchecked by the X server except to force send_event to
+.ZN True
+in the forwarded event and to set the serial number in the event correctly;
+therefore these fields
+and the display field are ignored by
+.ZN XSendEvent .
+.LP
+.ZN XSendEvent
+returns zero if the conversion to wire protocol format failed
+and returns nonzero otherwise.
+.ZN XSendEvent
+can generate
+.ZN BadValue 
+and
+.ZN BadWindow 
+errors.
+.LP
+The server may retain the recent history of the pointer motion
+and do so to a finer granularity than is reported by
+.ZN MotionNotify
+events.
+The
+.ZN XGetMotionEvents
+function makes this history available.
+.LP
+The
+.ZN XGetMotionEvents
+function returns all events in the motion history buffer that fall between the
+specified start and stop times, inclusive, and that have coordinates
+that lie within the specified window (including its borders) at its present
+placement.
+If the server does not support motion history, 
+if the start time is later than the stop time,
+or if the start time is in the future, 
+no events are returned;
+.ZN XGetMotionEvents
+returns NULL.
+If the stop time is in the future, it is equivalent to specifying
+.ZN CurrentTime .
+.ZN XGetMotionEvents
+can generate a
+.ZN BadWindow 
+error.
+.SH STRUCTURES
+The
+.ZN XTimeCoord
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        Time time;
+        short x, y;
+} XTimeCoord;
+.De
+.LP
+The time member is set to the time, in milliseconds. 
+The x and y members are set to the coordinates of the pointer and
+are reported relative to the origin
+of the specified window.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XIfEvent(__libmansuffix__),
+XNextEvent(__libmansuffix__),
+XPutBackEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetArcMode.man b/libX11/man/XSetArcMode.man
index 91e53e134..18326f0dd 100644
--- a/libX11/man/XSetArcMode.man
+++ b/libX11/man/XSetArcMode.man
@@ -1,242 +1,181 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetArcMode __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetArcMode, XSetSubwindowMode, XSetGraphicsExposure \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetArcMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIarc_mode\fP\^); 

-.HP

-int XSetSubwindowMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIsubwindow_mode\fP\^); 

-.HP

-int XSetGraphicsExposures\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Bool

-\fIgraphics_exposures\fP\^); 

-.SH ARGUMENTS

-.IP \fIarc_mode\fP 1i

-Specifies the arc mode.

-You can pass

-.ZN ArcChord

-or

-.ZN ArcPieSlice .

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIgraphics_exposures\fP 1i

-Specifies a Boolean value that indicates whether you want

-.ZN GraphicsExpose

-and

-.ZN NoExpose

-events to be reported when calling

-.ZN XCopyArea

-and

-.ZN XCopyPlane

-with this GC.

-.IP \fIsubwindow_mode\fP 1i

-Specifies the subwindow mode.

-You can pass

-.ZN ClipByChildren

-or

-.ZN IncludeInferiors .

-.SH DESCRIPTION

-The

-.ZN XSetArcMode

-function sets the arc mode in the specified GC.

-.LP

-.ZN XSetArcMode

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetSubwindowMode

-function sets the subwindow mode in the specified GC.

-.LP

-.ZN XSetSubwindowMode

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetGraphicsExposures

-function sets the graphics-exposures flag in the specified GC.

-.LP

-.ZN XSetGraphicsExposures

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCopyArea(__libmansuffix__),

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetArcMode __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetArcMode, XSetSubwindowMode, XSetGraphicsExposure \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetArcMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIarc_mode\fP\^); 
+.HP
+int XSetSubwindowMode\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIsubwindow_mode\fP\^); 
+.HP
+int XSetGraphicsExposures\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Bool
+\fIgraphics_exposures\fP\^); 
+.SH ARGUMENTS
+.IP \fIarc_mode\fP 1i
+Specifies the arc mode.
+You can pass
+.ZN ArcChord
+or
+.ZN ArcPieSlice .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIgraphics_exposures\fP 1i
+Specifies a Boolean value that indicates whether you want
+.ZN GraphicsExpose
+and
+.ZN NoExpose
+events to be reported when calling
+.ZN XCopyArea
+and
+.ZN XCopyPlane
+with this GC.
+.IP \fIsubwindow_mode\fP 1i
+Specifies the subwindow mode.
+You can pass
+.ZN ClipByChildren
+or
+.ZN IncludeInferiors .
+.SH DESCRIPTION
+The
+.ZN XSetArcMode
+function sets the arc mode in the specified GC.
+.LP
+.ZN XSetArcMode
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetSubwindowMode
+function sets the subwindow mode in the specified GC.
+.LP
+.ZN XSetSubwindowMode
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetGraphicsExposures
+function sets the graphics-exposures flag in the specified GC.
+.LP
+.ZN XSetGraphicsExposures
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCopyArea(__libmansuffix__),
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetClipOrigin.man b/libX11/man/XSetClipOrigin.man
index c9d67ac79..a227ebc63 100644
--- a/libX11/man/XSetClipOrigin.man
+++ b/libX11/man/XSetClipOrigin.man
@@ -1,294 +1,233 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetClipOrigin __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetClipOrigin, XSetClipMask, XSetClipRectangles \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetClipOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^); 

-.HP

-int XSetClipMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap

-\fIpixmap\fP\^); 

-.HP

-int XSetClipRectangles\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^, XRectangle

-\fIrectangles\fP[]\^, int \fIn\fP\^, int \fIordering\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIclip_x_origin\fP 1i

-.br

-.ns

-.IP \fIclip_y_origin\fP 1i

-Specify the x and y coordinates of the clip-mask origin.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIn\fP 1i

-Specifies the number of rectangles. 

-.IP \fIordering\fP 1i

-Specifies the ordering relations on the rectangles.

-You can pass

-.ZN Unsorted ,

-.ZN YSorted ,

-.ZN YXSorted ,

-or

-.ZN YXBanded .

-.IP \fIpixmap\fP 1i

-Specifies the pixmap or

-.ZN None .

-.IP \fIrectangles\fP 1i

-Specifies an array of rectangles that define the clip-mask.

-.SH DESCRIPTION

-The

-.ZN XSetClipOrigin

-function sets the clip origin in the specified GC.

-The clip-mask origin is interpreted relative to the origin of whatever

-destination drawable is specified in the graphics request.

-.LP

-.ZN XSetClipOrigin

-can generate

-.ZN BadAlloc

-and

-.ZN BadGC 

-errors.

-.LP

-The

-.ZN XSetClipMask

-function sets the clip-mask in the specified GC to the specified pixmap.

-If the clip-mask is set to

-.ZN None ,

-the pixels are are always drawn (regardless of the clip-origin).

-.LP

-.ZN XSetClipMask

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetClipRectangles

-function changes the clip-mask in the specified GC 

-to the specified list of rectangles and sets the clip origin.

-The output is clipped to remain contained within the

-rectangles.

-The clip-origin is interpreted relative to the origin of

-whatever destination drawable is specified in a graphics request.  

-The rectangle coordinates are interpreted relative to the clip-origin.  

-The rectangles should be nonintersecting, or the graphics results will be

-undefined.

-Note that the list of rectangles can be empty, 

-which effectively disables output.

-This is the opposite of passing

-.ZN None

-as the clip-mask in

-.ZN XCreateGC ,

-.ZN XChangeGC ,

-and

-.ZN XSetClipMask .

-.LP

-If known by the client, ordering relations on the rectangles can be

-specified with the ordering argument. 

-This may provide faster operation

-by the server. 

-If an incorrect ordering is specified, the X server may generate a

-.ZN BadMatch

-error, but it is not required to do so.

-If no error is generated, the graphics

-results are undefined.

-.ZN Unsorted 

-means the rectangles are in arbitrary order.

-.ZN YSorted 

-means that the rectangles are nondecreasing in their Y origin.

-.ZN YXSorted 

-additionally constrains 

-.ZN YSorted 

-order in that all

-rectangles with an equal Y origin are nondecreasing in their X

-origin.  

-.ZN YXBanded 

-additionally constrains 

-.ZN YXSorted 

-by requiring that,

-for every possible Y scanline, all rectangles that include that

-scanline have an identical Y origins and Y extents.

-.LP

-.ZN XSetClipRectangles

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XDrawRectangle(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetClipOrigin __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetClipOrigin, XSetClipMask, XSetClipRectangles \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetClipOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^); 
+.HP
+int XSetClipMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fIpixmap\fP\^); 
+.HP
+int XSetClipRectangles\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIclip_x_origin\fP\^, int \fIclip_y_origin\fP\^, XRectangle
+\fIrectangles\fP[]\^, int \fIn\fP\^, int \fIordering\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIclip_x_origin\fP 1i
+.br
+.ns
+.IP \fIclip_y_origin\fP 1i
+Specify the x and y coordinates of the clip-mask origin.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIn\fP 1i
+Specifies the number of rectangles. 
+.IP \fIordering\fP 1i
+Specifies the ordering relations on the rectangles.
+You can pass
+.ZN Unsorted ,
+.ZN YSorted ,
+.ZN YXSorted ,
+or
+.ZN YXBanded .
+.IP \fIpixmap\fP 1i
+Specifies the pixmap or
+.ZN None .
+.IP \fIrectangles\fP 1i
+Specifies an array of rectangles that define the clip-mask.
+.SH DESCRIPTION
+The
+.ZN XSetClipOrigin
+function sets the clip origin in the specified GC.
+The clip-mask origin is interpreted relative to the origin of whatever
+destination drawable is specified in the graphics request.
+.LP
+.ZN XSetClipOrigin
+can generate
+.ZN BadAlloc
+and
+.ZN BadGC 
+errors.
+.LP
+The
+.ZN XSetClipMask
+function sets the clip-mask in the specified GC to the specified pixmap.
+If the clip-mask is set to
+.ZN None ,
+the pixels are are always drawn (regardless of the clip-origin).
+.LP
+.ZN XSetClipMask
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetClipRectangles
+function changes the clip-mask in the specified GC 
+to the specified list of rectangles and sets the clip origin.
+The output is clipped to remain contained within the
+rectangles.
+The clip-origin is interpreted relative to the origin of
+whatever destination drawable is specified in a graphics request.  
+The rectangle coordinates are interpreted relative to the clip-origin.  
+The rectangles should be nonintersecting, or the graphics results will be
+undefined.
+Note that the list of rectangles can be empty, 
+which effectively disables output.
+This is the opposite of passing
+.ZN None
+as the clip-mask in
+.ZN XCreateGC ,
+.ZN XChangeGC ,
+and
+.ZN XSetClipMask .
+.LP
+If known by the client, ordering relations on the rectangles can be
+specified with the ordering argument. 
+This may provide faster operation
+by the server. 
+If an incorrect ordering is specified, the X server may generate a
+.ZN BadMatch
+error, but it is not required to do so.
+If no error is generated, the graphics
+results are undefined.
+.ZN Unsorted 
+means the rectangles are in arbitrary order.
+.ZN YSorted 
+means that the rectangles are nondecreasing in their Y origin.
+.ZN YXSorted 
+additionally constrains 
+.ZN YSorted 
+order in that all
+rectangles with an equal Y origin are nondecreasing in their X
+origin.  
+.ZN YXBanded 
+additionally constrains 
+.ZN YXSorted 
+by requiring that,
+for every possible Y scanline, all rectangles that include that
+scanline have an identical Y origins and Y extents.
+.LP
+.ZN XSetClipRectangles
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XDrawRectangle(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetCloseDownMode.man b/libX11/man/XSetCloseDownMode.man
index 290f677cd..6ae6fd862 100644
--- a/libX11/man/XSetCloseDownMode.man
+++ b/libX11/man/XSetCloseDownMode.man
@@ -1,220 +1,159 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetCloseDownMode __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetCloseDownMode, XKillClient \- control clients

-.SH SYNTAX

-.HP

-int XSetCloseDownMode\^(\^Display *\fIdisplay\fP\^, int \fIclose_mode\fP\^); 

-.HP

-int XKillClient\^(\^Display *\fIdisplay\fP\^, XID \fIresource\fP\^); 

-.SH ARGUMENTS

-.IP \fIclose_mode\fP 1i

-Specifies the client close-down mode.

-You can pass 

-.ZN DestroyAll , 

-.ZN RetainPermanent , 

-or

-.ZN RetainTemporary . 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIresource\fP 1i

-Specifies any resource associated with the client that you want to destroy or

-.ZN AllTemporary .

-.SH DESCRIPTION

-The

-.ZN XSetCloseDownMode

-defines what will happen to the client's resources at connection close.

-A connection starts in

-.ZN DestroyAll

-mode.

-For information on what happens to the client's resources when the

-close_mode argument is

-.ZN RetainPermanent

-or

-.ZN RetainTemporary ,

-see section 2.6.

-.LP

-.ZN XSetCloseDownMode

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XKillClient

-function

-forces a close down of the client

-that created the resource

-if a valid resource is specified.

-If the client has already terminated in

-either 

-.ZN RetainPermanent 

-or 

-.ZN RetainTemporary 

-mode, all of the client's

-resources are destroyed.

-If 

-.ZN AllTemporary 

-is specified, the resources of all clients that have terminated in

-.ZN RetainTemporary 

-are destroyed (see section 2.5).

-This permits implementation of window manager facilities that aid debugging.

-A client can set its close-down mode to

-.ZN RetainTemporary .

-If the client then crashes,

-its windows would not be destroyed. 

-The programmer can then inspect the application's window tree 

-and use the window manager to destroy the zombie windows.

-.LP

-.ZN XKillClient

-can generate a

-.ZN BadValue 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetCloseDownMode __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetCloseDownMode, XKillClient \- control clients
+.SH SYNTAX
+.HP
+int XSetCloseDownMode\^(\^Display *\fIdisplay\fP\^, int \fIclose_mode\fP\^); 
+.HP
+int XKillClient\^(\^Display *\fIdisplay\fP\^, XID \fIresource\fP\^); 
+.SH ARGUMENTS
+.IP \fIclose_mode\fP 1i
+Specifies the client close-down mode.
+You can pass 
+.ZN DestroyAll , 
+.ZN RetainPermanent , 
+or
+.ZN RetainTemporary . 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIresource\fP 1i
+Specifies any resource associated with the client that you want to destroy or
+.ZN AllTemporary .
+.SH DESCRIPTION
+The
+.ZN XSetCloseDownMode
+defines what will happen to the client's resources at connection close.
+A connection starts in
+.ZN DestroyAll
+mode.
+For information on what happens to the client's resources when the
+close_mode argument is
+.ZN RetainPermanent
+or
+.ZN RetainTemporary ,
+see section 2.6.
+.LP
+.ZN XSetCloseDownMode
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XKillClient
+function
+forces a close down of the client
+that created the resource
+if a valid resource is specified.
+If the client has already terminated in
+either 
+.ZN RetainPermanent 
+or 
+.ZN RetainTemporary 
+mode, all of the client's
+resources are destroyed.
+If 
+.ZN AllTemporary 
+is specified, the resources of all clients that have terminated in
+.ZN RetainTemporary 
+are destroyed (see section 2.5).
+This permits implementation of window manager facilities that aid debugging.
+A client can set its close-down mode to
+.ZN RetainTemporary .
+If the client then crashes,
+its windows would not be destroyed. 
+The programmer can then inspect the application's window tree 
+and use the window manager to destroy the zombie windows.
+.LP
+.ZN XKillClient
+can generate a
+.ZN BadValue 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSetCommand.man b/libX11/man/XSetCommand.man
index ed29e30f9..3b89c6644 100644
--- a/libX11/man/XSetCommand.man
+++ b/libX11/man/XSetCommand.man
@@ -1,224 +1,163 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetCommand __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetCommand, XGetCommand \- set or read a window's WM_COMMAND property

-.SH SYNTAX

-.HP

-int XSetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-**\fIargv\fP\^, int \fIargc\fP\^); 

-.HP

-Status XGetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-***\fIargv_return\fP\^, int *\fIargc_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIargc\fP 1i

-Specifies the number of arguments.

-.IP \fIargc_return\fP 1i

-Returns the number of arguments returned.

-.IP \fIargv\fP 1i

-Specifies the application's argument list.

-.IP \fIargv_return\fP 1i

-Returns the application's argument list.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XSetCommand

-function sets the command and arguments used to invoke the

-application.

-(Typically, argv is the argv array of your main program.)

-If the strings are not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-.LP

-.ZN XSetCommand

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow 

-errors.

-.LP

-The 

-.ZN XGetCommand 

-function reads the WM_COMMAND property from the specified window 

-and returns a string list.

-If the WM_COMMAND property exists, 

-it is of type STRING and format 8.

-If sufficient memory can be allocated to contain the string list, 

-.ZN XGetCommand

-fills in the argv_return and argc_return arguments

-and returns a nonzero status.

-Otherwise, or if any other error is encountered, it returns a zero status.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned strings are in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-To free the memory allocated to the string list, use

-.ZN XFreeStringList .

-.SH PROPERTIES

-.TP 1i

-\s-1WM_COMMAND\s+1

-The command and arguments, null-separated, used to invoke the

-application.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetCommand __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetCommand, XGetCommand \- set or read a window's WM_COMMAND property
+.SH SYNTAX
+.HP
+int XSetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIargv\fP\^, int \fIargc\fP\^); 
+.HP
+Status XGetCommand\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+***\fIargv_return\fP\^, int *\fIargc_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIargc\fP 1i
+Specifies the number of arguments.
+.IP \fIargc_return\fP 1i
+Returns the number of arguments returned.
+.IP \fIargv\fP 1i
+Specifies the application's argument list.
+.IP \fIargv_return\fP 1i
+Returns the application's argument list.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XSetCommand
+function sets the command and arguments used to invoke the
+application.
+(Typically, argv is the argv array of your main program.)
+If the strings are not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+.LP
+.ZN XSetCommand
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow 
+errors.
+.LP
+The 
+.ZN XGetCommand 
+function reads the WM_COMMAND property from the specified window 
+and returns a string list.
+If the WM_COMMAND property exists, 
+it is of type STRING and format 8.
+If sufficient memory can be allocated to contain the string list, 
+.ZN XGetCommand
+fills in the argv_return and argc_return arguments
+and returns a nonzero status.
+Otherwise, or if any other error is encountered, it returns a zero status.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned strings are in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+To free the memory allocated to the string list, use
+.ZN XFreeStringList .
+.SH PROPERTIES
+.TP 1i
+\s-1WM_COMMAND\s+1
+The command and arguments, null-separated, used to invoke the
+application.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetErrorHandler.man b/libX11/man/XSetErrorHandler.man
index 09147dade..0e3121bfa 100644
--- a/libX11/man/XSetErrorHandler.man
+++ b/libX11/man/XSetErrorHandler.man
@@ -1,275 +1,214 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetErrorHandler __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetErrorHandler, XGetErrorText, XDisplayName, XSetIOErrorHandler, XGetErrorDatabaseText \- default error handlers

-.SH SYNTAX

-.HP

-int (*XSetErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)\^(Display *, XErrorEvent

-*)\^)\^)\^(\^); 

-.HP

-int XGetErrorText\^(\^Display *\fIdisplay\fP\^, int \fIcode\fP\^, char

-*\fIbuffer_return\fP\^, int \fIlength\fP\^); 

-.HP

-char *XDisplayName\^(\^char *\fIstring\fP\^); 

-.HP

-int (*XSetIOErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)(Display

-*)\^)\^)\^(\^); 

-.HP

-int XGetErrorDatabaseText\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP, char

-*\fImessage\fP\^, char *\fIdefault_string\fP\^, char *\fIbuffer_return\fP\^,

-int \fIlength\fP\^); 

-.SH ARGUMENTS

-.IP \fIbuffer_return\fP 1i

-Returns the error description.

-.IP \fIcode\fP 1i

-Specifies the error code for which you want to obtain a description.

-.IP \fIdefault_string\fP 1i

-Specifies the default error message if none is found in the database.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIhandler\fP 1i

-Specifies the program's supplied error handler.

-.IP \fIlength\fP 1i

-Specifies the size of the buffer.

-.IP \fImessage\fP 1i

-Specifies the type of the error message.

-.IP \fIname\fP 1i

-Specifies the name of the application.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.SH DESCRIPTION

-Xlib generally calls the program's

-supplied error handler whenever an error is received.

-It is not called on

-.ZN BadName

-errors from

-.ZN OpenFont ,

-.ZN LookupColor ,

-or

-.ZN AllocNamedColor

-protocol requests or on

-.ZN BadFont

-errors from a

-.ZN QueryFont

-protocol request.

-These errors generally are reflected back to the program through the

-procedural interface.

-Because this condition is not assumed to be fatal, 

-it is acceptable for your error handler to return;

-the returned value is ignored.

-However, the error handler should not

-call any functions (directly or indirectly) on the display

-that will generate protocol requests or that will look for input events.

-The previous error handler is returned.

-.LP

-The

-.ZN XGetErrorText

-function copies a null-terminated string describing the specified error code

-into the specified buffer.

-The returned text is in the encoding of the current locale.

-It is recommended that you use this function to obtain an error description

-because extensions to Xlib may define their own error codes

-and error strings.

-.LP

-The

-.ZN XDisplayName

-function returns the name of the display that 

-.ZN XOpenDisplay

-would attempt to use.

-If a NULL string is specified,

-.ZN XDisplayName

-looks in the environment for the display and returns the display name that

-.ZN XOpenDisplay

-would attempt to use.

-This makes it easier to report to the user precisely which display the

-program attempted to open when the initial connection attempt failed.

-.LP

-The

-.ZN XSetIOErrorHandler

-sets the fatal I/O error handler.

-Xlib calls the program's supplied error handler if any sort of system call

-error occurs (for example, the connection to the server was lost).

-This is assumed to be a fatal condition,

-and the called routine should not return.

-If the I/O error handler does return,

-the client process exits.

-.LP

-Note that the previous error handler is returned.

-.LP

-The

-.ZN XGetErrorDatabaseText

-function returns a null-terminated message

-(or the default message) from the error message

-database.

-Xlib uses this function internally to look up its error messages.

-The text in the default_string argument is assumed

-to be in the encoding of the current locale,

-and the text stored in the buffer_return argument

-is in the encoding of the current locale.

-.LP

-The name argument should generally be the name of your application.

-The message argument should indicate which type of error message you want.

-If the name and message are not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-Xlib uses three predefined ``application names'' to report errors.

-In these names,

-uppercase and lowercase matter.

-.IP XProtoError 1i

-The protocol error number is used as a string for the message argument.

-.IP XlibMessage 1i

-These are the message strings that are used internally by the library.

-.IP XRequest 1i

-For a core protocol request,

-the major request protocol number is used for the message argument.

-For an extension request,

-the extension name (as given by

-.ZN InitExtension )

-followed by a period (\.) and the minor request protocol number 

-is used for the message argument.

-If no string is found in the error database,

-the default_string is returned to the buffer argument.

-.SH "SEE ALSO"

-XOpenDisplay(__libmansuffix__),

-XSynchronize(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetErrorHandler __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetErrorHandler, XGetErrorText, XDisplayName, XSetIOErrorHandler, XGetErrorDatabaseText \- default error handlers
+.SH SYNTAX
+.HP
+int (*XSetErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)\^(Display *, XErrorEvent
+*)\^)\^)\^(\^); 
+.HP
+int XGetErrorText\^(\^Display *\fIdisplay\fP\^, int \fIcode\fP\^, char
+*\fIbuffer_return\fP\^, int \fIlength\fP\^); 
+.HP
+char *XDisplayName\^(\^char *\fIstring\fP\^); 
+.HP
+int (*XSetIOErrorHandler\^(\^int (\^*\^\fIhandler\fP\^)(Display
+*)\^)\^)\^(\^); 
+.HP
+int XGetErrorDatabaseText\^(\^Display *\fIdisplay\fP\^, char *\fIname\fP, char
+*\fImessage\fP\^, char *\fIdefault_string\fP\^, char *\fIbuffer_return\fP\^,
+int \fIlength\fP\^); 
+.SH ARGUMENTS
+.IP \fIbuffer_return\fP 1i
+Returns the error description.
+.IP \fIcode\fP 1i
+Specifies the error code for which you want to obtain a description.
+.IP \fIdefault_string\fP 1i
+Specifies the default error message if none is found in the database.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIhandler\fP 1i
+Specifies the program's supplied error handler.
+.IP \fIlength\fP 1i
+Specifies the size of the buffer.
+.IP \fImessage\fP 1i
+Specifies the type of the error message.
+.IP \fIname\fP 1i
+Specifies the name of the application.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.SH DESCRIPTION
+Xlib generally calls the program's
+supplied error handler whenever an error is received.
+It is not called on
+.ZN BadName
+errors from
+.ZN OpenFont ,
+.ZN LookupColor ,
+or
+.ZN AllocNamedColor
+protocol requests or on
+.ZN BadFont
+errors from a
+.ZN QueryFont
+protocol request.
+These errors generally are reflected back to the program through the
+procedural interface.
+Because this condition is not assumed to be fatal, 
+it is acceptable for your error handler to return;
+the returned value is ignored.
+However, the error handler should not
+call any functions (directly or indirectly) on the display
+that will generate protocol requests or that will look for input events.
+The previous error handler is returned.
+.LP
+The
+.ZN XGetErrorText
+function copies a null-terminated string describing the specified error code
+into the specified buffer.
+The returned text is in the encoding of the current locale.
+It is recommended that you use this function to obtain an error description
+because extensions to Xlib may define their own error codes
+and error strings.
+.LP
+The
+.ZN XDisplayName
+function returns the name of the display that 
+.ZN XOpenDisplay
+would attempt to use.
+If a NULL string is specified,
+.ZN XDisplayName
+looks in the environment for the display and returns the display name that
+.ZN XOpenDisplay
+would attempt to use.
+This makes it easier to report to the user precisely which display the
+program attempted to open when the initial connection attempt failed.
+.LP
+The
+.ZN XSetIOErrorHandler
+sets the fatal I/O error handler.
+Xlib calls the program's supplied error handler if any sort of system call
+error occurs (for example, the connection to the server was lost).
+This is assumed to be a fatal condition,
+and the called routine should not return.
+If the I/O error handler does return,
+the client process exits.
+.LP
+Note that the previous error handler is returned.
+.LP
+The
+.ZN XGetErrorDatabaseText
+function returns a null-terminated message
+(or the default message) from the error message
+database.
+Xlib uses this function internally to look up its error messages.
+The text in the default_string argument is assumed
+to be in the encoding of the current locale,
+and the text stored in the buffer_return argument
+is in the encoding of the current locale.
+.LP
+The name argument should generally be the name of your application.
+The message argument should indicate which type of error message you want.
+If the name and message are not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+Xlib uses three predefined ``application names'' to report errors.
+In these names,
+uppercase and lowercase matter.
+.IP XProtoError 1i
+The protocol error number is used as a string for the message argument.
+.IP XlibMessage 1i
+These are the message strings that are used internally by the library.
+.IP XRequest 1i
+For a core protocol request,
+the major request protocol number is used for the message argument.
+For an extension request,
+the extension name (as given by
+.ZN InitExtension )
+followed by a period (\.) and the minor request protocol number 
+is used for the message argument.
+If no string is found in the error database,
+the default_string is returned to the buffer argument.
+.SH "SEE ALSO"
+XOpenDisplay(__libmansuffix__),
+XSynchronize(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetFillStyle.man b/libX11/man/XSetFillStyle.man
index 49dfd606c..a4af0172d 100644
--- a/libX11/man/XSetFillStyle.man
+++ b/libX11/man/XSetFillStyle.man
@@ -1,218 +1,157 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetFillStyle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetFillStyle, XSetFillRule \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetFillStyle\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIfill_style\fP\^); 

-.HP

-int XSetFillRule\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIfill_rule\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfill_rule\fP 1i

-Specifies the fill-rule you want to set for the specified GC.

-You can pass 

-.ZN EvenOddRule

-or

-.ZN WindingRule .

-.IP \fIfill_style\fP 1i

-Specifies the fill-style you want to set for the specified GC.

-You can pass

-.ZN FillSolid ,

-.ZN FillTiled ,

-.ZN FillStippled ,

-or

-.ZN FillOpaqueStippled .

-.IP \fIgc\fP 1i

-Specifies the GC.

-.SH DESCRIPTION

-The

-.ZN XSetFillStyle

-function sets the fill-style in the specified GC.

-.LP

-.ZN XSetFillStyle

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetFillRule

-function sets the fill-rule in the specified GC.

-.LP

-.ZN XSetFillRule

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetFillStyle __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetFillStyle, XSetFillRule \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetFillStyle\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfill_style\fP\^); 
+.HP
+int XSetFillRule\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfill_rule\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfill_rule\fP 1i
+Specifies the fill-rule you want to set for the specified GC.
+You can pass 
+.ZN EvenOddRule
+or
+.ZN WindingRule .
+.IP \fIfill_style\fP 1i
+Specifies the fill-style you want to set for the specified GC.
+You can pass
+.ZN FillSolid ,
+.ZN FillTiled ,
+.ZN FillStippled ,
+or
+.ZN FillOpaqueStippled .
+.IP \fIgc\fP 1i
+Specifies the GC.
+.SH DESCRIPTION
+The
+.ZN XSetFillStyle
+function sets the fill-style in the specified GC.
+.LP
+.ZN XSetFillStyle
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetFillRule
+function sets the fill-rule in the specified GC.
+.LP
+.ZN XSetFillRule
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetFont.man b/libX11/man/XSetFont.man
index 27ead7430..8c303d633 100644
--- a/libX11/man/XSetFont.man
+++ b/libX11/man/XSetFont.man
@@ -1,187 +1,126 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetFont \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetFont\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Font \fIfont\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfont\fP 1i

-Specifies the font.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.SH DESCRIPTION

-The

-.ZN XSetFont

-function sets the current font in the specified GC.

-.LP

-.ZN XSetFont

-can generate

-.ZN BadAlloc ,

-.ZN BadFont ,

-and

-.ZN BadGC 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetFont \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetFont\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Font \fIfont\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfont\fP 1i
+Specifies the font.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.SH DESCRIPTION
+The
+.ZN XSetFont
+function sets the current font in the specified GC.
+.LP
+.ZN XSetFont
+can generate
+.ZN BadAlloc ,
+.ZN BadFont ,
+and
+.ZN BadGC 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetFontPath.man b/libX11/man/XSetFontPath.man
index eb8b67f17..382537fa2 100644
--- a/libX11/man/XSetFontPath.man
+++ b/libX11/man/XSetFontPath.man
@@ -1,213 +1,152 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetFontPath __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetFontPath, XGetFontPath, XFreeFontPath \- set, get, or free the font search path

-.SH SYNTAX

-int XSetFontPath\^(\^Display *\fIdisplay\fP\^, char **\fIdirectories\fP\^, int

-\fIndirs\fP\^); 

-.HP

-char **XGetFontPath\^(\^Display *\fIdisplay\fP\^, int *\fInpaths_return\fP\^);

-.HP

-int XFreeFontPath\^(\^char **\fIlist\fP\^); 

-.SH ARGUMENTS

-.IP \fIdirectories\fP 1i

-Specifies the directory path used to look for a font.

-Setting the path to the empty list restores the default path defined

-for the X server.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIlist\fP 1i

-Specifies the array of strings you want to free.

-.IP \fIndirs\fP 1i

-Specifies the number of directories in the path.

-.IP \fInpaths_return\fP 1i

-Returns the number of strings in the font path array.

-.SH DESCRIPTION

-The

-.ZN XSetFontPath

-function defines the directory search path for font lookup.

-There is only one search path per X server, not one per client.

-The encoding and interpretation of the strings are implementation-dependent,

-but typically they specify directories or font servers to be searched 

-in the order listed.

-An X server is permitted to cache font information internally;

-for example, it might cache an entire font from a file and not

-check on subsequent opens of that font to see if the underlying

-font file has changed.

-However,

-when the font path is changed,

-the X server is guaranteed to flush all cached information about fonts 

-for which there currently are no explicit resource IDs allocated.

-The meaning of an error from this request is implementation-dependent.

-.LP

-.ZN XSetFontPath

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XGetFontPath

-function allocates and returns an array of strings containing the search path.

-The contents of these strings are implementation-dependent

-and are not intended to be interpreted by client applications.

-When it is no longer needed,

-the data in the font path should be freed by using

-.ZN XFreeFontPath .

-.LP

-The

-.ZN XFreeFontPath

-function

-frees the data allocated by

-.ZN XGetFontPath .

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XListFont(__libmansuffix__),

-XLoadFonts(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetFontPath __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetFontPath, XGetFontPath, XFreeFontPath \- set, get, or free the font search path
+.SH SYNTAX
+int XSetFontPath\^(\^Display *\fIdisplay\fP\^, char **\fIdirectories\fP\^, int
+\fIndirs\fP\^); 
+.HP
+char **XGetFontPath\^(\^Display *\fIdisplay\fP\^, int *\fInpaths_return\fP\^);
+.HP
+int XFreeFontPath\^(\^char **\fIlist\fP\^); 
+.SH ARGUMENTS
+.IP \fIdirectories\fP 1i
+Specifies the directory path used to look for a font.
+Setting the path to the empty list restores the default path defined
+for the X server.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIlist\fP 1i
+Specifies the array of strings you want to free.
+.IP \fIndirs\fP 1i
+Specifies the number of directories in the path.
+.IP \fInpaths_return\fP 1i
+Returns the number of strings in the font path array.
+.SH DESCRIPTION
+The
+.ZN XSetFontPath
+function defines the directory search path for font lookup.
+There is only one search path per X server, not one per client.
+The encoding and interpretation of the strings are implementation-dependent,
+but typically they specify directories or font servers to be searched 
+in the order listed.
+An X server is permitted to cache font information internally;
+for example, it might cache an entire font from a file and not
+check on subsequent opens of that font to see if the underlying
+font file has changed.
+However,
+when the font path is changed,
+the X server is guaranteed to flush all cached information about fonts 
+for which there currently are no explicit resource IDs allocated.
+The meaning of an error from this request is implementation-dependent.
+.LP
+.ZN XSetFontPath
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XGetFontPath
+function allocates and returns an array of strings containing the search path.
+The contents of these strings are implementation-dependent
+and are not intended to be interpreted by client applications.
+When it is no longer needed,
+the data in the font path should be freed by using
+.ZN XFreeFontPath .
+.LP
+The
+.ZN XFreeFontPath
+function
+frees the data allocated by
+.ZN XGetFontPath .
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XListFont(__libmansuffix__),
+XLoadFonts(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetICFocus.man b/libX11/man/XSetICFocus.man
index 772f2a93e..39278880d 100644
--- a/libX11/man/XSetICFocus.man
+++ b/libX11/man/XSetICFocus.man
@@ -1,184 +1,123 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetICFocus __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetICFocus, XUnsetICFocus \- set and unset input context focus

-.SH SYNTAX

-.HP

-void XSetICFocus\^(\^XIC \fIic\fP\^); 

-.HP

-void XUnsetICFocus\^(\^XIC \fIic\fP\^); 

-.SH ARGUMENTS

-.IP \fIic\fP 1i

-Specifies the input context.

-.SH DESCRIPTION

-The

-.ZN XSetICFocus

-function allows a client to notify an input method that the focus window

-attached to the specified input context has received keyboard focus.

-The input method should take action to provide appropriate feedback.

-Complete feedback specification is a matter of user interface policy.

-.LP

-Calling

-.ZN XSetICFocus

-does not affect the focus window value.

-.LP

-The

-.ZN XUnsetICFocus

-function allows a client to notify an input method that the specified input context

-has lost the keyboard focus and that no more input is expected on the focus window

-attached to that input context.

-The input method should take action to provide appropriate feedback.

-Complete feedback specification is a matter of user interface policy.

-.LP

-Calling

-.ZN XUnsetICFocus

-does not affect the focus window value;

-the client may still receive 

-events from the input method that are directed to the focus window.

-.SH "SEE ALSO"

-XCreateIC(__libmansuffix__),

-XOpenIM(__libmansuffix__),

-XSetICValues(__libmansuffix__),

-XmbResetIC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetICFocus __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetICFocus, XUnsetICFocus \- set and unset input context focus
+.SH SYNTAX
+.HP
+void XSetICFocus\^(\^XIC \fIic\fP\^); 
+.HP
+void XUnsetICFocus\^(\^XIC \fIic\fP\^); 
+.SH ARGUMENTS
+.IP \fIic\fP 1i
+Specifies the input context.
+.SH DESCRIPTION
+The
+.ZN XSetICFocus
+function allows a client to notify an input method that the focus window
+attached to the specified input context has received keyboard focus.
+The input method should take action to provide appropriate feedback.
+Complete feedback specification is a matter of user interface policy.
+.LP
+Calling
+.ZN XSetICFocus
+does not affect the focus window value.
+.LP
+The
+.ZN XUnsetICFocus
+function allows a client to notify an input method that the specified input context
+has lost the keyboard focus and that no more input is expected on the focus window
+attached to that input context.
+The input method should take action to provide appropriate feedback.
+Complete feedback specification is a matter of user interface policy.
+.LP
+Calling
+.ZN XUnsetICFocus
+does not affect the focus window value;
+the client may still receive 
+events from the input method that are directed to the focus window.
+.SH "SEE ALSO"
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICValues(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetICValues.man b/libX11/man/XSetICValues.man
index 39ee19fee..490ee176f 100644
--- a/libX11/man/XSetICValues.man
+++ b/libX11/man/XSetICValues.man
@@ -1,235 +1,174 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetICValues __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetICValues, XGetICValues \- set and obtain XIC values

-.SH SYNTAX

-.HP

-char * XSetICValues\^(\^XIC \fIic\fP, ...\^); 

-.HP

-char * XGetICValues\^(\^XIC \fIic\fP, ...\^); 

-.SH ARGUMENTS

-.IP \fIic\fP 1i

-Specifies the input context.

-.ds Al \ to set or get XIC values

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XSetICValues

-function returns NULL if no error occurred; 

-otherwise,

-it returns the name of the first argument that could not be set.

-An argument might not be set for any of the following reasons:

-.IP \(bu 5

-The argument is read-only (for example,

-.ZN XNFilterEvents ).

-.IP \(bu 5

-The argument name is not recognized.

-.IP \(bu 5

-An implementation-dependent error occurs.

-.LP

-Each value to be set must be an appropriate datum,

-matching the data type imposed by the semantics of the argument.

-.LP

-The

-.ZN XSetICValues

-can generate

-.ZN BadAtom ,

-.ZN BadColor ,

-.ZN BadCursor ,

-.ZN BadPixmap ,

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetICValues

-function returns NULL if no error occurred; otherwise,

-it returns the name of the first argument that could not be obtained.

-An argument could not be obtained for any of the following reasons:

-.IP \(bu 5

-The argument name is not recognized.

-.IP \(bu 5

-The input method encountered an implementation-dependent error.

-.LP

-Each IC attribute value argument (following a name) must point to

-a location where the IC value is to be stored.

-That is, if the IC value is of type T,

-the argument must be of type T*.

-If T itself is a pointer type,

-then

-.ZN XGetICValues

-allocates memory to store the actual data,

-and the client is responsible for freeing this data by calling

-.ZN XFree

-with the returned pointer.

-The exception to this rule is for an IC value of type

-.ZN XNVaNestedList

-(for preedit and status attributes).

-In this case,  the argument must also be of type

-.ZN XVaNestedList .

-Then, the rule of changing type T to T* and freeing the allocated data

-applies to each element of the nested list.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadCursor

-A value for a Cursor argument does not name a defined Cursor.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XCreateIC(__libmansuffix__),

-XOpenIM(__libmansuffix__),

-XSetICFocus(__libmansuffix__),

-XmbResetIC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetICValues __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetICValues, XGetICValues \- set and obtain XIC values
+.SH SYNTAX
+.HP
+char * XSetICValues\^(\^XIC \fIic\fP, ...\^); 
+.HP
+char * XGetICValues\^(\^XIC \fIic\fP, ...\^); 
+.SH ARGUMENTS
+.IP \fIic\fP 1i
+Specifies the input context.
+.ds Al \ to set or get XIC values
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XSetICValues
+function returns NULL if no error occurred; 
+otherwise,
+it returns the name of the first argument that could not be set.
+An argument might not be set for any of the following reasons:
+.IP \(bu 5
+The argument is read-only (for example,
+.ZN XNFilterEvents ).
+.IP \(bu 5
+The argument name is not recognized.
+.IP \(bu 5
+An implementation-dependent error occurs.
+.LP
+Each value to be set must be an appropriate datum,
+matching the data type imposed by the semantics of the argument.
+.LP
+The
+.ZN XSetICValues
+can generate
+.ZN BadAtom ,
+.ZN BadColor ,
+.ZN BadCursor ,
+.ZN BadPixmap ,
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetICValues
+function returns NULL if no error occurred; otherwise,
+it returns the name of the first argument that could not be obtained.
+An argument could not be obtained for any of the following reasons:
+.IP \(bu 5
+The argument name is not recognized.
+.IP \(bu 5
+The input method encountered an implementation-dependent error.
+.LP
+Each IC attribute value argument (following a name) must point to
+a location where the IC value is to be stored.
+That is, if the IC value is of type T,
+the argument must be of type T*.
+If T itself is a pointer type,
+then
+.ZN XGetICValues
+allocates memory to store the actual data,
+and the client is responsible for freeing this data by calling
+.ZN XFree
+with the returned pointer.
+The exception to this rule is for an IC value of type
+.ZN XNVaNestedList
+(for preedit and status attributes).
+In this case,  the argument must also be of type
+.ZN XVaNestedList .
+Then, the rule of changing type T to T* and freeing the allocated data
+applies to each element of the nested list.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadCursor
+A value for a Cursor argument does not name a defined Cursor.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XmbResetIC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetInputFocus.man b/libX11/man/XSetInputFocus.man
index 4e4db8a0c..25dedddc8 100644
--- a/libX11/man/XSetInputFocus.man
+++ b/libX11/man/XSetInputFocus.man
@@ -1,275 +1,214 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetInputFocus __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetInputFocus, XGetInputFocus \- control input focus

-.SH SYNTAX

-.HP

-int XSetInputFocus\^(\^Display *\fIdisplay\fP\^, Window \fIfocus\fP\^, int

-\fIrevert_to\fP\^, Time \fItime\fP\^); 

-.HP

-int XGetInputFocus\^(\^Display *\fIdisplay\fP\^, Window *\fIfocus_return\fP\^,

-int *\fIrevert_to_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfocus\fP 1i

-Specifies the window,

-.ZN PointerRoot ,

-or

-.ZN None .

-.IP \fIfocus_return\fP 1i

-Returns the focus window,

-.ZN PointerRoot ,

-or 

-.ZN None .

-.IP \fIrevert_to\fP 1i

-Specifies where the input focus reverts to if the window becomes not

-viewable.

-You can pass 

-.ZN RevertToParent , 

-.ZN RevertToPointerRoot , 

-or 

-.ZN RevertToNone .

-.IP \fIrevert_to_return\fP 1i

-Returns the current focus state

-.Pn ( RevertToParent , 

-.ZN RevertToPointerRoot , 

-or 

-.ZN RevertToNone ).

-.IP \fItime\fP 1i

-Specifies the time.

-You can pass either a timestamp or

-.ZN CurrentTime .

-.SH DESCRIPTION

-The

-.ZN XSetInputFocus

-function changes the input focus and the last-focus-change time.

-It has no effect if the specified time is earlier than the current

-last-focus-change time or is later than the current X server time.

-Otherwise, the last-focus-change time is set to the specified time

-.Pn ( CurrentTime 

-is replaced by the current X server time).

-.ZN XSetInputFocus

-causes the X server to generate

-.ZN FocusIn 

-and 

-.ZN FocusOut 

-events.

-.LP

-Depending on the focus argument,

-the following occurs: 

-.IP \(bu 5

-If focus is

-.ZN None ,

-all keyboard events are discarded until a new focus window is set,

-and the revert_to argument is ignored.

-.IP \(bu 5

-If focus is a window, 

-it becomes the keyboard's focus window.

-If a generated keyboard event would normally be reported to this window

-or one of its inferiors, the event is reported as usual. 

-Otherwise, the event is reported relative to the focus window.

-.IP \(bu 5

-If focus is

-.ZN PointerRoot ,

-the focus window is dynamically taken to be the root window of whatever screen 

-the pointer is on at each keyboard event.  

-In this case, the revert_to argument is ignored.

-.LP

-The specified focus window must be viewable at the time 

-.ZN XSetInputFocus

-is called,

-or a

-.ZN BadMatch

-error results.

-If the focus window later becomes not viewable, 

-the X server

-evaluates the revert_to argument to determine the new focus window as follows: 

-.IP \(bu 5

-If revert_to is

-.ZN RevertToParent ,

-the focus reverts to the parent (or the closest viewable ancestor), 

-and the new revert_to value is taken to be

-.ZN RevertToNone .  

-.IP \(bu 5

-If revert_to is

-.ZN RevertToPointerRoot 

-or 

-.ZN RevertToNone ,

-the focus reverts to

-.ZN PointerRoot

-or

-.ZN None ,

-respectively.

-When the focus reverts,

-the X server generates

-.ZN FocusIn

-and

-.ZN FocusOut

-events, but the last-focus-change time is not affected.

-.LP

-.ZN XSetInputFocus

-can generate

-.ZN BadMatch ,

-.ZN BadValue ,

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XGetInputFocus

-function returns the focus window and the current focus state.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XWarpPointer(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetInputFocus __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetInputFocus, XGetInputFocus \- control input focus
+.SH SYNTAX
+.HP
+int XSetInputFocus\^(\^Display *\fIdisplay\fP\^, Window \fIfocus\fP\^, int
+\fIrevert_to\fP\^, Time \fItime\fP\^); 
+.HP
+int XGetInputFocus\^(\^Display *\fIdisplay\fP\^, Window *\fIfocus_return\fP\^,
+int *\fIrevert_to_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfocus\fP 1i
+Specifies the window,
+.ZN PointerRoot ,
+or
+.ZN None .
+.IP \fIfocus_return\fP 1i
+Returns the focus window,
+.ZN PointerRoot ,
+or 
+.ZN None .
+.IP \fIrevert_to\fP 1i
+Specifies where the input focus reverts to if the window becomes not
+viewable.
+You can pass 
+.ZN RevertToParent , 
+.ZN RevertToPointerRoot , 
+or 
+.ZN RevertToNone .
+.IP \fIrevert_to_return\fP 1i
+Returns the current focus state
+.Pn ( RevertToParent , 
+.ZN RevertToPointerRoot , 
+or 
+.ZN RevertToNone ).
+.IP \fItime\fP 1i
+Specifies the time.
+You can pass either a timestamp or
+.ZN CurrentTime .
+.SH DESCRIPTION
+The
+.ZN XSetInputFocus
+function changes the input focus and the last-focus-change time.
+It has no effect if the specified time is earlier than the current
+last-focus-change time or is later than the current X server time.
+Otherwise, the last-focus-change time is set to the specified time
+.Pn ( CurrentTime 
+is replaced by the current X server time).
+.ZN XSetInputFocus
+causes the X server to generate
+.ZN FocusIn 
+and 
+.ZN FocusOut 
+events.
+.LP
+Depending on the focus argument,
+the following occurs: 
+.IP \(bu 5
+If focus is
+.ZN None ,
+all keyboard events are discarded until a new focus window is set,
+and the revert_to argument is ignored.
+.IP \(bu 5
+If focus is a window, 
+it becomes the keyboard's focus window.
+If a generated keyboard event would normally be reported to this window
+or one of its inferiors, the event is reported as usual. 
+Otherwise, the event is reported relative to the focus window.
+.IP \(bu 5
+If focus is
+.ZN PointerRoot ,
+the focus window is dynamically taken to be the root window of whatever screen 
+the pointer is on at each keyboard event.  
+In this case, the revert_to argument is ignored.
+.LP
+The specified focus window must be viewable at the time 
+.ZN XSetInputFocus
+is called,
+or a
+.ZN BadMatch
+error results.
+If the focus window later becomes not viewable, 
+the X server
+evaluates the revert_to argument to determine the new focus window as follows: 
+.IP \(bu 5
+If revert_to is
+.ZN RevertToParent ,
+the focus reverts to the parent (or the closest viewable ancestor), 
+and the new revert_to value is taken to be
+.ZN RevertToNone .  
+.IP \(bu 5
+If revert_to is
+.ZN RevertToPointerRoot 
+or 
+.ZN RevertToNone ,
+the focus reverts to
+.ZN PointerRoot
+or
+.ZN None ,
+respectively.
+When the focus reverts,
+the X server generates
+.ZN FocusIn
+and
+.ZN FocusOut
+events, but the last-focus-change time is not affected.
+.LP
+.ZN XSetInputFocus
+can generate
+.ZN BadMatch ,
+.ZN BadValue ,
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XGetInputFocus
+function returns the focus window and the current focus state.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XWarpPointer(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetLineAttributes.man b/libX11/man/XSetLineAttributes.man
index 2c85d6918..f54c77499 100644
--- a/libX11/man/XSetLineAttributes.man
+++ b/libX11/man/XSetLineAttributes.man
@@ -1,267 +1,206 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetLineAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetLineAttributes, XSetDashes \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetLineAttributes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned

-int \fIline_width\fP\^, int \fIline_style\fP\^, int \fIcap_style\fP\^, int

-\fIjoin_style\fP\^); 

-.HP

-int XSetDashes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIdash_offset\fP\^, char \fIdash_list\fP[]\^, int \fIn\fP\^); 

-.SH ARGUMENTS

-.IP \fIcap_style\fP 1i

-Specifies the line-style and cap-style you want to set for the specified GC.

-You can pass

-.ZN CapNotLast ,

-.ZN CapButt ,

-.ZN CapRound ,

-or

-.ZN CapProjecting .

-.IP \fIdash_list\fP 1i

-Specifies the dash-list for the dashed line-style

-you want to set for the specified GC. 

-.IP \fIdash_offset\fP 1i

-Specifies the phase of the pattern for the dashed line-style you want to set

-for the specified GC. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIjoin_style\fP 1i

-Specifies the line join-style you want to set for the specified GC.

-You can pass

-.ZN JoinMiter ,

-.ZN JoinRound ,

-or

-.ZN JoinBevel .

-.IP \fIline_style\fP 1i

-Specifies the line-style you want to set for the specified GC.

-You can pass

-.ZN LineSolid ,

-.ZN LineOnOffDash ,

-or

-.ZN LineDoubleDash .

-.IP \fIline_width\fP 1i

-Specifies the line-width you want to set for the specified GC.

-.IP \fIn\fP 1i

-Specifies the number of elements in dash_list. 

-.SH DESCRIPTION

-The

-.ZN XSetLineAttributes

-function sets the line drawing components in the specified GC.

-.LP

-.ZN XSetLineAttributes

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetDashes

-function sets the dash-offset and dash-list attributes for dashed line styles

-in the specified GC.

-There must be at least one element in the specified dash_list,

-or a

-.ZN BadValue

-error results. 

-The initial and alternating elements (second, fourth, and so on) 

-of the dash_list are the even dashes, and

-the others are the odd dashes.

-Each element specifies a dash length in pixels.

-All of the elements must be nonzero,

-or a

-.ZN BadValue

-error results.

-Specifying an odd-length list is equivalent to specifying the same list

-concatenated with itself to produce an even-length list.

-.LP

-The dash-offset defines the phase of the pattern,

-specifying how many pixels into the dash-list the pattern

-should actually begin in any single graphics request.

-Dashing is continuous through path elements combined with a join-style

-but is reset to the dash-offset between each sequence of joined lines.

-.LP

-The unit of measure for dashes is the same for the ordinary coordinate system.

-Ideally, a dash length is measured along the slope of the line, but implementations

-are only required to match this ideal for horizontal and vertical lines.

-Failing the ideal semantics, it is suggested that the length be measured along the

-major axis of the line.

-The major axis is defined as the x axis for lines drawn at an angle of between

-\-45 and +45 degrees or between 135 and 225 degrees from the x axis.

-For all other lines, the major axis is the y axis.

-.LP

-.ZN XSetDashes

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetState(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetLineAttributes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetLineAttributes, XSetDashes \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetLineAttributes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned
+int \fIline_width\fP\^, int \fIline_style\fP\^, int \fIcap_style\fP\^, int
+\fIjoin_style\fP\^); 
+.HP
+int XSetDashes\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIdash_offset\fP\^, char \fIdash_list\fP[]\^, int \fIn\fP\^); 
+.SH ARGUMENTS
+.IP \fIcap_style\fP 1i
+Specifies the line-style and cap-style you want to set for the specified GC.
+You can pass
+.ZN CapNotLast ,
+.ZN CapButt ,
+.ZN CapRound ,
+or
+.ZN CapProjecting .
+.IP \fIdash_list\fP 1i
+Specifies the dash-list for the dashed line-style
+you want to set for the specified GC. 
+.IP \fIdash_offset\fP 1i
+Specifies the phase of the pattern for the dashed line-style you want to set
+for the specified GC. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIjoin_style\fP 1i
+Specifies the line join-style you want to set for the specified GC.
+You can pass
+.ZN JoinMiter ,
+.ZN JoinRound ,
+or
+.ZN JoinBevel .
+.IP \fIline_style\fP 1i
+Specifies the line-style you want to set for the specified GC.
+You can pass
+.ZN LineSolid ,
+.ZN LineOnOffDash ,
+or
+.ZN LineDoubleDash .
+.IP \fIline_width\fP 1i
+Specifies the line-width you want to set for the specified GC.
+.IP \fIn\fP 1i
+Specifies the number of elements in dash_list. 
+.SH DESCRIPTION
+The
+.ZN XSetLineAttributes
+function sets the line drawing components in the specified GC.
+.LP
+.ZN XSetLineAttributes
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetDashes
+function sets the dash-offset and dash-list attributes for dashed line styles
+in the specified GC.
+There must be at least one element in the specified dash_list,
+or a
+.ZN BadValue
+error results. 
+The initial and alternating elements (second, fourth, and so on) 
+of the dash_list are the even dashes, and
+the others are the odd dashes.
+Each element specifies a dash length in pixels.
+All of the elements must be nonzero,
+or a
+.ZN BadValue
+error results.
+Specifying an odd-length list is equivalent to specifying the same list
+concatenated with itself to produce an even-length list.
+.LP
+The dash-offset defines the phase of the pattern,
+specifying how many pixels into the dash-list the pattern
+should actually begin in any single graphics request.
+Dashing is continuous through path elements combined with a join-style
+but is reset to the dash-offset between each sequence of joined lines.
+.LP
+The unit of measure for dashes is the same for the ordinary coordinate system.
+Ideally, a dash length is measured along the slope of the line, but implementations
+are only required to match this ideal for horizontal and vertical lines.
+Failing the ideal semantics, it is suggested that the length be measured along the
+major axis of the line.
+The major axis is defined as the x axis for lines drawn at an angle of between
+\-45 and +45 degrees or between 135 and 225 degrees from the x axis.
+For all other lines, the major axis is the y axis.
+.LP
+.ZN XSetDashes
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetState(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetPointerMapping.man b/libX11/man/XSetPointerMapping.man
index 28cf719d2..054757d29 100644
--- a/libX11/man/XSetPointerMapping.man
+++ b/libX11/man/XSetPointerMapping.man
@@ -1,217 +1,156 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetPointerMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetPointerMapping, XGetPointerMapping \- manipulate pointer settings

-.SH SYNTAX

-.HP

-int XSetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char

-\fImap\fP\^[]\^, int \fInmap\fP\^); 

-.HP

-int XGetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char

-\fImap_return\fP\^[]\^, int \fInmap\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fImap\fP 1i

-Specifies the mapping list.

-.IP \fImap_return\fP 1i

-Returns the mapping list.

-.IP \fInmap\fP 1i

-Specifies the number of items in the mapping list.

-.SH DESCRIPTION

-The

-.ZN XSetPointerMapping

-function sets the mapping of the pointer.

-If it succeeds, the X server generates a

-.ZN MappingNotify

-event, and

-.ZN XSetPointerMapping

-returns

-.ZN MappingSuccess .

-Element map[i] defines the logical button number for the physical button

-i+1.

-The length of the list must be the same as

-.ZN XGetPointerMapping

-would return,

-or a

-.ZN BadValue

-error results.

-A zero element disables a button, and elements are not restricted in

-value by the number of physical buttons.

-However, no two elements can have the same nonzero value,

-or a

-.ZN BadValue

-error results.

-If any of the buttons to be altered are logically in the down state,

-.ZN XSetPointerMapping

-returns

-.ZN MappingBusy ,

-and the mapping is not changed.

-.LP

-.ZN XSetPointerMapping

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XGetPointerMapping

-function returns the current mapping of the pointer.

-Pointer buttons are numbered starting from one.

-.ZN XGetPointerMapping

-returns the number of physical buttons actually on the pointer.

-The nominal mapping for a pointer is map[i]=i+1.

-The nmap argument specifies the length of the array where the pointer

-mapping is returned, and only the first nmap elements are returned 

-in map_return.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XChangeKeyboardControl(__libmansuffix__),

-XChangeKeyboardMapping(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetPointerMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetPointerMapping, XGetPointerMapping \- manipulate pointer settings
+.SH SYNTAX
+.HP
+int XSetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
+\fImap\fP\^[]\^, int \fInmap\fP\^); 
+.HP
+int XGetPointerMapping\^(\^Display *\fIdisplay\fP\^, unsigned char
+\fImap_return\fP\^[]\^, int \fInmap\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fImap\fP 1i
+Specifies the mapping list.
+.IP \fImap_return\fP 1i
+Returns the mapping list.
+.IP \fInmap\fP 1i
+Specifies the number of items in the mapping list.
+.SH DESCRIPTION
+The
+.ZN XSetPointerMapping
+function sets the mapping of the pointer.
+If it succeeds, the X server generates a
+.ZN MappingNotify
+event, and
+.ZN XSetPointerMapping
+returns
+.ZN MappingSuccess .
+Element map[i] defines the logical button number for the physical button
+i+1.
+The length of the list must be the same as
+.ZN XGetPointerMapping
+would return,
+or a
+.ZN BadValue
+error results.
+A zero element disables a button, and elements are not restricted in
+value by the number of physical buttons.
+However, no two elements can have the same nonzero value,
+or a
+.ZN BadValue
+error results.
+If any of the buttons to be altered are logically in the down state,
+.ZN XSetPointerMapping
+returns
+.ZN MappingBusy ,
+and the mapping is not changed.
+.LP
+.ZN XSetPointerMapping
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XGetPointerMapping
+function returns the current mapping of the pointer.
+Pointer buttons are numbered starting from one.
+.ZN XGetPointerMapping
+returns the number of physical buttons actually on the pointer.
+The nominal mapping for a pointer is map[i]=i+1.
+The nmap argument specifies the length of the array where the pointer
+mapping is returned, and only the first nmap elements are returned 
+in map_return.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XChangeKeyboardControl(__libmansuffix__),
+XChangeKeyboardMapping(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetScreenSaver.man b/libX11/man/XSetScreenSaver.man
index f42162646..8684769ba 100644
--- a/libX11/man/XSetScreenSaver.man
+++ b/libX11/man/XSetScreenSaver.man
@@ -1,290 +1,229 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetScreenSaver __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetScreenSaver, XForceScreenSaver, XActivateScreenSaver, XResetScreenSaver, XGetScreenSaver \- manipulate the screen saver

-.SH SYNTAX

-.HP

-int XSetScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fItimeout\fP\^,

-int \fIinterval\fP\^, int \fIprefer_blanking\fP\^, int

-\fIallow_exposures\fP\^); 

-.HP

-int XForceScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 

-.HP

-int XActivateScreenSaver\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int XResetScreenSaver\^(\^Display *\fIdisplay\fP\^); 

-.HP

-int XGetScreenSaver\^(\^Display *\fIdisplay\fP\^, int *\fItimeout_return\fP\^,

-int *\fIinterval_return\fP\^, int *\fIprefer_blanking_return\fP\^, int

-*\fIallow_exposures_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIallow_exposures\fP 1i

-Specifies the screen save control values.

-You can pass

-.ZN DontAllowExposures ,

-.ZN AllowExposures ,

-or

-.ZN DefaultExposures .

-.IP \fIallow_exposures_return\fP 1i

-Returns the current screen save control value

-.Pn ( DontAllowExposures ,

-.ZN AllowExposures ,

-or

-.ZN DefaultExposures ).

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIinterval\fP 1i

-Specifies the interval, in seconds, between screen saver alterations.

-.IP \fIinterval_return\fP 1i

-Returns the interval between screen saver invocations.

-.IP \fImode\fP 1i

-Specifies the mode that is to be applied.

-You can pass

-.ZN ScreenSaverActive

-or

-.ZN ScreenSaverReset .

-.IP \fIprefer_blanking\fP 1i

-Specifies how to enable screen blanking.

-You can pass

-.ZN DontPreferBlanking ,

-.ZN PreferBlanking ,

-or

-.ZN DefaultBlanking .

-.IP \fIprefer_blanking_return\fP 1i

-Returns the current screen blanking preference

-.Pn ( DontPreferBlanking ,

-.ZN PreferBlanking ,

-or

-.ZN DefaultBlanking ).

-.IP \fItimeout\fP 1i

-Specifies the timeout, in seconds, until the screen saver turns on.

-.IP \fItimeout_return\fP 1i

-Returns the timeout, in seconds, until the screen saver turns on.

-.SH DESCRIPTION

-Timeout and interval are specified in seconds. 

-A timeout of 0 disables the screen saver 

-(but an activated screen saver is not deactivated),

-and a timeout of \-1 restores the default.

-Other negative values generate a

-.ZN BadValue

-error.

-If the timeout value is nonzero, 

-.ZN XSetScreenSaver

-enables the screen saver.

-An interval of 0 disables the random-pattern motion.

-Both values are limited to a 16-bit signed integer range by the wire protocol,

-despite the C prototype.

-If no input from devices (keyboard, mouse, and so on) is generated 

-for the specified number of timeout seconds once the screen saver is enabled,

-the screen saver is activated.

-.LP

-For each screen, 

-if blanking is preferred and the hardware supports video blanking, 

-the screen simply goes blank.  

-Otherwise, if either exposures are allowed or the screen can be regenerated 

-without sending 

-.ZN Expose 

-events to clients, 

-the screen is tiled with the root window background tile randomly 

-re-origined each interval seconds.

-Otherwise, the screens' state do not change, 

-and the screen saver is not activated.

-The screen saver is deactivated,

-and all screen states are restored at the next

-keyboard or pointer input or at the next call to

-.ZN XForceScreenSaver

-with mode

-.ZN ScreenSaverReset .  

-.LP

-If the server-dependent screen saver method supports periodic change,

-the interval argument serves as a hint about how long the change period

-should be, and zero hints that no periodic change should be made.

-Examples of ways to change the screen include scrambling the colormap

-periodically, moving an icon image around the screen periodically, or tiling

-the screen with the root window background tile, randomly re-origined

-periodically.

-.LP

-.ZN XSetScreenSaver

-can generate a

-.ZN BadValue 

-error.

-.LP

-If the specified mode is 

-.ZN ScreenSaverActive 

-and the screen saver currently is deactivated,

-.ZN XForceScreenSaver

-activates the screen saver even if the screen saver had been disabled

-with a timeout of zero.

-If the specified mode is 

-.ZN ScreenSaverReset 

-and the screen saver currently is enabled,

-.ZN XForceScreenSaver

-deactivates the screen saver if it was activated,

-and the activation timer is reset to its initial state 

-(as if device input had been received).

-.LP

-.ZN XForceScreenSaver

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XActivateScreenSaver

-function activates the screen saver.

-.LP

-The

-.ZN XResetScreenSaver

-function resets the screen saver.

-.LP

-The

-.ZN XGetScreenSaver

-function gets the current screen saver values.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetScreenSaver __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetScreenSaver, XForceScreenSaver, XActivateScreenSaver, XResetScreenSaver, XGetScreenSaver \- manipulate the screen saver
+.SH SYNTAX
+.HP
+int XSetScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fItimeout\fP\^,
+int \fIinterval\fP\^, int \fIprefer_blanking\fP\^, int
+\fIallow_exposures\fP\^); 
+.HP
+int XForceScreenSaver\^(\^Display *\fIdisplay\fP\^, int \fImode\fP\^); 
+.HP
+int XActivateScreenSaver\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XResetScreenSaver\^(\^Display *\fIdisplay\fP\^); 
+.HP
+int XGetScreenSaver\^(\^Display *\fIdisplay\fP\^, int *\fItimeout_return\fP\^,
+int *\fIinterval_return\fP\^, int *\fIprefer_blanking_return\fP\^, int
+*\fIallow_exposures_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIallow_exposures\fP 1i
+Specifies the screen save control values.
+You can pass
+.ZN DontAllowExposures ,
+.ZN AllowExposures ,
+or
+.ZN DefaultExposures .
+.IP \fIallow_exposures_return\fP 1i
+Returns the current screen save control value
+.Pn ( DontAllowExposures ,
+.ZN AllowExposures ,
+or
+.ZN DefaultExposures ).
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIinterval\fP 1i
+Specifies the interval, in seconds, between screen saver alterations.
+.IP \fIinterval_return\fP 1i
+Returns the interval between screen saver invocations.
+.IP \fImode\fP 1i
+Specifies the mode that is to be applied.
+You can pass
+.ZN ScreenSaverActive
+or
+.ZN ScreenSaverReset .
+.IP \fIprefer_blanking\fP 1i
+Specifies how to enable screen blanking.
+You can pass
+.ZN DontPreferBlanking ,
+.ZN PreferBlanking ,
+or
+.ZN DefaultBlanking .
+.IP \fIprefer_blanking_return\fP 1i
+Returns the current screen blanking preference
+.Pn ( DontPreferBlanking ,
+.ZN PreferBlanking ,
+or
+.ZN DefaultBlanking ).
+.IP \fItimeout\fP 1i
+Specifies the timeout, in seconds, until the screen saver turns on.
+.IP \fItimeout_return\fP 1i
+Returns the timeout, in seconds, until the screen saver turns on.
+.SH DESCRIPTION
+Timeout and interval are specified in seconds. 
+A timeout of 0 disables the screen saver 
+(but an activated screen saver is not deactivated),
+and a timeout of \-1 restores the default.
+Other negative values generate a
+.ZN BadValue
+error.
+If the timeout value is nonzero, 
+.ZN XSetScreenSaver
+enables the screen saver.
+An interval of 0 disables the random-pattern motion.
+Both values are limited to a 16-bit signed integer range by the wire protocol,
+despite the C prototype.
+If no input from devices (keyboard, mouse, and so on) is generated 
+for the specified number of timeout seconds once the screen saver is enabled,
+the screen saver is activated.
+.LP
+For each screen, 
+if blanking is preferred and the hardware supports video blanking, 
+the screen simply goes blank.  
+Otherwise, if either exposures are allowed or the screen can be regenerated 
+without sending 
+.ZN Expose 
+events to clients, 
+the screen is tiled with the root window background tile randomly 
+re-origined each interval seconds.
+Otherwise, the screens' state do not change, 
+and the screen saver is not activated.
+The screen saver is deactivated,
+and all screen states are restored at the next
+keyboard or pointer input or at the next call to
+.ZN XForceScreenSaver
+with mode
+.ZN ScreenSaverReset .  
+.LP
+If the server-dependent screen saver method supports periodic change,
+the interval argument serves as a hint about how long the change period
+should be, and zero hints that no periodic change should be made.
+Examples of ways to change the screen include scrambling the colormap
+periodically, moving an icon image around the screen periodically, or tiling
+the screen with the root window background tile, randomly re-origined
+periodically.
+.LP
+.ZN XSetScreenSaver
+can generate a
+.ZN BadValue 
+error.
+.LP
+If the specified mode is 
+.ZN ScreenSaverActive 
+and the screen saver currently is deactivated,
+.ZN XForceScreenSaver
+activates the screen saver even if the screen saver had been disabled
+with a timeout of zero.
+If the specified mode is 
+.ZN ScreenSaverReset 
+and the screen saver currently is enabled,
+.ZN XForceScreenSaver
+deactivates the screen saver if it was activated,
+and the activation timer is reset to its initial state 
+(as if device input had been received).
+.LP
+.ZN XForceScreenSaver
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XActivateScreenSaver
+function activates the screen saver.
+.LP
+The
+.ZN XResetScreenSaver
+function resets the screen saver.
+.LP
+The
+.ZN XGetScreenSaver
+function gets the current screen saver values.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSetSelectionOwner.man b/libX11/man/XSetSelectionOwner.man
index fb0b86f56..3a3707c7b 100644
--- a/libX11/man/XSetSelectionOwner.man
+++ b/libX11/man/XSetSelectionOwner.man
@@ -1,278 +1,217 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetSelectionOwner __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetSelectionOwner, XGetSelectionOwner, XConvertSelection \- manipulate window selection

-.SH SYNTAX

-.HP

-int XSetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,

-Window \fIowner\fP\^, Time \fItime\fP\^); 

-.HP

-Window XGetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom

-\fIselection\fP\^); 

-.HP

-int XConvertSelection\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,

-Atom \fItarget\fP\^, Atom \fIproperty\fP\^, Window \fIrequestor\fP\^, Time

-\fItime\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIowner\fP 1i

-Specifies the owner of the specified selection atom.

-You can pass a window or

-.ZN None .

-.IP \fIproperty\fP 1i

-Specifies the property name.

-You also can pass

-.ZN None .

-.IP \fIrequestor\fP 1i

-Specifies the requestor.

-.IP \fIselection\fP 1i

-Specifies the selection atom.

-.IP \fItarget\fP 1i

-Specifies the target atom.

-.IP \fItime\fP 1i

-Specifies the time.

-You can pass either a timestamp or

-.ZN CurrentTime .

-.SH DESCRIPTION

-The

-.ZN XSetSelectionOwner

-function changes the owner and last-change time for the specified selection

-and has no effect if the specified time is earlier than the current

-last-change time of the specified selection 

-or is later than the current X server time.

-Otherwise, the last-change time is set to the specified time,

-with

-.ZN CurrentTime

-replaced by the current server time.

-If the owner window is specified as

-.ZN None ,

-then the owner of the selection becomes 

-.ZN None

-(that is, no owner).

-Otherwise, the owner of the selection becomes the client executing

-the request.

-.LP 

-If the new owner (whether a client or

-.ZN None )

-is not

-the same as the current owner of the selection and the current

-owner is not

-.ZN None ,

-the current owner is sent a 

-.ZN SelectionClear 

-event.

-If the client that is the owner of a selection is later

-terminated (that is, its connection is closed)

-or if the owner window it has specified in the request is later

-destroyed,

-the owner of the selection automatically

-reverts to

-.ZN None ,

-but the last-change time is not affected.

-The selection atom is uninterpreted by the X server.

-.ZN XGetSelectionOwner

-returns the owner window, which is reported in 

-.ZN SelectionRequest

-and

-.ZN SelectionClear

-events.

-Selections are global to the X server.

-.LP

-.ZN XSetSelectionOwner

-can generate

-.ZN BadAtom

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XGetSelectionOwner

-function

-returns the window ID associated with the window that currently owns the

-specified selection.

-If no selection was specified, the function returns the constant

-.ZN None .

-If

-.ZN None

-is returned,

-there is no owner for the selection.

-.LP

-.ZN XGetSelectionOwner

-can generate a

-.ZN BadAtom 

-error.

-.LP

-.ZN XConvertSelection

-requests that the specified selection be converted to the specified target

-type:

-.IP \(bu 5

-If the specified selection has an owner, the X server sends a

-.ZN SelectionRequest

-event to that owner.

-.IP \(bu 5

-If no owner for the specified

-selection exists, the X server generates a

-.ZN SelectionNotify

-event to the

-requestor with property

-.ZN None .

-.LP

-The arguments are passed on unchanged in either of the events.

-There are two predefined selection atoms: PRIMARY and SECONDARY.

-.LP

-.ZN XConvertSelection

-can generate

-.ZN BadAtom

-and

-.ZN BadWindow 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetSelectionOwner __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetSelectionOwner, XGetSelectionOwner, XConvertSelection \- manipulate window selection
+.SH SYNTAX
+.HP
+int XSetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,
+Window \fIowner\fP\^, Time \fItime\fP\^); 
+.HP
+Window XGetSelectionOwner\^(\^Display *\fIdisplay\fP\^, Atom
+\fIselection\fP\^); 
+.HP
+int XConvertSelection\^(\^Display *\fIdisplay\fP\^, Atom \fIselection\fP\^,
+Atom \fItarget\fP\^, Atom \fIproperty\fP\^, Window \fIrequestor\fP\^, Time
+\fItime\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIowner\fP 1i
+Specifies the owner of the specified selection atom.
+You can pass a window or
+.ZN None .
+.IP \fIproperty\fP 1i
+Specifies the property name.
+You also can pass
+.ZN None .
+.IP \fIrequestor\fP 1i
+Specifies the requestor.
+.IP \fIselection\fP 1i
+Specifies the selection atom.
+.IP \fItarget\fP 1i
+Specifies the target atom.
+.IP \fItime\fP 1i
+Specifies the time.
+You can pass either a timestamp or
+.ZN CurrentTime .
+.SH DESCRIPTION
+The
+.ZN XSetSelectionOwner
+function changes the owner and last-change time for the specified selection
+and has no effect if the specified time is earlier than the current
+last-change time of the specified selection 
+or is later than the current X server time.
+Otherwise, the last-change time is set to the specified time,
+with
+.ZN CurrentTime
+replaced by the current server time.
+If the owner window is specified as
+.ZN None ,
+then the owner of the selection becomes 
+.ZN None
+(that is, no owner).
+Otherwise, the owner of the selection becomes the client executing
+the request.
+.LP 
+If the new owner (whether a client or
+.ZN None )
+is not
+the same as the current owner of the selection and the current
+owner is not
+.ZN None ,
+the current owner is sent a 
+.ZN SelectionClear 
+event.
+If the client that is the owner of a selection is later
+terminated (that is, its connection is closed)
+or if the owner window it has specified in the request is later
+destroyed,
+the owner of the selection automatically
+reverts to
+.ZN None ,
+but the last-change time is not affected.
+The selection atom is uninterpreted by the X server.
+.ZN XGetSelectionOwner
+returns the owner window, which is reported in 
+.ZN SelectionRequest
+and
+.ZN SelectionClear
+events.
+Selections are global to the X server.
+.LP
+.ZN XSetSelectionOwner
+can generate
+.ZN BadAtom
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XGetSelectionOwner
+function
+returns the window ID associated with the window that currently owns the
+specified selection.
+If no selection was specified, the function returns the constant
+.ZN None .
+If
+.ZN None
+is returned,
+there is no owner for the selection.
+.LP
+.ZN XGetSelectionOwner
+can generate a
+.ZN BadAtom 
+error.
+.LP
+.ZN XConvertSelection
+requests that the specified selection be converted to the specified target
+type:
+.IP \(bu 5
+If the specified selection has an owner, the X server sends a
+.ZN SelectionRequest
+event to that owner.
+.IP \(bu 5
+If no owner for the specified
+selection exists, the X server generates a
+.ZN SelectionNotify
+event to the
+requestor with property
+.ZN None .
+.LP
+The arguments are passed on unchanged in either of the events.
+There are two predefined selection atoms: PRIMARY and SECONDARY.
+.LP
+.ZN XConvertSelection
+can generate
+.ZN BadAtom
+and
+.ZN BadWindow 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSetState.man b/libX11/man/XSetState.man
index 816d13cee..6fb7d724f 100644
--- a/libX11/man/XSetState.man
+++ b/libX11/man/XSetState.man
@@ -1,256 +1,195 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetState __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetState, XSetFunction, XSetPlaneMask, XSetForeground, XSetBackground \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetState\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIforeground\fP\^, unsigned int \fIbackground\fP\^, int \fIfunction\fP\^,

-unsigned long \fIplane_mask\fP\^); 

-.HP

-int XSetFunction\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIfunction\fP\^); 

-.HP

-int XSetPlaneMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIplane_mask\fP\^); 

-.HP

-int XSetForeground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIforeground\fP\^); 

-.HP

-int XSetBackground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long

-\fIbackground\fP\^); 

-.SH ARGUMENTS

-.IP \fIbackground\fP 1i

-Specifies the background you want to set for the specified GC.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIforeground\fP 1i

-Specifies the foreground you want to set for the specified GC.

-.IP \fIfunction\fP 1i

-Specifies the function you want to set for the specified GC.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIplane_mask\fP 1i

-Specifies the plane mask.

-.\" *** JIM: NEED MORE INFO FOR THIS. ***

-.SH DESCRIPTION

-The

-.ZN XSetState

-function sets the foreground, background, plane mask, and function components

-for the specified GC.

-.LP

-.ZN XSetState

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-.ZN XSetFunction

-sets a specified value in the specified GC.

-.LP

-.ZN XSetFunction

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XSetPlaneMask

-function sets the plane mask in the specified GC.

-.LP

-.ZN XSetPlaneMask

-can generate

-.ZN BadAlloc 

-and

-.ZN BadGC 

-errors.

-.LP

-The

-.ZN XSetForeground

-function sets the foreground in the specified GC.

-.LP

-.ZN XSetForeground

-can generate

-.ZN BadAlloc

-and

-.ZN BadGC 

-errors.

-.LP

-The

-.ZN XSetBackground

-function sets the background in the specified GC.

-.LP

-.ZN XSetBackground

-can generate

-.ZN BadAlloc

-and

-.ZN BadGC 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetTile(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetState __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetState, XSetFunction, XSetPlaneMask, XSetForeground, XSetBackground \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetState\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIforeground\fP\^, unsigned int \fIbackground\fP\^, int \fIfunction\fP\^,
+unsigned long \fIplane_mask\fP\^); 
+.HP
+int XSetFunction\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIfunction\fP\^); 
+.HP
+int XSetPlaneMask\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIplane_mask\fP\^); 
+.HP
+int XSetForeground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIforeground\fP\^); 
+.HP
+int XSetBackground\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, unsigned long
+\fIbackground\fP\^); 
+.SH ARGUMENTS
+.IP \fIbackground\fP 1i
+Specifies the background you want to set for the specified GC.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIforeground\fP 1i
+Specifies the foreground you want to set for the specified GC.
+.IP \fIfunction\fP 1i
+Specifies the function you want to set for the specified GC.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIplane_mask\fP 1i
+Specifies the plane mask.
+.\" *** JIM: NEED MORE INFO FOR THIS. ***
+.SH DESCRIPTION
+The
+.ZN XSetState
+function sets the foreground, background, plane mask, and function components
+for the specified GC.
+.LP
+.ZN XSetState
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+.ZN XSetFunction
+sets a specified value in the specified GC.
+.LP
+.ZN XSetFunction
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XSetPlaneMask
+function sets the plane mask in the specified GC.
+.LP
+.ZN XSetPlaneMask
+can generate
+.ZN BadAlloc 
+and
+.ZN BadGC 
+errors.
+.LP
+The
+.ZN XSetForeground
+function sets the foreground in the specified GC.
+.LP
+.ZN XSetForeground
+can generate
+.ZN BadAlloc
+and
+.ZN BadGC 
+errors.
+.LP
+The
+.ZN XSetBackground
+function sets the background in the specified GC.
+.LP
+.ZN XSetBackground
+can generate
+.ZN BadAlloc
+and
+.ZN BadGC 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetTile(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetTextProperty.man b/libX11/man/XSetTextProperty.man
index dccd0b071..1438a4202 100644
--- a/libX11/man/XSetTextProperty.man
+++ b/libX11/man/XSetTextProperty.man
@@ -1,267 +1,206 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetTextProperty, XGetTextProperty \- set and read text properties

-.SH SYNTAX

-.HP

-void XSetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop\fP\^, Atom \fIproperty\fP\^); 

-.HP

-Status XGetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop_return\fP\^, Atom \fIproperty\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIproperty\fP 1i

-Specifies the property name.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.SH DESCRIPTION

-The

-.ZN XSetTextProperty

-function replaces the existing specified property for the named window 

-with the data, type, format, and number of items determined 

-by the value field, the encoding field, the format field, 

-and the nitems field, respectively, of the specified

-.ZN XTextProperty

-structure.

-If the property does not already exist,

-.ZN XSetTextProperty

-sets it for the specified window.

-.LP

-.ZN XSetTextProperty

-can generate

-.ZN BadAlloc ,

-.ZN BadAtom ,

-.ZN BadValue ,

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetTextProperty 

-function reads the specified property from the window

-and stores the data in the returned

-.ZN XTextProperty

-structure.

-It stores the data in the value field,

-the type of the data in the encoding field,

-the format of the data in the format field, 

-and the number of items of data in the nitems field.

-An extra byte containing null (which is not included in the nitems member) 

-is stored at the end of the value field of text_prop_return.

-The particular interpretation of the property's encoding 

-and data as text is left to the calling application.

-If the specified property does not exist on the window,

-.ZN XGetTextProperty

-sets the value field to NULL, 

-the encoding field to

-.ZN None , 

-the format field to zero, 

-and the nitems field to zero.

-.LP

-If it was able to read and store the data in the

-.ZN XTextProperty

-structure,

-.ZN XGetTextProperty

-returns a nonzero status; 

-otherwise, it returns a zero status.

-.LP

-.ZN XGetTextProperty

-can generate

-.ZN BadAtom 

-and

-.ZN BadWindow

-errors.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_CLIENT_MACHINE\s+1

-The string name of the machine on which the client application is running.

-.TP 1i

-\s-1WM_COMMAND\s+1

-The command and arguments, null-separated, used to invoke the

-application.

-.TP 1i

-\s-1WM_ICON_NAME\s+1

-The name to be used in an icon.

-.TP 1i

-\s-1WM_NAME\s+1

-The name of the application.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetTextProperty, XGetTextProperty \- set and read text properties
+.SH SYNTAX
+.HP
+void XSetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^, Atom \fIproperty\fP\^); 
+.HP
+Status XGetTextProperty\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^, Atom \fIproperty\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIproperty\fP 1i
+Specifies the property name.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.SH DESCRIPTION
+The
+.ZN XSetTextProperty
+function replaces the existing specified property for the named window 
+with the data, type, format, and number of items determined 
+by the value field, the encoding field, the format field, 
+and the nitems field, respectively, of the specified
+.ZN XTextProperty
+structure.
+If the property does not already exist,
+.ZN XSetTextProperty
+sets it for the specified window.
+.LP
+.ZN XSetTextProperty
+can generate
+.ZN BadAlloc ,
+.ZN BadAtom ,
+.ZN BadValue ,
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetTextProperty 
+function reads the specified property from the window
+and stores the data in the returned
+.ZN XTextProperty
+structure.
+It stores the data in the value field,
+the type of the data in the encoding field,
+the format of the data in the format field, 
+and the number of items of data in the nitems field.
+An extra byte containing null (which is not included in the nitems member) 
+is stored at the end of the value field of text_prop_return.
+The particular interpretation of the property's encoding 
+and data as text is left to the calling application.
+If the specified property does not exist on the window,
+.ZN XGetTextProperty
+sets the value field to NULL, 
+the encoding field to
+.ZN None , 
+the format field to zero, 
+and the nitems field to zero.
+.LP
+If it was able to read and store the data in the
+.ZN XTextProperty
+structure,
+.ZN XGetTextProperty
+returns a nonzero status; 
+otherwise, it returns a zero status.
+.LP
+.ZN XGetTextProperty
+can generate
+.ZN BadAtom 
+and
+.ZN BadWindow
+errors.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_CLIENT_MACHINE\s+1
+The string name of the machine on which the client application is running.
+.TP 1i
+\s-1WM_COMMAND\s+1
+The command and arguments, null-separated, used to invoke the
+application.
+.TP 1i
+\s-1WM_ICON_NAME\s+1
+The name to be used in an icon.
+.TP 1i
+\s-1WM_NAME\s+1
+The name of the application.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetTile.man b/libX11/man/XSetTile.man
index 6390545f6..d35c5a2af 100644
--- a/libX11/man/XSetTile.man
+++ b/libX11/man/XSetTile.man
@@ -1,241 +1,180 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetTile __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetTile, XSetStipple, XSetTSOrigin \- GC convenience routines

-.SH SYNTAX

-.HP

-int XSetTile\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap

-\fItile\fP\^); 

-.HP

-int XSetStipple\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap

-\fIstipple\fP\^); 

-.HP

-int XSetTSOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int

-\fIts_x_origin\fP\^, int \fIts_y_origin\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIstipple\fP 1i

-Specifies the stipple you want to set for the specified GC.

-.IP \fItile\fP 1i

-Specifies the fill tile you want to set for the specified GC. 

-.IP \fIts_x_origin\fP 1i

-.br

-.ns

-.IP \fIts_y_origin\fP 1i

-Specify the x and y coordinates of the tile and stipple origin.

-.SH DESCRIPTION

-The

-.ZN XSetTile

-function sets the fill tile in the specified GC.

-The tile and GC must have the same depth,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetTile

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadPixmap 

-errors.

-.LP

-The

-.ZN XSetStipple

-function sets the stipple in the specified GC.

-The stipple must have a depth of one,

-or a

-.ZN BadMatch

-error results.

-.LP

-.ZN XSetStipple

-can generate

-.ZN BadAlloc ,

-.ZN BadGC ,

-.ZN BadMatch ,

-and

-.ZN BadPixmap 

-errors.

-.LP

-The

-.ZN XSetTSOrigin

-function sets the tile/stipple origin in the specified GC.

-When graphics requests call for tiling or stippling,

-the parent's origin will be interpreted relative to whatever destination

-drawable is specified in the graphics request.

-.LP

-.ZN XSetTSOrigin

-can generate

-.ZN BadAlloc

-and

-.ZN BadGC 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadPixmap

-A value for a Pixmap argument does not name a defined Pixmap.

-.SH "SEE ALSO"

-XCreateGC(__libmansuffix__),

-XQueryBestSize(__libmansuffix__),

-XSetArcMode(__libmansuffix__),

-XSetClipOrigin(__libmansuffix__),

-XSetFillStyle(__libmansuffix__),

-XSetFont(__libmansuffix__),

-XSetLineAttributes(__libmansuffix__),

-XSetState(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetTile __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetTile, XSetStipple, XSetTSOrigin \- GC convenience routines
+.SH SYNTAX
+.HP
+int XSetTile\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fItile\fP\^); 
+.HP
+int XSetStipple\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, Pixmap
+\fIstipple\fP\^); 
+.HP
+int XSetTSOrigin\^(\^Display *\fIdisplay\fP\^, GC \fIgc\fP\^, int
+\fIts_x_origin\fP\^, int \fIts_y_origin\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIstipple\fP 1i
+Specifies the stipple you want to set for the specified GC.
+.IP \fItile\fP 1i
+Specifies the fill tile you want to set for the specified GC. 
+.IP \fIts_x_origin\fP 1i
+.br
+.ns
+.IP \fIts_y_origin\fP 1i
+Specify the x and y coordinates of the tile and stipple origin.
+.SH DESCRIPTION
+The
+.ZN XSetTile
+function sets the fill tile in the specified GC.
+The tile and GC must have the same depth,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetTile
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadPixmap 
+errors.
+.LP
+The
+.ZN XSetStipple
+function sets the stipple in the specified GC.
+The stipple must have a depth of one,
+or a
+.ZN BadMatch
+error results.
+.LP
+.ZN XSetStipple
+can generate
+.ZN BadAlloc ,
+.ZN BadGC ,
+.ZN BadMatch ,
+and
+.ZN BadPixmap 
+errors.
+.LP
+The
+.ZN XSetTSOrigin
+function sets the tile/stipple origin in the specified GC.
+When graphics requests call for tiling or stippling,
+the parent's origin will be interpreted relative to whatever destination
+drawable is specified in the graphics request.
+.LP
+.ZN XSetTSOrigin
+can generate
+.ZN BadAlloc
+and
+.ZN BadGC 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadPixmap
+A value for a Pixmap argument does not name a defined Pixmap.
+.SH "SEE ALSO"
+XCreateGC(__libmansuffix__),
+XQueryBestSize(__libmansuffix__),
+XSetArcMode(__libmansuffix__),
+XSetClipOrigin(__libmansuffix__),
+XSetFillStyle(__libmansuffix__),
+XSetFont(__libmansuffix__),
+XSetLineAttributes(__libmansuffix__),
+XSetState(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetTransientForHint.man b/libX11/man/XSetTransientForHint.man
index e2ab3b91d..3255137e9 100644
--- a/libX11/man/XSetTransientForHint.man
+++ b/libX11/man/XSetTransientForHint.man
@@ -1,211 +1,150 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetTransientForHint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetTransientForHint, XGetTransientForHint \- set or read a window's WM_TRANSIENT_FOR property

-.SH SYNTAX

-.HP

-int XSetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Window \fIprop_window\fP\^); 

-.HP

-Status XGetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Window *\fIprop_window_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIprop_window\fP 1i

-Specifies the window that the WM_TRANSIENT_FOR property is to be set to.

-.IP \fIprop_window_return\fP 1i

-Returns the WM_TRANSIENT_FOR property of the specified window.

-.SH DESCRIPTION

-The

-.ZN XSetTransientForHint

-function sets the WM_TRANSIENT_FOR property of the specified window to the 

-specified prop_window.

-.LP

-.ZN XSetTransientForHint

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow 

-errors.

-.LP

-The

-.ZN XGetTransientForHint

-function returns the WM_TRANSIENT_FOR property for the specified window.

-It returns a nonzero status on success;

-otherwise, it returns a zero status.

-.LP

-.ZN XGetTransientForHint

-can generate a

-.ZN BadWindow 

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_TRANSIENT_FOR\s+1

-Set by application programs to indicate to the window manager that a transient

-top-level window, such as a dialog box.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetTransientForHint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetTransientForHint, XGetTransientForHint \- set or read a window's WM_TRANSIENT_FOR property
+.SH SYNTAX
+.HP
+int XSetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window \fIprop_window\fP\^); 
+.HP
+Status XGetTransientForHint\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window *\fIprop_window_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIprop_window\fP 1i
+Specifies the window that the WM_TRANSIENT_FOR property is to be set to.
+.IP \fIprop_window_return\fP 1i
+Returns the WM_TRANSIENT_FOR property of the specified window.
+.SH DESCRIPTION
+The
+.ZN XSetTransientForHint
+function sets the WM_TRANSIENT_FOR property of the specified window to the 
+specified prop_window.
+.LP
+.ZN XSetTransientForHint
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow 
+errors.
+.LP
+The
+.ZN XGetTransientForHint
+function returns the WM_TRANSIENT_FOR property for the specified window.
+It returns a nonzero status on success;
+otherwise, it returns a zero status.
+.LP
+.ZN XGetTransientForHint
+can generate a
+.ZN BadWindow 
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_TRANSIENT_FOR\s+1
+Set by application programs to indicate to the window manager that a transient
+top-level window, such as a dialog box.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMClientMachine.man b/libX11/man/XSetWMClientMachine.man
index bc0370299..1fe1fa391 100644
--- a/libX11/man/XSetWMClientMachine.man
+++ b/libX11/man/XSetWMClientMachine.man
@@ -1,198 +1,137 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMClientMachine __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMClientMachine, XGetWMClientMachine \- set or read a window's WM_CLIENT_MACHINE property

-.SH SYNTAX

-.HP

-void XSetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop\fP\^); 

-.HP

-Status XGetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XSetWMClientMachine

-convenience function calls

-.ZN XSetTextProperty

-to set the WM_CLIENT_MACHINE property.

-.LP

-The

-.ZN XGetWMClientMachine

-convenience function performs an 

-.ZN XGetTextProperty 

-on the WM_CLIENT_MACHINE property.

-It returns a nonzero status on success;

-otherwise, it returns a zero status.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_CLIENT_MACHINE\s+1

-The string name of the machine on which the client application is running.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMClientMachine __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMClientMachine, XGetWMClientMachine \- set or read a window's WM_CLIENT_MACHINE property
+.SH SYNTAX
+.HP
+void XSetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^); 
+.HP
+Status XGetWMClientMachine\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XSetWMClientMachine
+convenience function calls
+.ZN XSetTextProperty
+to set the WM_CLIENT_MACHINE property.
+.LP
+The
+.ZN XGetWMClientMachine
+convenience function performs an 
+.ZN XGetTextProperty 
+on the WM_CLIENT_MACHINE property.
+It returns a nonzero status on success;
+otherwise, it returns a zero status.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_CLIENT_MACHINE\s+1
+The string name of the machine on which the client application is running.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMColormapWindows.man b/libX11/man/XSetWMColormapWindows.man
index 148a83a9e..66cb8a050 100644
--- a/libX11/man/XSetWMColormapWindows.man
+++ b/libX11/man/XSetWMColormapWindows.man
@@ -1,238 +1,177 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMColormapWindows __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMColormapWindows, XGetWMColormapWindows \- set or read a window's WM_COLORMAP_WINDOWS property

-.SH SYNTAX

-.HP

-Status XSetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Window *\fIcolormap_windows\fP\^, int \fIcount\fP\^); 

-.HP

-Status XGetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-Window **\fIcolormap_windows_return\fP\^, int *\fIcount_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcolormap_windows\fP 1i

-Specifies the list of windows.

-.IP \fIcolormap_windows_return\fP 1i

-Returns the list of windows.

-.ds Cn windows in the list

-.IP \fIcount\fP 1i

-Specifies the number of \*(Cn.

-.ds Cn windows in the list

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The 

-.ZN XSetWMColormapWindows 

-function replaces the WM_COLORMAP_WINDOWS property on the specified

-window with the list of windows specified by the colormap_windows argument.

-It the property does not already exist,

-.ZN XSetWMColormapWindows

-sets the WM_COLORMAP_WINDOWS property on the specified

-window to the list of windows specified by the colormap_windows argument.

-The property is stored with a type of WINDOW and a format of 32.

-If it cannot intern the WM_COLORMAP_WINDOWS atom,

-.ZN XSetWMColormapWindows

-returns a zero status.

-Otherwise, it returns a nonzero status.

-.LP

-.ZN XSetWMColormapWindows

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The 

-.ZN XGetWMColormapWindows 

-function returns the list of window identifiers stored 

-in the WM_COLORMAP_WINDOWS property on the specified window.

-These identifiers indicate the colormaps that the window manager

-may need to install for this window.

-If the property exists, is of type WINDOW, is of format 32, 

-and the atom WM_COLORMAP_WINDOWS can be interned, 

-.ZN XGetWMColormapWindows

-sets the windows_return argument to a list of window identifiers, 

-sets the count_return argument to the number of elements in the list, 

-and returns a nonzero status.

-Otherwise, it sets neither of the return arguments

-and returns a zero status.

-To release the list of window identifiers, use

-.ZN XFree . 

-.LP

-.ZN XGetWMColormapWindows

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_COLORMAP_WINDOWS\s+1

-The list of window IDs that may need a different colormap

-from that of their top-level window.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMColormapWindows __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMColormapWindows, XGetWMColormapWindows \- set or read a window's WM_COLORMAP_WINDOWS property
+.SH SYNTAX
+.HP
+Status XSetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window *\fIcolormap_windows\fP\^, int \fIcount\fP\^); 
+.HP
+Status XGetWMColormapWindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+Window **\fIcolormap_windows_return\fP\^, int *\fIcount_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcolormap_windows\fP 1i
+Specifies the list of windows.
+.IP \fIcolormap_windows_return\fP 1i
+Returns the list of windows.
+.ds Cn windows in the list
+.IP \fIcount\fP 1i
+Specifies the number of \*(Cn.
+.ds Cn windows in the list
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The 
+.ZN XSetWMColormapWindows 
+function replaces the WM_COLORMAP_WINDOWS property on the specified
+window with the list of windows specified by the colormap_windows argument.
+It the property does not already exist,
+.ZN XSetWMColormapWindows
+sets the WM_COLORMAP_WINDOWS property on the specified
+window to the list of windows specified by the colormap_windows argument.
+The property is stored with a type of WINDOW and a format of 32.
+If it cannot intern the WM_COLORMAP_WINDOWS atom,
+.ZN XSetWMColormapWindows
+returns a zero status.
+Otherwise, it returns a nonzero status.
+.LP
+.ZN XSetWMColormapWindows
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The 
+.ZN XGetWMColormapWindows 
+function returns the list of window identifiers stored 
+in the WM_COLORMAP_WINDOWS property on the specified window.
+These identifiers indicate the colormaps that the window manager
+may need to install for this window.
+If the property exists, is of type WINDOW, is of format 32, 
+and the atom WM_COLORMAP_WINDOWS can be interned, 
+.ZN XGetWMColormapWindows
+sets the windows_return argument to a list of window identifiers, 
+sets the count_return argument to the number of elements in the list, 
+and returns a nonzero status.
+Otherwise, it sets neither of the return arguments
+and returns a zero status.
+To release the list of window identifiers, use
+.ZN XFree . 
+.LP
+.ZN XGetWMColormapWindows
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_COLORMAP_WINDOWS\s+1
+The list of window IDs that may need a different colormap
+from that of their top-level window.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMIconName.man b/libX11/man/XSetWMIconName.man
index 3b2894f9d..98190a40b 100644
--- a/libX11/man/XSetWMIconName.man
+++ b/libX11/man/XSetWMIconName.man
@@ -1,250 +1,189 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMIconName __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMIconName, XGetWMIconName, XSetIconName, XGetIconName \- set or read a window's WM_ICON_NAME property

-.SH SYNTAX

-.HP

-void XSetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop\fP\^); 

-.HP

-Status XGetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-int XSetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-*\fIicon_name\fP\^); 

-.HP

-Status XGetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-**\fIicon_name_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIicon_name\fP 1i

-Specifies the icon name,

-which should be a null-terminated string.

-.IP \fIicon_name_return\fP 1i

-Returns the window's icon name,

-which is a null-terminated string.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XSetWMIconName

-convenience function calls

-.ZN XSetTextProperty

-to set the WM_ICON_NAME property.

-.LP

-The 

-.ZN XGetWMIconName 

-convenience function calls

-.ZN XGetTextProperty 

-to obtain the WM_ICON_NAME property.

-It returns a nonzero status on success;

-otherwise, it returns a zero status.

-.LP

-The

-.ZN XSetIconName

-function sets the name to be displayed in a window's icon.

-.LP

-.ZN XSetIconName

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XGetIconName

-function returns the name to be displayed in the specified window's icon.

-If it succeeds, it returns a nonzero status; otherwise, 

-if no icon name has been set for the window,

-it returns zero.

-If you never assigned a name to the window,

-.ZN XGetIconName

-sets icon_name_return to NULL.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned string is in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-When finished with it, a client must free

-the icon name string using

-.ZN XFree .

-.LP

-.ZN XGetIconName

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_ICON_NAME\s+1

-The name to be used in an icon.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMIconName __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMIconName, XGetWMIconName, XSetIconName, XGetIconName \- set or read a window's WM_ICON_NAME property
+.SH SYNTAX
+.HP
+void XSetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop\fP\^); 
+.HP
+Status XGetWMIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XSetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIicon_name\fP\^); 
+.HP
+Status XGetIconName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIicon_name_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIicon_name\fP 1i
+Specifies the icon name,
+which should be a null-terminated string.
+.IP \fIicon_name_return\fP 1i
+Returns the window's icon name,
+which is a null-terminated string.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XSetWMIconName
+convenience function calls
+.ZN XSetTextProperty
+to set the WM_ICON_NAME property.
+.LP
+The 
+.ZN XGetWMIconName 
+convenience function calls
+.ZN XGetTextProperty 
+to obtain the WM_ICON_NAME property.
+It returns a nonzero status on success;
+otherwise, it returns a zero status.
+.LP
+The
+.ZN XSetIconName
+function sets the name to be displayed in a window's icon.
+.LP
+.ZN XSetIconName
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XGetIconName
+function returns the name to be displayed in the specified window's icon.
+If it succeeds, it returns a nonzero status; otherwise, 
+if no icon name has been set for the window,
+it returns zero.
+If you never assigned a name to the window,
+.ZN XGetIconName
+sets icon_name_return to NULL.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned string is in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+When finished with it, a client must free
+the icon name string using
+.ZN XFree .
+.LP
+.ZN XGetIconName
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_ICON_NAME\s+1
+The name to be used in an icon.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMName.man b/libX11/man/XSetWMName.man
index d64ac3aec..8f598d1bb 100644
--- a/libX11/man/XSetWMName.man
+++ b/libX11/man/XSetWMName.man
@@ -1,257 +1,196 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMName __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMName, XGetWMName, XStoreName, XFetchName \- set or read a window's WM_NAME property

-.SH SYNTAX

-.HP

-void XSetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, XTextProperty

-*\fItext_prop\fP\^); 

-.HP

-Status XGetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-int XStoreName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-*\fIwindow_name\fP\^); 

-.HP

-Status XFetchName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-**\fIwindow_name_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIwindow_name\fP 1i

-Specifies the window name,

-which should be a null-terminated string.

-.IP \fIwindow_name_return\fP 1i

-Returns the window name, which is a null-terminated string.

-.SH DESCRIPTION

-The

-.ZN XSetWMName

-convenience function calls

-.ZN XSetTextProperty 

-to set the WM_NAME property.

-.LP

-The

-.ZN XGetWMName 

-convenience function calls

-.ZN XGetTextProperty 

-to obtain the WM_NAME property.

-It returns a nonzero status on success;

-otherwise, it returns a zero status.

-.LP

-The

-.ZN XStoreName

-function assigns the name passed to window_name to the specified window.

-A window manager can display the window name in some prominent

-place, such as the title bar, to allow users to identify windows easily.

-Some window managers may display a window's name in the window's icon,

-although they are encouraged to use the window's icon name

-if one is provided by the application.

-If the string is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-.LP

-.ZN XStoreName

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The

-.ZN XFetchName

-function returns the name of the specified window.

-If it succeeds,

-it returns a nonzero status; 

-otherwise, no name has been set for the window,

-and it returns zero.

-If the WM_NAME property has not been set for this window,

-.ZN XFetchName

-sets window_name_return to NULL.

-If the data returned by the server is in the Latin Portable Character Encoding,

-then the returned string is in the Host Portable Character Encoding.

-Otherwise, the result is implementation-dependent.

-When finished with it, a client must free

-the window name string using

-.ZN XFree .

-.LP

-.ZN XFetchName

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_NAME\s+1

-The name of the application.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMName __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMName, XGetWMName, XStoreName, XFetchName \- set or read a window's WM_NAME property
+.SH SYNTAX
+.HP
+void XSetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, XTextProperty
+*\fItext_prop\fP\^); 
+.HP
+Status XGetWMName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XStoreName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^); 
+.HP
+Status XFetchName\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+**\fIwindow_name_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwindow_name\fP 1i
+Specifies the window name,
+which should be a null-terminated string.
+.IP \fIwindow_name_return\fP 1i
+Returns the window name, which is a null-terminated string.
+.SH DESCRIPTION
+The
+.ZN XSetWMName
+convenience function calls
+.ZN XSetTextProperty 
+to set the WM_NAME property.
+.LP
+The
+.ZN XGetWMName 
+convenience function calls
+.ZN XGetTextProperty 
+to obtain the WM_NAME property.
+It returns a nonzero status on success;
+otherwise, it returns a zero status.
+.LP
+The
+.ZN XStoreName
+function assigns the name passed to window_name to the specified window.
+A window manager can display the window name in some prominent
+place, such as the title bar, to allow users to identify windows easily.
+Some window managers may display a window's name in the window's icon,
+although they are encouraged to use the window's icon name
+if one is provided by the application.
+If the string is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+.LP
+.ZN XStoreName
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XFetchName
+function returns the name of the specified window.
+If it succeeds,
+it returns a nonzero status; 
+otherwise, no name has been set for the window,
+and it returns zero.
+If the WM_NAME property has not been set for this window,
+.ZN XFetchName
+sets window_name_return to NULL.
+If the data returned by the server is in the Latin Portable Character Encoding,
+then the returned string is in the Host Portable Character Encoding.
+Otherwise, the result is implementation-dependent.
+When finished with it, a client must free
+the window name string using
+.ZN XFree .
+.LP
+.ZN XFetchName
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_NAME\s+1
+The name of the application.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMProperties.man b/libX11/man/XSetWMProperties.man
index 18b24d334..9d670c5c4 100644
--- a/libX11/man/XSetWMProperties.man
+++ b/libX11/man/XSetWMProperties.man
@@ -1,390 +1,329 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMProperties __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties

-.SH SYNTAX

-.HP

-void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,

-XTextProperty *\fIwindow_name\fP\^, XTextProperty *\fIicon_name\fP\^, char

-**\fIargv\fP\^, int \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints

-*\fIwm_hints\fP\^, XClassHint *\fIclass_hints\fP\^); 

-.HP

-void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int

-\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,

-XClassHint *\fIclass_hints\fP\^); 

-.HP

-void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char

-*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int

-\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,

-XClassHint *\fIclass_hints\fP\^); 

-.SH ARGUMENTS

-.IP \fIargc\fP 1i

-Specifies the number of arguments.

-.IP \fIargv\fP 1i

-Specifies the application's argument list.

-.IP \fIclass_hints\fP 1i

-Specifies the

-.ZN XClassHint

-structure to be used.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIicon_name\fP 1i

-Specifies the icon name,

-which should be a null-terminated string.

-.IP \fInormal_hints\fP 1i

-Specifies the size hints for the window in its normal state.

-.IP \fIw\fP 1i

-Specifies the window.

-.IP \fIwindow_name\fP 1i

-Specifies the window name,

-which should be a null-terminated string.

-.IP \fIwm_hints\fP 1i

-Specifies the

-.ZN XWMHints

-structure to be used.

-.SH DESCRIPTION

-The 

-.ZN XSetWMProperties 

-convenience function provides a single programming interface 

-for setting those essential window properties that are used 

-for communicating with other clients (particularly window and session

-managers).

-.LP

-If the window_name argument is non-NULL, 

-.ZN XSetWMProperties

-calls

-.ZN XSetWMName ,

-which in turn, sets the WM_NAME property (see section 14.1.4).

-If the icon_name argument is non-NULL,

-.ZN XSetWMProperties

-calls

-.ZN XSetWMIconName ,

-which sets the WM_ICON_NAME property (see section 14.1.5).

-If the argv argument is non-NULL, 

-.ZN XSetWMProperties

-calls

-.ZN XSetCommand ,

-which sets the WM_COMMAND property (see section 14.2.1).

-Note that an argc of zero is allowed to indicate a zero-length command.

-Note also that the hostname of this machine is stored using

-.ZN XSetWMClientMachine 

-(see section 14.2.2).

-.LP

-If the normal_hints argument is non-NULL, 

-.ZN XSetWMProperties

-calls

-.ZN XSetWMNormalHints ,

-which sets the WM_NORMAL_HINTS property (see section 14.1.7).

-If the wm_hints argument is non-NULL, 

-.ZN XSetWMProperties

-calls

-.ZN XSetWMHints ,

-which sets the WM_HINTS property (see section 14.1.6).

-.LP

-If the class_hints argument is non-NULL, 

-.ZN XSetWMProperties

-calls

-.ZN XSetClassHint ,

-which sets the WM_CLASS property (see section 14.1.8).

-If the res_name member in the

-.ZN XClassHint

-structure is set to the NULL pointer and the RESOURCE_NAME environment 

-variable is set, 

-then the value of the environment variable is substituted for res_name.

-If the res_name member is NULL, 

-the environment variable is not set, 

-and argv and argv[0] are set, 

-then the value of argv[0], stripped of

-any directory prefixes, is substituted for res_name.

-.LP

-The

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-convenience functions provide a simple programming interface 

-for setting those essential window properties that are used 

-for communicating with other clients

-(particularly window and session managers).

-.LP

-If the window_name argument is non-NULL,

-they set the WM_NAME property.

-If the icon_name argument is non-NULL,

-they set the WM_ICON_NAME property.

-The window_name and icon_name arguments are null-terminated strings, for

-.ZN XmbSetWMProperties

-in the encoding of the current locale, for

-.ZN Xutf8SetWMProperties

-in UTF-8 encoding.

-If the arguments can be fully converted to the STRING encoding,

-the properties are created with type ``STRING''; 

-otherwise, the arguments are converted to Compound Text, 

-and the properties are created with type ``COMPOUND_TEXT''.

-.LP

-If the normal_hints argument is non-NULL,

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-call

-.ZN XSetWMNormalHints ,

-which sets the WM_NORMAL_HINTS property (see section 14.1.7).

-If the wm_hints argument is non-NULL, 

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-call

-.ZN XSetWMHints ,

-which sets the WM_HINTS property (see section 14.1.6).

-.LP

-If the argv argument is non-NULL,

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-set the WM_COMMAND property from argv and argc.

-An argc of zero indicates a zero-length command.

-.LP

-The hostname of the machine is stored using 

-.ZN XSetWMClientMachine 

-(see section 14.2.2).

-.LP

-If the class_hints argument is non-NULL,

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-set the WM_CLASS property.

-If the res_name member in the 

-.ZN XClassHint

-structure is set to the NULL pointer and the RESOURCE_NAME

-environment variable is set,

-the value of the environment variable is substituted for res_name.

-If the res_name member is NULL,

-the environment variable is not set, and argv and argv[0] are set,

-then the value of argv[0], stripped of any directory prefixes,

-is substituted for res_name.

-.LP

-It is assumed that the supplied class_hints.res_name and argv,

-the RESOURCE_NAME environment variable, and the hostname of the machine

-are in the encoding of the current locale.

-The corresponding WM_CLASS, WM_COMMAND, and WM_CLIENT_MACHINE properties

-are typed according to the local host locale announcer.

-No encoding conversion is performed for these strings prior to storage

-in the properties.

-.LP

-For clients that need to process the property text in a locale,

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-set the WM_LOCALE_NAME property to be the name of the current locale.

-The name is assumed to be in the Host Portable Character Encoding

-and is converted to STRING for storage in the property.

-.LP

-.ZN XSetWMProperties ,

-.ZN XmbSetWMProperties

-and

-.ZN Xutf8SetWMProperties

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The function

-.ZN Xutf8SetWMProperties

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH PROPERTIES

-.TP 1i

-\s-1WM_CLASS\s+1

-Set by application programs to allow window and session

-managers to obtain the application's resources from the resource database.

-.TP 1i

-\s-1WM_CLIENT_MACHINE\s+1

-The string name of the machine on which the client application is running.

-.TP 1i

-\s-1WM_COMMAND\s+1

-The command and arguments, null-separated, used to invoke the

-application.

-.TP 1i

-\s-1WM_HINTS\s+1

-Additional hints set by the client for use by the window manager.

-The C type of this property is 

-.ZN XWMHints .

-.TP 1i

-\s-1WM_ICON_NAME\s+1

-The name to be used in an icon.

-.TP 1i

-\s-1WM_NAME\s+1

-The name of the application.

-.TP 1i

-\s-1WM_NORMAL_HINTS\s+1

-Size hints for a window in its normal state.

-The C type of this property is

-.ZN XSizeHints .

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XParseGeometry(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__),

-XTextListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMProperties __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMProperties, XmbSetWMProperties, Xutf8SetWMProperties \- set standard window properties
+.SH SYNTAX
+.HP
+void XSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^,
+XTextProperty *\fIwindow_name\fP\^, XTextProperty *\fIicon_name\fP\^, char
+**\fIargv\fP\^, int \fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints
+*\fIwm_hints\fP\^, XClassHint *\fIclass_hints\fP\^); 
+.HP
+void XmbSetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
+\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
+XClassHint *\fIclass_hints\fP\^); 
+.HP
+void Xutf8SetWMProperties\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, char
+*\fIwindow_name\fP\^, char *\fIicon_name\fP\^, char *\fIargv\fP\^[], int
+\fIargc\fP\^, XSizeHints *\fInormal_hints\fP\^, XWMHints *\fIwm_hints\fP\^,
+XClassHint *\fIclass_hints\fP\^); 
+.SH ARGUMENTS
+.IP \fIargc\fP 1i
+Specifies the number of arguments.
+.IP \fIargv\fP 1i
+Specifies the application's argument list.
+.IP \fIclass_hints\fP 1i
+Specifies the
+.ZN XClassHint
+structure to be used.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIicon_name\fP 1i
+Specifies the icon name,
+which should be a null-terminated string.
+.IP \fInormal_hints\fP 1i
+Specifies the size hints for the window in its normal state.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwindow_name\fP 1i
+Specifies the window name,
+which should be a null-terminated string.
+.IP \fIwm_hints\fP 1i
+Specifies the
+.ZN XWMHints
+structure to be used.
+.SH DESCRIPTION
+The 
+.ZN XSetWMProperties 
+convenience function provides a single programming interface 
+for setting those essential window properties that are used 
+for communicating with other clients (particularly window and session
+managers).
+.LP
+If the window_name argument is non-NULL, 
+.ZN XSetWMProperties
+calls
+.ZN XSetWMName ,
+which in turn, sets the WM_NAME property (see section 14.1.4).
+If the icon_name argument is non-NULL,
+.ZN XSetWMProperties
+calls
+.ZN XSetWMIconName ,
+which sets the WM_ICON_NAME property (see section 14.1.5).
+If the argv argument is non-NULL, 
+.ZN XSetWMProperties
+calls
+.ZN XSetCommand ,
+which sets the WM_COMMAND property (see section 14.2.1).
+Note that an argc of zero is allowed to indicate a zero-length command.
+Note also that the hostname of this machine is stored using
+.ZN XSetWMClientMachine 
+(see section 14.2.2).
+.LP
+If the normal_hints argument is non-NULL, 
+.ZN XSetWMProperties
+calls
+.ZN XSetWMNormalHints ,
+which sets the WM_NORMAL_HINTS property (see section 14.1.7).
+If the wm_hints argument is non-NULL, 
+.ZN XSetWMProperties
+calls
+.ZN XSetWMHints ,
+which sets the WM_HINTS property (see section 14.1.6).
+.LP
+If the class_hints argument is non-NULL, 
+.ZN XSetWMProperties
+calls
+.ZN XSetClassHint ,
+which sets the WM_CLASS property (see section 14.1.8).
+If the res_name member in the
+.ZN XClassHint
+structure is set to the NULL pointer and the RESOURCE_NAME environment 
+variable is set, 
+then the value of the environment variable is substituted for res_name.
+If the res_name member is NULL, 
+the environment variable is not set, 
+and argv and argv[0] are set, 
+then the value of argv[0], stripped of
+any directory prefixes, is substituted for res_name.
+.LP
+The
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+convenience functions provide a simple programming interface 
+for setting those essential window properties that are used 
+for communicating with other clients
+(particularly window and session managers).
+.LP
+If the window_name argument is non-NULL,
+they set the WM_NAME property.
+If the icon_name argument is non-NULL,
+they set the WM_ICON_NAME property.
+The window_name and icon_name arguments are null-terminated strings, for
+.ZN XmbSetWMProperties
+in the encoding of the current locale, for
+.ZN Xutf8SetWMProperties
+in UTF-8 encoding.
+If the arguments can be fully converted to the STRING encoding,
+the properties are created with type ``STRING''; 
+otherwise, the arguments are converted to Compound Text, 
+and the properties are created with type ``COMPOUND_TEXT''.
+.LP
+If the normal_hints argument is non-NULL,
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+call
+.ZN XSetWMNormalHints ,
+which sets the WM_NORMAL_HINTS property (see section 14.1.7).
+If the wm_hints argument is non-NULL, 
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+call
+.ZN XSetWMHints ,
+which sets the WM_HINTS property (see section 14.1.6).
+.LP
+If the argv argument is non-NULL,
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+set the WM_COMMAND property from argv and argc.
+An argc of zero indicates a zero-length command.
+.LP
+The hostname of the machine is stored using 
+.ZN XSetWMClientMachine 
+(see section 14.2.2).
+.LP
+If the class_hints argument is non-NULL,
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+set the WM_CLASS property.
+If the res_name member in the 
+.ZN XClassHint
+structure is set to the NULL pointer and the RESOURCE_NAME
+environment variable is set,
+the value of the environment variable is substituted for res_name.
+If the res_name member is NULL,
+the environment variable is not set, and argv and argv[0] are set,
+then the value of argv[0], stripped of any directory prefixes,
+is substituted for res_name.
+.LP
+It is assumed that the supplied class_hints.res_name and argv,
+the RESOURCE_NAME environment variable, and the hostname of the machine
+are in the encoding of the current locale.
+The corresponding WM_CLASS, WM_COMMAND, and WM_CLIENT_MACHINE properties
+are typed according to the local host locale announcer.
+No encoding conversion is performed for these strings prior to storage
+in the properties.
+.LP
+For clients that need to process the property text in a locale,
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+set the WM_LOCALE_NAME property to be the name of the current locale.
+The name is assumed to be in the Host Portable Character Encoding
+and is converted to STRING for storage in the property.
+.LP
+.ZN XSetWMProperties ,
+.ZN XmbSetWMProperties
+and
+.ZN Xutf8SetWMProperties
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The function
+.ZN Xutf8SetWMProperties
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH PROPERTIES
+.TP 1i
+\s-1WM_CLASS\s+1
+Set by application programs to allow window and session
+managers to obtain the application's resources from the resource database.
+.TP 1i
+\s-1WM_CLIENT_MACHINE\s+1
+The string name of the machine on which the client application is running.
+.TP 1i
+\s-1WM_COMMAND\s+1
+The command and arguments, null-separated, used to invoke the
+application.
+.TP 1i
+\s-1WM_HINTS\s+1
+Additional hints set by the client for use by the window manager.
+The C type of this property is 
+.ZN XWMHints .
+.TP 1i
+\s-1WM_ICON_NAME\s+1
+The name to be used in an icon.
+.TP 1i
+\s-1WM_NAME\s+1
+The name of the application.
+.TP 1i
+\s-1WM_NORMAL_HINTS\s+1
+Size hints for a window in its normal state.
+The C type of this property is
+.ZN XSizeHints .
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XParseGeometry(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__),
+XTextListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XSetWMProtocols.man b/libX11/man/XSetWMProtocols.man
index 543003669..d43510745 100644
--- a/libX11/man/XSetWMProtocols.man
+++ b/libX11/man/XSetWMProtocols.man
@@ -1,236 +1,175 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSetWMProtocols __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSetWMProtocols, XGetWMProtocols \- set or read a window's WM_PROTOCOLS property

-.SH SYNTAX

-.HP

-Status XSetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom

-*\fIprotocols\fP\^, int \fIcount\fP\^); 

-.HP

-Status XGetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom

-**\fIprotocols_return\fP\^, int *\fIcount_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.ds Cn protocols in the list

-.IP \fIcount\fP 1i

-Specifies the number of \*(Cn.

-.ds Cn protocols in the list

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIprotocols\fP 1i

-Specifies the list of protocols.

-.IP \fIprotocols_return\fP 1i

-Returns the list of protocols.

-.SH DESCRIPTION

-The 

-.ZN XSetWMProtocols 

-function replaces the WM_PROTOCOLS property on the specified window 

-with the list of atoms specified by the protocols argument.

-If the property does not already exist,

-.ZN XSetWMProtocols

-sets the WM_PROTOCOLS property on the specified window

-to the list of atoms specified by the protocols argument.

-The property is stored with a type of ATOM and a format of 32.

-If it cannot intern the WM_PROTOCOLS atom, 

-.ZN XSetWMProtocols

-returns a zero status.

-Otherwise, it returns a nonzero status.

-.LP

-.ZN XSetWMProtocols

-can generate

-.ZN BadAlloc

-and

-.ZN BadWindow

-errors.

-.LP

-The 

-.ZN XGetWMProtocols 

-function returns the list of atoms stored in the WM_PROTOCOLS property 

-on the specified window.

-These atoms describe window manager protocols in which the owner 

-of this window is willing to participate.

-If the property exists, is of type ATOM, is of format 32, 

-and the atom WM_PROTOCOLS can be interned, 

-.ZN XGetWMProtocols

-sets the protocols_return argument to a list of atoms, 

-sets the count_return argument to the number of elements in the list, 

-and returns a nonzero status.

-Otherwise, it sets neither of the return arguments

-and returns a zero status.

-To release the list of atoms, use

-.ZN XFree .

-.LP

-.ZN XGetWMProtocols

-can generate a

-.ZN BadWindow

-error.

-.SH PROPERTIES

-.TP 1i

-\s-1WM_PROTOCOLS\s+1

-List of atoms that identify the communications protocols between the

-client and window manager in which the client is willing to participate.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSetWMProtocols __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSetWMProtocols, XGetWMProtocols \- set or read a window's WM_PROTOCOLS property
+.SH SYNTAX
+.HP
+Status XSetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+*\fIprotocols\fP\^, int \fIcount\fP\^); 
+.HP
+Status XGetWMProtocols\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, Atom
+**\fIprotocols_return\fP\^, int *\fIcount_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.ds Cn protocols in the list
+.IP \fIcount\fP 1i
+Specifies the number of \*(Cn.
+.ds Cn protocols in the list
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIprotocols\fP 1i
+Specifies the list of protocols.
+.IP \fIprotocols_return\fP 1i
+Returns the list of protocols.
+.SH DESCRIPTION
+The 
+.ZN XSetWMProtocols 
+function replaces the WM_PROTOCOLS property on the specified window 
+with the list of atoms specified by the protocols argument.
+If the property does not already exist,
+.ZN XSetWMProtocols
+sets the WM_PROTOCOLS property on the specified window
+to the list of atoms specified by the protocols argument.
+The property is stored with a type of ATOM and a format of 32.
+If it cannot intern the WM_PROTOCOLS atom, 
+.ZN XSetWMProtocols
+returns a zero status.
+Otherwise, it returns a nonzero status.
+.LP
+.ZN XSetWMProtocols
+can generate
+.ZN BadAlloc
+and
+.ZN BadWindow
+errors.
+.LP
+The 
+.ZN XGetWMProtocols 
+function returns the list of atoms stored in the WM_PROTOCOLS property 
+on the specified window.
+These atoms describe window manager protocols in which the owner 
+of this window is willing to participate.
+If the property exists, is of type ATOM, is of format 32, 
+and the atom WM_PROTOCOLS can be interned, 
+.ZN XGetWMProtocols
+sets the protocols_return argument to a list of atoms, 
+sets the count_return argument to the number of elements in the list, 
+and returns a nonzero status.
+Otherwise, it sets neither of the return arguments
+and returns a zero status.
+To release the list of atoms, use
+.ZN XFree .
+.LP
+.ZN XGetWMProtocols
+can generate a
+.ZN BadWindow
+error.
+.SH PROPERTIES
+.TP 1i
+\s-1WM_PROTOCOLS\s+1
+List of atoms that identify the communications protocols between the
+client and window manager in which the client is willing to participate.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XStoreBytes.man b/libX11/man/XStoreBytes.man
index f3a4ccfe5..c57d5b55e 100644
--- a/libX11/man/XStoreBytes.man
+++ b/libX11/man/XStoreBytes.man
@@ -1,253 +1,192 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XStoreBytes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XStoreBytes, XStoreBuffer, XFetchBytes, XFetchBuffer, XRotateBuffers \- manipulate cut and paste buffers

-.SH SYNTAX

-.HP

-int XStoreBytes\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int

-\^\fInbytes\fP\^); 

-.HP

-int XStoreBuffer\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int

-\^\fInbytes\fP\^, int \fIbuffer\fP\^); 

-.HP

-char *XFetchBytes\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^); 

-.HP

-char *XFetchBuffer\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^,

-int \fIbuffer\fP\^); 

-.HP

-int XRotateBuffers\^(\^Display *\fIdisplay\fP\^, int \fIrotate\fP\^); 

-.SH ARGUMENTS

-.ds Fn in which you want to store the bytes \

-or from which you want the stored data returned

-.IP \fIbuffer\fP 1i

-Specifies the buffer \*(Fn.

-.IP \fIbytes\fP 1i

-Specifies the bytes, which are not necessarily ASCII or null-terminated.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fInbytes\fP 1i

-Specifies the number of bytes to be stored.

-.IP \fInbytes_return\fP 1i

-Returns the number of bytes in the buffer.

-.IP \fIrotate\fP 1i

-Specifies how much to rotate the cut buffers.

-.SH DESCRIPTION

-The data can have embedded null characters

-and need not be null-terminated.

-The cut buffer's contents can be retrieved later by

-any client calling

-.ZN XFetchBytes .

-.LP

-.ZN XStoreBytes

-can generate a

-.ZN BadAlloc

-error.

-.LP

-If an invalid buffer is specified, the call has no effect.

-The data can have embedded null characters

-and need not be null-terminated.

-.LP

-.ZN XStoreBuffer

-can generate a

-.ZN BadAlloc

-error.

-.LP

-The

-.ZN XFetchBytes

-function

-returns the number of bytes in the nbytes_return argument,

-if the buffer contains data.

-Otherwise, the function

-returns NULL and sets nbytes to 0.

-The appropriate amount of storage is allocated and the pointer returned.

-The client must free this storage when finished with it by calling

-.ZN XFree .

-.LP

-The

-.ZN XFetchBuffer

-function returns zero to the nbytes_return argument 

-if there is no data in the buffer or if an invalid

-buffer is specified.

-.LP

-.ZN XFetchBuffer

-can generate a

-.ZN BadValue 

-error.

-.LP

-The

-.ZN XRotateBuffers

-function rotates the cut

-buffers, such that buffer 0 becomes buffer n, 

-buffer 1 becomes n + 1 mod 8, and so on.

-This cut buffer numbering is global to the display.

-Note that

-.ZN XRotateBuffers

-generates

-.ZN BadMatch

-errors if any of the eight buffers have not been created.

-.LP

-.ZN XRotateBuffers

-can generate a

-.ZN BadMatch

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAlloc

-The server failed to allocate the requested resource or server memory.

-.TP 1i

-.ZN BadAtom

-A value for an Atom argument does not name a defined Atom.

-.TP 1i

-.ZN BadMatch

-Some argument or pair of arguments has the correct type and range but fails

-to match in some other way required by the request.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XFree(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XStoreBytes __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XStoreBytes, XStoreBuffer, XFetchBytes, XFetchBuffer, XRotateBuffers \- manipulate cut and paste buffers
+.SH SYNTAX
+.HP
+int XStoreBytes\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+\^\fInbytes\fP\^); 
+.HP
+int XStoreBuffer\^(\^Display *\fIdisplay\fP\^, char *\fIbytes\fP\^, int
+\^\fInbytes\fP\^, int \fIbuffer\fP\^); 
+.HP
+char *XFetchBytes\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^); 
+.HP
+char *XFetchBuffer\^(\^Display *\fIdisplay\fP\^, int *\fInbytes_return\fP\^,
+int \fIbuffer\fP\^); 
+.HP
+int XRotateBuffers\^(\^Display *\fIdisplay\fP\^, int \fIrotate\fP\^); 
+.SH ARGUMENTS
+.ds Fn in which you want to store the bytes \
+or from which you want the stored data returned
+.IP \fIbuffer\fP 1i
+Specifies the buffer \*(Fn.
+.IP \fIbytes\fP 1i
+Specifies the bytes, which are not necessarily ASCII or null-terminated.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInbytes\fP 1i
+Specifies the number of bytes to be stored.
+.IP \fInbytes_return\fP 1i
+Returns the number of bytes in the buffer.
+.IP \fIrotate\fP 1i
+Specifies how much to rotate the cut buffers.
+.SH DESCRIPTION
+The data can have embedded null characters
+and need not be null-terminated.
+The cut buffer's contents can be retrieved later by
+any client calling
+.ZN XFetchBytes .
+.LP
+.ZN XStoreBytes
+can generate a
+.ZN BadAlloc
+error.
+.LP
+If an invalid buffer is specified, the call has no effect.
+The data can have embedded null characters
+and need not be null-terminated.
+.LP
+.ZN XStoreBuffer
+can generate a
+.ZN BadAlloc
+error.
+.LP
+The
+.ZN XFetchBytes
+function
+returns the number of bytes in the nbytes_return argument,
+if the buffer contains data.
+Otherwise, the function
+returns NULL and sets nbytes to 0.
+The appropriate amount of storage is allocated and the pointer returned.
+The client must free this storage when finished with it by calling
+.ZN XFree .
+.LP
+The
+.ZN XFetchBuffer
+function returns zero to the nbytes_return argument 
+if there is no data in the buffer or if an invalid
+buffer is specified.
+.LP
+.ZN XFetchBuffer
+can generate a
+.ZN BadValue 
+error.
+.LP
+The
+.ZN XRotateBuffers
+function rotates the cut
+buffers, such that buffer 0 becomes buffer n, 
+buffer 1 becomes n + 1 mod 8, and so on.
+This cut buffer numbering is global to the display.
+Note that
+.ZN XRotateBuffers
+generates
+.ZN BadMatch
+errors if any of the eight buffers have not been created.
+.LP
+.ZN XRotateBuffers
+can generate a
+.ZN BadMatch
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAlloc
+The server failed to allocate the requested resource or server memory.
+.TP 1i
+.ZN BadAtom
+A value for an Atom argument does not name a defined Atom.
+.TP 1i
+.ZN BadMatch
+Some argument or pair of arguments has the correct type and range but fails
+to match in some other way required by the request.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XFree(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XStoreColors.man b/libX11/man/XStoreColors.man
index cb2188cca..b487390b5 100644
--- a/libX11/man/XStoreColors.man
+++ b/libX11/man/XStoreColors.man
@@ -1,304 +1,243 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XStoreColors __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XStoreColors, XStoreColor, XStoreNamedColor \- set colors

-.SH SYNTAX

-.HP

-int XStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XColor \fIcolor\fP\^[\^]\^, int \fIncolors\fP\^); 

-.HP

-int XStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XColor *\fIcolor\fP\^); 

-.HP

-int XStoreNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-char *\^\fIcolor\fP\^, unsigned long \fIpixel\fP\^, int \fIflags\fP\^);

-.SH ARGUMENTS

-.ds Co pixel and RGB values or the color name string (for example, red)

-.IP \fIcolor\fP 1i

-Specifies the \*(Co.

-.IP \fIcolor\fP 1i

-Specifies an array of color definition structures to be stored.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIflags\fP 1i

-Specifies which red, green, and blue components are set.

-.IP \fIncolors\fP 1i

-.\"Specifies the number of color definition structures. 

-Specifies the number of 

-.ZN XColor

-structures in the color definition array.

-.IP \fIpixel\fP 1i

-Specifies the entry in the colormap. 

-.SH DESCRIPTION

-The

-.ZN XStoreColors

-function changes the colormap entries of the pixel values

-specified in the pixel members of the

-.ZN XColor

-structures.

-You specify which color components are to be changed by setting 

-.ZN DoRed ,

-.ZN DoGreen ,

-and/or

-.ZN DoBlue

-in the flags member of the

-.ZN XColor

-structures.

-If the colormap is an installed map for its screen, the

-changes are visible immediately.

-.ZN XStoreColors 

-changes the specified pixels if they are allocated writable in the colormap 

-by any client, even if one or more pixels generates an error.

-If a specified pixel is not a valid index into the colormap, a

-.ZN BadValue

-error results.

-If a specified pixel either is unallocated or is allocated read-only, a

-.ZN BadAccess

-error results.

-If more than one pixel is in error, 

-the one that gets reported is arbitrary.

-.LP

-.ZN XStoreColors

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-and

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XStoreColor

-function changes the colormap entry of the pixel value specified in the

-pixel member of the

-.ZN XColor

-structure.

-You specified this value in the

-pixel member of the

-.ZN XColor

-structure.

-This pixel value must be a read/write cell and a valid index into the colormap.

-If a specified pixel is not a valid index into the colormap,

-a

-.ZN BadValue

-error results.

-.ZN XStoreColor

-also changes the red, green, and/or blue color components.

-You specify which color components are to be changed by setting

-.ZN DoRed ,

-.ZN DoGreen ,

-and/or

-.ZN DoBlue

-in the flags member of the

-.ZN XColor

-structure.

-If the colormap is an installed map for its screen, 

-the changes are visible immediately.

-.LP

-.ZN XStoreColor

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-and 

-.ZN BadValue 

-errors.

-.LP

-The

-.ZN XStoreNamedColor

-function looks up the named color with respect to the screen associated with

-the colormap and stores the result in the specified colormap.

-The pixel argument determines the entry in the colormap.

-The flags argument determines which of the red, green, and blue components 

-are set. 

-You can set this member to the

-bitwise inclusive OR of the bits 

-.ZN DoRed , 

-.ZN DoGreen , 

-and 

-.ZN DoBlue .

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-If the specified pixel is not a valid index into the colormap, a

-.ZN BadValue

-error results.

-If the specified pixel either is unallocated or is allocated read-only, a

-.ZN BadAccess

-error results.

-.LP

-.ZN XStoreNamedColor

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-.ZN BadName ,

-and

-.ZN BadValue 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAccess

-A client attempted

-to free a color map entry that it did not already allocate.

-.TP 1i

-.ZN BadAccess

-A client attempted

-to store into a read-only color map entry.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadName

-A font or color of the specified name does not exist.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XAllocColor(__libmansuffix__),

-XCreateColormap(__libmansuffix__),

-XQueryColor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XStoreColors __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XStoreColors, XStoreColor, XStoreNamedColor \- set colors
+.SH SYNTAX
+.HP
+int XStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor \fIcolor\fP\^[\^]\^, int \fIncolors\fP\^); 
+.HP
+int XStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XColor *\fIcolor\fP\^); 
+.HP
+int XStoreNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+char *\^\fIcolor\fP\^, unsigned long \fIpixel\fP\^, int \fIflags\fP\^);
+.SH ARGUMENTS
+.ds Co pixel and RGB values or the color name string (for example, red)
+.IP \fIcolor\fP 1i
+Specifies the \*(Co.
+.IP \fIcolor\fP 1i
+Specifies an array of color definition structures to be stored.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIflags\fP 1i
+Specifies which red, green, and blue components are set.
+.IP \fIncolors\fP 1i
+.\"Specifies the number of color definition structures. 
+Specifies the number of 
+.ZN XColor
+structures in the color definition array.
+.IP \fIpixel\fP 1i
+Specifies the entry in the colormap. 
+.SH DESCRIPTION
+The
+.ZN XStoreColors
+function changes the colormap entries of the pixel values
+specified in the pixel members of the
+.ZN XColor
+structures.
+You specify which color components are to be changed by setting 
+.ZN DoRed ,
+.ZN DoGreen ,
+and/or
+.ZN DoBlue
+in the flags member of the
+.ZN XColor
+structures.
+If the colormap is an installed map for its screen, the
+changes are visible immediately.
+.ZN XStoreColors 
+changes the specified pixels if they are allocated writable in the colormap 
+by any client, even if one or more pixels generates an error.
+If a specified pixel is not a valid index into the colormap, a
+.ZN BadValue
+error results.
+If a specified pixel either is unallocated or is allocated read-only, a
+.ZN BadAccess
+error results.
+If more than one pixel is in error, 
+the one that gets reported is arbitrary.
+.LP
+.ZN XStoreColors
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+and
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XStoreColor
+function changes the colormap entry of the pixel value specified in the
+pixel member of the
+.ZN XColor
+structure.
+You specified this value in the
+pixel member of the
+.ZN XColor
+structure.
+This pixel value must be a read/write cell and a valid index into the colormap.
+If a specified pixel is not a valid index into the colormap,
+a
+.ZN BadValue
+error results.
+.ZN XStoreColor
+also changes the red, green, and/or blue color components.
+You specify which color components are to be changed by setting
+.ZN DoRed ,
+.ZN DoGreen ,
+and/or
+.ZN DoBlue
+in the flags member of the
+.ZN XColor
+structure.
+If the colormap is an installed map for its screen, 
+the changes are visible immediately.
+.LP
+.ZN XStoreColor
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+and 
+.ZN BadValue 
+errors.
+.LP
+The
+.ZN XStoreNamedColor
+function looks up the named color with respect to the screen associated with
+the colormap and stores the result in the specified colormap.
+The pixel argument determines the entry in the colormap.
+The flags argument determines which of the red, green, and blue components 
+are set. 
+You can set this member to the
+bitwise inclusive OR of the bits 
+.ZN DoRed , 
+.ZN DoGreen , 
+and 
+.ZN DoBlue .
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+If the specified pixel is not a valid index into the colormap, a
+.ZN BadValue
+error results.
+If the specified pixel either is unallocated or is allocated read-only, a
+.ZN BadAccess
+error results.
+.LP
+.ZN XStoreNamedColor
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+.ZN BadName ,
+and
+.ZN BadValue 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAccess
+A client attempted
+to free a color map entry that it did not already allocate.
+.TP 1i
+.ZN BadAccess
+A client attempted
+to store into a read-only color map entry.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadName
+A font or color of the specified name does not exist.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XAllocColor(__libmansuffix__),
+XCreateColormap(__libmansuffix__),
+XQueryColor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XStringListToTextProperty.man b/libX11/man/XStringListToTextProperty.man
index 7ed72626b..d990525f6 100644
--- a/libX11/man/XStringListToTextProperty.man
+++ b/libX11/man/XStringListToTextProperty.man
@@ -1,253 +1,190 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XStringListToTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XStringListToTextProperty, XTextPropertyToStringList, XFreeStringList, XTextProperty \- convert string lists and text property structure

-.SH SYNTAX

-.HP

-Status XStringListToTextProperty\^(\^char **\fIlist\fP\^, int \fIcount\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-Status XTextPropertyToStringList\^(\^XTextProperty *\fItext_prop\fP\^, char

-***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 

-.HP

-void XFreeStringList\^(\^char **\fIlist\fP\^); 

-.SH ARGUMENTS

-.ds Cn strings

-.IP \fIcount\fP 1i

-Specifies the number of \*(Cn.

-.ds Cn strings

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIlist\fP 1i

-Specifies the list of strings to be freed.

-.IP \fIlist\fP 1i

-Specifies a list of null-terminated character strings.

-.IP \fIlist_return\fP 1i

-Returns a list of null-terminated character strings.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.SH DESCRIPTION

-The 

-.ZN XStringListToTextProperty 

-function sets the specified 

-.ZN XTextProperty

-to be of type STRING (format 8) with a value representing the

-concatenation of the specified list of null-separated character strings.

-An extra null byte (which is not included in the nitems member) 

-is stored at the end of the value field of text_prop_return.

-The strings are assumed (without verification) to be in the STRING encoding.

-If insufficient memory is available for the new value string, 

-.ZN XStringListToTextProperty

-does not set any fields in the

-.ZN XTextProperty

-structure and returns a zero status.

-Otherwise, it returns a nonzero status.

-To free the storage for the value field, use 

-.ZN XFree .

-.LP

-The 

-.ZN XTextPropertyToStringList 

-function returns a list of strings representing the null-separated elements 

-of the specified

-.ZN XTextProperty

-structure.

-The data in text_prop must be of type STRING and format 8. 

-Multiple elements of the property 

-(for example, the strings in a disjoint text selection) 

-are separated by NULL (encoding 0).

-The contents of the property are not null-terminated.

-If insufficient memory is available for the list and its elements, 

-.ZN XTextPropertyToStringList

-sets no return values and returns a zero status.

-Otherwise, it returns a nonzero status.

-To free the storage for the list and its contents, use 

-.ZN XFreeStringList .

-.LP

-The 

-.ZN XFreeStringList 

-function releases memory allocated by 

-.ZN XmbTextPropertyToTextList ,

-.ZN Xutf8TextPropertyToTextList

-and

-.ZN XTextPropertyToStringList

-and the missing charset list allocated by 

-.ZN XCreateFontSet .

-.SH STRUCTURES

-The

-.ZN XTextProperty

-structure contains:

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	unsigned char *value;	/\&* property data */

-	Atom encoding;	/\&* type of property */

-	int format;	/\&* 8, 16, or 32 */

-	unsigned long nitems;	/\&* number of items in value */

-} XTextProperty;

-.De

-.SH "SEE ALSO"

-XAllocClassHint(__libmansuffix__),

-XAllocIconSize(__libmansuffix__),

-XAllocSizeHints(__libmansuffix__),

-XAllocWMHints(__libmansuffix__),

-XFree(__libmansuffix__),

-XSetCommand(__libmansuffix__),

-XSetTransientForHint(__libmansuffix__),

-XSetTextProperty(__libmansuffix__),

-XSetWMClientMachine(__libmansuffix__),

-XSetWMColormapWindows(__libmansuffix__),

-XSetWMIconName(__libmansuffix__),

-XSetWMName(__libmansuffix__),

-XSetWMProperties(__libmansuffix__),

-XSetWMProtocols(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XStringListToTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XStringListToTextProperty, XTextPropertyToStringList, XFreeStringList, XTextProperty \- convert string lists and text property structure
+.SH SYNTAX
+.HP
+Status XStringListToTextProperty\^(\^char **\fIlist\fP\^, int \fIcount\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+Status XTextPropertyToStringList\^(\^XTextProperty *\fItext_prop\fP\^, char
+***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+void XFreeStringList\^(\^char **\fIlist\fP\^); 
+.SH ARGUMENTS
+.ds Cn strings
+.IP \fIcount\fP 1i
+Specifies the number of \*(Cn.
+.ds Cn strings
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIlist\fP 1i
+Specifies the list of strings to be freed.
+.IP \fIlist\fP 1i
+Specifies a list of null-terminated character strings.
+.IP \fIlist_return\fP 1i
+Returns a list of null-terminated character strings.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.SH DESCRIPTION
+The 
+.ZN XStringListToTextProperty 
+function sets the specified 
+.ZN XTextProperty
+to be of type STRING (format 8) with a value representing the
+concatenation of the specified list of null-separated character strings.
+An extra null byte (which is not included in the nitems member) 
+is stored at the end of the value field of text_prop_return.
+The strings are assumed (without verification) to be in the STRING encoding.
+If insufficient memory is available for the new value string, 
+.ZN XStringListToTextProperty
+does not set any fields in the
+.ZN XTextProperty
+structure and returns a zero status.
+Otherwise, it returns a nonzero status.
+To free the storage for the value field, use 
+.ZN XFree .
+.LP
+The 
+.ZN XTextPropertyToStringList 
+function returns a list of strings representing the null-separated elements 
+of the specified
+.ZN XTextProperty
+structure.
+The data in text_prop must be of type STRING and format 8. 
+Multiple elements of the property 
+(for example, the strings in a disjoint text selection) 
+are separated by NULL (encoding 0).
+The contents of the property are not null-terminated.
+If insufficient memory is available for the list and its elements, 
+.ZN XTextPropertyToStringList
+sets no return values and returns a zero status.
+Otherwise, it returns a nonzero status.
+To free the storage for the list and its contents, use 
+.ZN XFreeStringList .
+.LP
+The 
+.ZN XFreeStringList 
+function releases memory allocated by 
+.ZN XmbTextPropertyToTextList ,
+.ZN Xutf8TextPropertyToTextList
+and
+.ZN XTextPropertyToStringList
+and the missing charset list allocated by 
+.ZN XCreateFontSet .
+.SH STRUCTURES
+The
+.ZN XTextProperty
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        unsigned char *value;   /\&* property data */
+        Atom encoding;  /\&* type of property */
+        int format;     /\&* 8, 16, or 32 */
+        unsigned long nitems;   /\&* number of items in value */
+} XTextProperty;
+.De
+.SH "SEE ALSO"
+XAllocClassHint(__libmansuffix__),
+XAllocIconSize(__libmansuffix__),
+XAllocSizeHints(__libmansuffix__),
+XAllocWMHints(__libmansuffix__),
+XFree(__libmansuffix__),
+XSetCommand(__libmansuffix__),
+XSetTransientForHint(__libmansuffix__),
+XSetTextProperty(__libmansuffix__),
+XSetWMClientMachine(__libmansuffix__),
+XSetWMColormapWindows(__libmansuffix__),
+XSetWMIconName(__libmansuffix__),
+XSetWMName(__libmansuffix__),
+XSetWMProperties(__libmansuffix__),
+XSetWMProtocols(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XStringToKeysym.man b/libX11/man/XStringToKeysym.man
index 515ca9198..3a7fb7b18 100644
--- a/libX11/man/XStringToKeysym.man
+++ b/libX11/man/XStringToKeysym.man
@@ -49,7 +49,7 @@
 .de Ds
 .nf
 .\\$1D \\$2 \\$1
-.ft 1
+.ft CW
 .\".ps \\n(PS
 .\".if \\n(VS>=40 .vs \\n(VSu
 .\".if \\n(VS<=39 .vs \\n(VSp
@@ -63,43 +63,8 @@
 .sp \\n(DDu
 .fi
 ..
-.de FD
-.LP
-.KS
-.TA .5i 3i
-.ta .5i 3i
-.nf
-..
-.de FN
-.fi
-.KE
-.LP
-..
 .de IN		\" send an index entry to the stderr
 ..
-.de C{
-.KS
-.nf
-.D
-.\"
-.\"	choose appropriate monospace font
-.\"	the imagen conditional, 480,
-.\"	may be changed to L if LB is too
-.\"	heavy for your eyes...
-.\"
-.ie "\\*(.T"480" .ft L
-.el .ie "\\*(.T"300" .ft L
-.el .ie "\\*(.T"202" .ft PO
-.el .ie "\\*(.T"aps" .ft CW
-.el .ft R
-.ps \\n(PS
-.ie \\n(VS>40 .vs \\n(VSu
-.el .vs \\n(VSp
-..
-.de C}
-.DE
-.R
-..
 .de Pn
 .ie t \\$1\fB\^\\$2\^\fR\\$3
 .el \\$1\fI\^\\$2\^\fP\\$3
@@ -112,32 +77,6 @@
 .ie t <\fB\\$1\fR>\\$2
 .el <\fI\\$1\fP>\\$2
 ..
-.de NT
-.ne 7
-.ds NO Note
-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
-.ie n .sp
-.el .sp 10p
-.TB
-.ce
-\\*(NO
-.ie n .sp
-.el .sp 5p
-.if '\\$1'C' .ce 99
-.if '\\$2'C' .ce 99
-.in +5n
-.ll -5n
-.R
-..
-.		\" Note End -- doug kraft 3/85
-.de NE
-.ce 0
-.in -5n
-.ll +5n
-.ie n .sp
-.el .sp 10p
-..
 .ny0
 .TH XStringToKeysym __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
diff --git a/libX11/man/XSupportsLocale.man b/libX11/man/XSupportsLocale.man
index ac0c743d2..f0e4853ed 100644
--- a/libX11/man/XSupportsLocale.man
+++ b/libX11/man/XSupportsLocale.man
@@ -1,227 +1,166 @@
-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSupportsLocale __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSupportsLocale, XSetLocaleModifiers \- determine locale support and configure locale modifiers

-.SH SYNTAX

-.HP

-Bool XSupportsLocale\^(void); 

-.HP

-char *XSetLocaleModifiers\^(\^char *\fImodifier_list\fP\^); 

-.SH ARGUMENTS

-.IP \fImodifier_list\fP 1i

-Specifies the modifiers.

-.SH DESCRIPTION

-The 

-.ZN XSupportsLocale

-function returns 

-.ZN True

-if Xlib functions are capable of operating under the current locale.

-If it returns 

-.ZN False ,

-Xlib locale-dependent functions for which the 

-.ZN XLocaleNotSupported 

-return status is defined will return 

-.ZN XLocaleNotSupported .

-Other Xlib locale-dependent routines will operate in the ``C'' locale.

-.LP

-The

-.ZN XSetLocaleModifiers

-function sets the X modifiers for the current locale setting.

-The modifier_list argument is a null-terminated string of the form

-``{@\^\fIcategory\fP\^=\^\fIvalue\fP\^}'', that is,

-having zero or more concatenated ``@\^\fIcategory\fP\^=\^\fIvalue\fP\^''

-entries, where \fIcategory\fP is a category name 

-and \fIvalue\fP is the (possibly empty) setting for that category.

-The values are encoded in the current locale.

-Category names are restricted to the POSIX Portable Filename Character Set.

-.LP

-The local host X locale modifiers announcer (on POSIX-compliant systems,

-the XMODIFIERS environment variable) is appended to the modifier_list to

-provide default values on the local host.

-If a given category appears more than once in the list,

-the first setting in the list is used.

-If a given category is not included in the full modifier list,

-the category is set to an implementation-dependent default

-for the current locale.

-An empty value for a category explicitly specifies the

-implementation-dependent default.

-.LP

-If the function is successful, it returns a pointer to a string.

-The contents of the string are such that a subsequent call with that string

-(in the same locale) will restore the modifiers to the same settings.

-If modifier_list is a NULL pointer,

-.ZN XSetLocaleModifiers

-also returns a pointer to such a string,

-and the current locale modifiers are not changed.

-.LP

-If invalid values are given for one or more modifier categories supported by

-the locale, a NULL pointer is returned, and none of the

-current modifiers are changed.

-.LP

-At program startup,

-the modifiers that are in effect are unspecified until

-the first successful call to set them.  Whenever the locale is changed, the

-modifiers that are in effect become unspecified until the next successful call

-to set them.

-Clients should always call

-.ZN XSetLocaleModifiers

-with a non-NULL modifier_list after setting the locale

-before they call any locale-dependent Xlib routine.

-.LP

-The only standard modifier category currently defined is ``im'',

-which identifies the desired input method.

-The values for input method are not standardized.

-A single locale may use multiple input methods,

-switching input method under user control.

-The modifier may specify the initial input method in effect

-or an ordered list of input methods.

-Multiple input methods may be specified in a single im value string

-in an implementation-dependent manner.

-.LP

-The returned modifiers string is owned by Xlib and should not be modified or

-freed by the client.

-It may be freed by Xlib after the current locale or modifiers are changed.

-Until freed, it will not be modified by Xlib.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSupportsLocale __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSupportsLocale, XSetLocaleModifiers \- determine locale support and configure locale modifiers
+.SH SYNTAX
+.HP
+Bool XSupportsLocale\^(void); 
+.HP
+char *XSetLocaleModifiers\^(\^char *\fImodifier_list\fP\^); 
+.SH ARGUMENTS
+.IP \fImodifier_list\fP 1i
+Specifies the modifiers.
+.SH DESCRIPTION
+The 
+.ZN XSupportsLocale
+function returns 
+.ZN True
+if Xlib functions are capable of operating under the current locale.
+If it returns 
+.ZN False ,
+Xlib locale-dependent functions for which the 
+.ZN XLocaleNotSupported 
+return status is defined will return 
+.ZN XLocaleNotSupported .
+Other Xlib locale-dependent routines will operate in the ``C'' locale.
+.LP
+The
+.ZN XSetLocaleModifiers
+function sets the X modifiers for the current locale setting.
+The modifier_list argument is a null-terminated string of the form
+``{@\^\fIcategory\fP\^=\^\fIvalue\fP\^}'', that is,
+having zero or more concatenated ``@\^\fIcategory\fP\^=\^\fIvalue\fP\^''
+entries, where \fIcategory\fP is a category name 
+and \fIvalue\fP is the (possibly empty) setting for that category.
+The values are encoded in the current locale.
+Category names are restricted to the POSIX Portable Filename Character Set.
+.LP
+The local host X locale modifiers announcer (on POSIX-compliant systems,
+the XMODIFIERS environment variable) is appended to the modifier_list to
+provide default values on the local host.
+If a given category appears more than once in the list,
+the first setting in the list is used.
+If a given category is not included in the full modifier list,
+the category is set to an implementation-dependent default
+for the current locale.
+An empty value for a category explicitly specifies the
+implementation-dependent default.
+.LP
+If the function is successful, it returns a pointer to a string.
+The contents of the string are such that a subsequent call with that string
+(in the same locale) will restore the modifiers to the same settings.
+If modifier_list is a NULL pointer,
+.ZN XSetLocaleModifiers
+also returns a pointer to such a string,
+and the current locale modifiers are not changed.
+.LP
+If invalid values are given for one or more modifier categories supported by
+the locale, a NULL pointer is returned, and none of the
+current modifiers are changed.
+.LP
+At program startup,
+the modifiers that are in effect are unspecified until
+the first successful call to set them.  Whenever the locale is changed, the
+modifiers that are in effect become unspecified until the next successful call
+to set them.
+Clients should always call
+.ZN XSetLocaleModifiers
+with a non-NULL modifier_list after setting the locale
+before they call any locale-dependent Xlib routine.
+.LP
+The only standard modifier category currently defined is ``im'',
+which identifies the desired input method.
+The values for input method are not standardized.
+A single locale may use multiple input methods,
+switching input method under user control.
+The modifier may specify the initial input method in effect
+or an ordered list of input methods.
+Multiple input methods may be specified in a single im value string
+in an implementation-dependent manner.
+.LP
+The returned modifiers string is owned by Xlib and should not be modified or
+freed by the client.
+It may be freed by Xlib after the current locale or modifiers are changed.
+Until freed, it will not be modified by Xlib.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XSynchronize.man b/libX11/man/XSynchronize.man
index babe156d9..f99facc55 100644
--- a/libX11/man/XSynchronize.man
+++ b/libX11/man/XSynchronize.man
@@ -1,179 +1,118 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XSynchronize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XSynchronize, XSetAfterFunction \- enable or disable synchronization 

-.SH SYNTAX

-.HP

-int (*XSynchronize\^(\^Display *\fIdisplay\fP\^, Bool \fIonoff\fP\^))(); 

-.HP

-int (*XSetAfterFunction\^(\^Display *\fIdisplay\fP\^, int

-(\^*\^\fIprocedure\fP\^)\^()))(); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIprocedure\fP 1i

-Specifies the procedure to be called.

-.IP \fIonoff\fP 1i

-Specifies a Boolean value that indicates whether to enable 

-or disable synchronization.

-.SH DESCRIPTION

-The

-.ZN XSynchronize

-function returns 

-the previous after function.

-If onoff is 

-.ZN True , 

-.ZN XSynchronize

-turns on synchronous behavior.

-If onoff is

-.ZN False ,

-.ZN XSynchronize 

-turns off synchronous behavior.

-.LP

-The specified procedure is called with only a display pointer.

-.ZN XSetAfterFunction

-returns the previous after function.

-.SH "SEE ALSO"

-XSetErrorHandler(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XSynchronize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XSynchronize, XSetAfterFunction \- enable or disable synchronization 
+.SH SYNTAX
+.HP
+int (*XSynchronize\^(\^Display *\fIdisplay\fP\^, Bool \fIonoff\fP\^))(); 
+.HP
+int (*XSetAfterFunction\^(\^Display *\fIdisplay\fP\^, int
+(\^*\^\fIprocedure\fP\^)\^()))(); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIprocedure\fP 1i
+Specifies the procedure to be called.
+.IP \fIonoff\fP 1i
+Specifies a Boolean value that indicates whether to enable 
+or disable synchronization.
+.SH DESCRIPTION
+The
+.ZN XSynchronize
+function returns 
+the previous after function.
+If onoff is 
+.ZN True , 
+.ZN XSynchronize
+turns on synchronous behavior.
+If onoff is
+.ZN False ,
+.ZN XSynchronize 
+turns off synchronous behavior.
+.LP
+The specified procedure is called with only a display pointer.
+.ZN XSetAfterFunction
+returns the previous after function.
+.SH "SEE ALSO"
+XSetErrorHandler(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XTextExtents.man b/libX11/man/XTextExtents.man
index d366d5a28..cd8f37a92 100644
--- a/libX11/man/XTextExtents.man
+++ b/libX11/man/XTextExtents.man
@@ -1,290 +1,229 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XTextExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XTextExtents, XTextExtents16, XQueryTextExtents, XQueryTextExtents16 \- compute or query text extents

-.SH SYNTAX

-.HP

-int XTextExtents\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,

-int \fInchars\fP\^, int *\fIdirection_return\fP\^, int

-*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct

-*\fIoverall_return\fP\^); 

-.HP

-int XTextExtents16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b

-*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int

-*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct

-*\fIoverall_return\fP\^); 

-.HP

-int XQueryTextExtents\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^, char

-*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int

-*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct

-*\fIoverall_return\fP\^);

-.HP

-int XQueryTextExtents16\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^,

-XChar2b *\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^,

-int *\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct

-*\fIoverall_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIdirection_return\fP 1i

-Returns the value of the direction hint

-.Pn ( FontLeftToRight

-or

-.ZN FontRightToLeft ).

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfont_ID\fP 1i

-Specifies either the font ID or the 

-.ZN GContext

-ID that contains the font.

-.IP \fIfont_ascent_return\fP 1i

-Returns the font ascent.

-.IP \fIfont_descent_return\fP 1i

-Returns the font descent.

-.IP \fIfont_struct\fP 1i

-Specifies the 

-.ZN XFontStruct 

-structure.

-.IP \fInchars\fP 1i

-Specifies the number of characters in the character string.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.IP \fIoverall_return\fP 1i

-Returns the overall size in the specified

-.ZN XCharStruct 

-structure.

-.SH DESCRIPTION

-The

-.ZN XTextExtents

-and

-.ZN XTextExtents16

-functions 

-perform the size computation locally and, thereby,

-avoid the round-trip overhead of

-.ZN XQueryTextExtents 

-and

-.ZN XQueryTextExtents16 .

-Both functions return an

-.ZN XCharStruct

-structure, whose members are set to the values as follows.

-.LP

-The ascent member is set to the maximum of the ascent metrics of all

-characters in the string.

-The descent member is set to the maximum of the descent metrics.

-The width member is set to the sum of the character-width metrics of all

-characters in the string.

-For each character in the string,

-let W be the sum of the character-width metrics of all characters preceding 

-it in the string.

-Let L be the left-side-bearing metric of the character plus W.

-Let R be the right-side-bearing metric of the character plus W.

-The lbearing member is set to the minimum L of all characters in the string.

-The rbearing member is set to the maximum R.

-.LP

-For fonts defined with linear indexing rather than 2-byte matrix indexing,

-each 

-.ZN XChar2b 

-structure is interpreted as a 16-bit number with byte1 as the 

-most significant byte.

-If the font has no defined default character,

-undefined characters in the string are taken to have all zero metrics.

-.LP

-The

-.ZN XQueryTextExtents

-and

-.ZN XQueryTextExtents16

-functions return the bounding box of the specified 8-bit and 16-bit

-character string in the specified font or the font contained in the

-specified GC.

-These functions query the X server and, therefore, suffer the round-trip

-overhead that is avoided by

-.ZN XTextExtents

-and 

-.ZN XTextExtents16 .

-Both functions return a

-.ZN XCharStruct 

-structure, whose members are set to the values as follows.

-.LP

-The ascent member is set to the maximum of the ascent metrics 

-of all characters in the string.

-The descent member is set to the maximum of the descent metrics.

-The width member is set to the sum of the character-width metrics 

-of all characters in the string.

-For each character in the string,

-let W be the sum of the character-width metrics of all characters preceding

-it in the string.

-Let L be the left-side-bearing metric of the character plus W.

-Let R be the right-side-bearing metric of the character plus W.

-The lbearing member is set to the minimum L of all characters in the string.

-The rbearing member is set to the maximum R.

-.LP

-For fonts defined with linear indexing rather than 2-byte matrix indexing,

-each 

-.ZN XChar2b 

-structure is interpreted as a 16-bit number with byte1 as the 

-most significant byte.

-If the font has no defined default character,

-undefined characters in the string are taken to have all zero metrics.

-.LP

-Characters with all zero metrics are ignored.

-If the font has no defined default_char,

-the undefined characters in the string are also ignored.

-.LP

-.ZN XQueryTextExtents

-and

-.ZN XQueryTextExtents16

-can generate

-.ZN BadFont

-and

-.ZN BadGC 

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadFont

-A value for a Font or GContext argument does not name a defined Font.

-.TP 1i

-.ZN BadGC

-A value for a GContext argument does not name a defined GContext.

-.SH "SEE ALSO"

-XLoadFont(__libmansuffix__),

-XTextWidth(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XTextExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XTextExtents, XTextExtents16, XQueryTextExtents, XQueryTextExtents16 \- compute or query text extents
+.SH SYNTAX
+.HP
+int XTextExtents\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
+.HP
+int XTextExtents16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b
+*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
+.HP
+int XQueryTextExtents\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^, char
+*\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^, int
+*\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^);
+.HP
+int XQueryTextExtents16\^(\^Display *\fIdisplay\fP\^, XID \fIfont_ID\fP\^,
+XChar2b *\fIstring\fP\^, int \fInchars\fP\^, int *\fIdirection_return\fP\^,
+int *\fIfont_ascent_return\fP, int *\fIfont_descent_return\fP\^, XCharStruct
+*\fIoverall_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIdirection_return\fP 1i
+Returns the value of the direction hint
+.Pn ( FontLeftToRight
+or
+.ZN FontRightToLeft ).
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfont_ID\fP 1i
+Specifies either the font ID or the 
+.ZN GContext
+ID that contains the font.
+.IP \fIfont_ascent_return\fP 1i
+Returns the font ascent.
+.IP \fIfont_descent_return\fP 1i
+Returns the font descent.
+.IP \fIfont_struct\fP 1i
+Specifies the 
+.ZN XFontStruct 
+structure.
+.IP \fInchars\fP 1i
+Specifies the number of characters in the character string.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.IP \fIoverall_return\fP 1i
+Returns the overall size in the specified
+.ZN XCharStruct 
+structure.
+.SH DESCRIPTION
+The
+.ZN XTextExtents
+and
+.ZN XTextExtents16
+functions 
+perform the size computation locally and, thereby,
+avoid the round-trip overhead of
+.ZN XQueryTextExtents 
+and
+.ZN XQueryTextExtents16 .
+Both functions return an
+.ZN XCharStruct
+structure, whose members are set to the values as follows.
+.LP
+The ascent member is set to the maximum of the ascent metrics of all
+characters in the string.
+The descent member is set to the maximum of the descent metrics.
+The width member is set to the sum of the character-width metrics of all
+characters in the string.
+For each character in the string,
+let W be the sum of the character-width metrics of all characters preceding 
+it in the string.
+Let L be the left-side-bearing metric of the character plus W.
+Let R be the right-side-bearing metric of the character plus W.
+The lbearing member is set to the minimum L of all characters in the string.
+The rbearing member is set to the maximum R.
+.LP
+For fonts defined with linear indexing rather than 2-byte matrix indexing,
+each 
+.ZN XChar2b 
+structure is interpreted as a 16-bit number with byte1 as the 
+most significant byte.
+If the font has no defined default character,
+undefined characters in the string are taken to have all zero metrics.
+.LP
+The
+.ZN XQueryTextExtents
+and
+.ZN XQueryTextExtents16
+functions return the bounding box of the specified 8-bit and 16-bit
+character string in the specified font or the font contained in the
+specified GC.
+These functions query the X server and, therefore, suffer the round-trip
+overhead that is avoided by
+.ZN XTextExtents
+and 
+.ZN XTextExtents16 .
+Both functions return a
+.ZN XCharStruct 
+structure, whose members are set to the values as follows.
+.LP
+The ascent member is set to the maximum of the ascent metrics 
+of all characters in the string.
+The descent member is set to the maximum of the descent metrics.
+The width member is set to the sum of the character-width metrics 
+of all characters in the string.
+For each character in the string,
+let W be the sum of the character-width metrics of all characters preceding
+it in the string.
+Let L be the left-side-bearing metric of the character plus W.
+Let R be the right-side-bearing metric of the character plus W.
+The lbearing member is set to the minimum L of all characters in the string.
+The rbearing member is set to the maximum R.
+.LP
+For fonts defined with linear indexing rather than 2-byte matrix indexing,
+each 
+.ZN XChar2b 
+structure is interpreted as a 16-bit number with byte1 as the 
+most significant byte.
+If the font has no defined default character,
+undefined characters in the string are taken to have all zero metrics.
+.LP
+Characters with all zero metrics are ignored.
+If the font has no defined default_char,
+the undefined characters in the string are also ignored.
+.LP
+.ZN XQueryTextExtents
+and
+.ZN XQueryTextExtents16
+can generate
+.ZN BadFont
+and
+.ZN BadGC 
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadFont
+A value for a Font or GContext argument does not name a defined Font.
+.TP 1i
+.ZN BadGC
+A value for a GContext argument does not name a defined GContext.
+.SH "SEE ALSO"
+XLoadFont(__libmansuffix__),
+XTextWidth(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XTextWidth.man b/libX11/man/XTextWidth.man
index 9ed0ef2ad..b236de9c7 100644
--- a/libX11/man/XTextWidth.man
+++ b/libX11/man/XTextWidth.man
@@ -1,169 +1,108 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XTextWidth __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XTextWidth, XTextWidth16 \- compute text width

-.SH SYNTAX

-.HP

-int XTextWidth\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,

-int \fIcount\fP\^); 

-.HP

-int XTextWidth16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b

-*\fIstring\fP\^, int \fIcount\fP\^); 

-.SH ARGUMENTS

-.IP \fIcount\fP 1i

-Specifies the character count in the specified string.

-.IP \fIfont_struct\fP 1i

-Specifies the font used for the width computation.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.SH DESCRIPTION

-The

-.ZN XTextWidth

-and

-.ZN XTextWidth16

-functions return the width of the specified 8-bit or 2-byte character strings.

-.SH "SEE ALSO"

-XLoadFont(__libmansuffix__),

-XTextExtents(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XTextWidth __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XTextWidth, XTextWidth16 \- compute text width
+.SH SYNTAX
+.HP
+int XTextWidth\^(\^XFontStruct *\fIfont_struct\fP\^, char *\fIstring\fP\^,
+int \fIcount\fP\^); 
+.HP
+int XTextWidth16\^(\^XFontStruct *\fIfont_struct\fP\^, XChar2b
+*\fIstring\fP\^, int \fIcount\fP\^); 
+.SH ARGUMENTS
+.IP \fIcount\fP 1i
+Specifies the character count in the specified string.
+.IP \fIfont_struct\fP 1i
+Specifies the font used for the width computation.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.SH DESCRIPTION
+The
+.ZN XTextWidth
+and
+.ZN XTextWidth16
+functions return the width of the specified 8-bit or 2-byte character strings.
+.SH "SEE ALSO"
+XLoadFont(__libmansuffix__),
+XTextExtents(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XTranslateCoordinates.man b/libX11/man/XTranslateCoordinates.man
index eb964dd4a..cddd18049 100644
--- a/libX11/man/XTranslateCoordinates.man
+++ b/libX11/man/XTranslateCoordinates.man
@@ -1,200 +1,139 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XTranslateCoordinates __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XTranslateCoordinates \- translate window coordinates

-.SH SYNTAX

-.HP

-Bool XTranslateCoordinates\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^,

-\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int

-*\fIdest_x_return\fP\^, int *\fIdest_y_return\fP\^, Window

-*\fIchild_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIchild_return\fP 1i

-Returns the child if the coordinates are contained in a mapped child of the

-destination window.

-.IP \fIdest_w\fP 1i

-Specifies the destination window.

-.IP \fIdest_x_return\fP 1i

-.br

-.ns

-.IP \fIdest_y_return\fP 1i

-Return the x and y coordinates within the destination window.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIsrc_w\fP 1i

-Specifies the source window.

-.IP \fIsrc_x\fP 1i

-.br

-.ns

-.IP \fIsrc_y\fP 1i

-Specify the x and y coordinates within the source window.

-.SH DESCRIPTION

-If

-.ZN XTranslateCoordinates

-returns

-.ZN True ,

-it takes the src_x and src_y coordinates relative

-to the source window's origin and returns these coordinates to 

-dest_x_return and dest_y_return

-relative to the destination window's origin.

-If

-.ZN XTranslateCoordinates

-returns 

-.ZN False , 

-src_w and dest_w are on different screens,

-and dest_x_return and dest_y_return are zero.

-If the coordinates are contained in a mapped child of dest_w,

-that child is returned to child_return.

-Otherwise, child_return is set to

-.ZN None .

-.LP

-.ZN XTranslateCoordinates

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XTranslateCoordinates __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XTranslateCoordinates \- translate window coordinates
+.SH SYNTAX
+.HP
+Bool XTranslateCoordinates\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^,
+\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, int
+*\fIdest_x_return\fP\^, int *\fIdest_y_return\fP\^, Window
+*\fIchild_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIchild_return\fP 1i
+Returns the child if the coordinates are contained in a mapped child of the
+destination window.
+.IP \fIdest_w\fP 1i
+Specifies the destination window.
+.IP \fIdest_x_return\fP 1i
+.br
+.ns
+.IP \fIdest_y_return\fP 1i
+Return the x and y coordinates within the destination window.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIsrc_w\fP 1i
+Specifies the source window.
+.IP \fIsrc_x\fP 1i
+.br
+.ns
+.IP \fIsrc_y\fP 1i
+Specify the x and y coordinates within the source window.
+.SH DESCRIPTION
+If
+.ZN XTranslateCoordinates
+returns
+.ZN True ,
+it takes the src_x and src_y coordinates relative
+to the source window's origin and returns these coordinates to 
+dest_x_return and dest_y_return
+relative to the destination window's origin.
+If
+.ZN XTranslateCoordinates
+returns 
+.ZN False , 
+src_w and dest_w are on different screens,
+and dest_x_return and dest_y_return are zero.
+If the coordinates are contained in a mapped child of dest_w,
+that child is returned to child_return.
+Otherwise, child_return is set to
+.ZN None .
+.LP
+.ZN XTranslateCoordinates
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XUnmapEvent.man b/libX11/man/XUnmapEvent.man
index 657bd23ab..c47bc1311 100644
--- a/libX11/man/XUnmapEvent.man
+++ b/libX11/man/XUnmapEvent.man
@@ -1,226 +1,163 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XUnmapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XUnmapEvent \- UnmapNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN UnmapNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* UnmapNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window event;

-	Window window;

-	Bool from_configure;

-} XUnmapEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The event member is set either to the unmapped window or to its parent,

-depending on whether

-.ZN StructureNotify

-or

-.ZN SubstructureNotify

-was selected.

-This is the window used by the X server to report the event.

-The window member is set to the window that was unmapped.

-The from_configure member is set to

-.ZN True 

-if the event was generated as a result of a resizing of the window's parent when

-the window itself had a win_gravity of

-.ZN UnmapGravity .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XVisibilityEvent(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XUnmapEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XUnmapEvent \- UnmapNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN UnmapNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* UnmapNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window event;
+        Window window;
+        Bool from_configure;
+} XUnmapEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The event member is set either to the unmapped window or to its parent,
+depending on whether
+.ZN StructureNotify
+or
+.ZN SubstructureNotify
+was selected.
+This is the window used by the X server to report the event.
+The window member is set to the window that was unmapped.
+The from_configure member is set to
+.ZN True 
+if the event was generated as a result of a resizing of the window's parent when
+the window itself had a win_gravity of
+.ZN UnmapGravity .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XVisibilityEvent(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XUnmapWindow.man b/libX11/man/XUnmapWindow.man
index 9b0f4672e..87fca8886 100644
--- a/libX11/man/XUnmapWindow.man
+++ b/libX11/man/XUnmapWindow.man
@@ -1,210 +1,149 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XUnmapWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XUnmapWindow, XUnmapSubwindows \- unmap windows

-.SH SYNTAX

-.HP

-int XUnmapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.HP

-int XUnmapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIw\fP 1i

-Specifies the window.

-.SH DESCRIPTION

-The

-.ZN XUnmapWindow

-function unmaps the specified window and causes the X server to generate an

-.ZN UnmapNotify

-.IN "UnmapNotify Event"

-.IN "XUnmapWindow"

-event.

-If the specified window is already unmapped, 

-.ZN XUnmapWindow 

-has no effect.

-Normal exposure processing on formerly obscured windows is performed.

-Any child window will no longer be visible until another map call is

-made on the parent.

-In other words, the subwindows are still mapped but are not visible

-until the parent is mapped.

-Unmapping a window will generate 

-.ZN Expose 

-events on windows that were formerly obscured by it.

-.LP

-.ZN XUnmapWindow

-can generate a

-.ZN BadWindow 

-error.

-.LP

-The

-.ZN XUnmapSubwindows

-function unmaps all subwindows for the specified window in bottom-to-top

-stacking order.

-It causes the X server to generate an

-.ZN UnmapNotify

-event on each subwindow and 

-.ZN Expose 

-events on formerly obscured windows.

-.IN "UnmapNotify Event"

-Using this function is much more efficient than unmapping multiple windows

-one at a time because the server needs to perform much of the work

-only once, for all of the windows, rather than for each window.

-.LP

-.ZN XUnmapSubwindows

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XChangeWindowAttributes(__libmansuffix__),

-XConfigureWindow(__libmansuffix__),

-XCreateWindow(__libmansuffix__),

-XDestroyWindow(__libmansuffix__),

-XMapWindow(__libmansuffix__)

-XRaiseWindow(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XUnmapWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XUnmapWindow, XUnmapSubwindows \- unmap windows
+.SH SYNTAX
+.HP
+int XUnmapWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.HP
+int XUnmapSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIw\fP 1i
+Specifies the window.
+.SH DESCRIPTION
+The
+.ZN XUnmapWindow
+function unmaps the specified window and causes the X server to generate an
+.ZN UnmapNotify
+.IN "UnmapNotify Event"
+.IN "XUnmapWindow"
+event.
+If the specified window is already unmapped, 
+.ZN XUnmapWindow 
+has no effect.
+Normal exposure processing on formerly obscured windows is performed.
+Any child window will no longer be visible until another map call is
+made on the parent.
+In other words, the subwindows are still mapped but are not visible
+until the parent is mapped.
+Unmapping a window will generate 
+.ZN Expose 
+events on windows that were formerly obscured by it.
+.LP
+.ZN XUnmapWindow
+can generate a
+.ZN BadWindow 
+error.
+.LP
+The
+.ZN XUnmapSubwindows
+function unmaps all subwindows for the specified window in bottom-to-top
+stacking order.
+It causes the X server to generate an
+.ZN UnmapNotify
+event on each subwindow and 
+.ZN Expose 
+events on formerly obscured windows.
+.IN "UnmapNotify Event"
+Using this function is much more efficient than unmapping multiple windows
+one at a time because the server needs to perform much of the work
+only once, for all of the windows, rather than for each window.
+.LP
+.ZN XUnmapSubwindows
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__)
+XRaiseWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XVaCreateNestedList.man b/libX11/man/XVaCreateNestedList.man
index 4bf068ec9..39ed727e3 100644
--- a/libX11/man/XVaCreateNestedList.man
+++ b/libX11/man/XVaCreateNestedList.man
@@ -1,169 +1,108 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XVaCreateNestedList __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XVaCreateNestedList \- allocate a nested variable argument list

-.SH SYNTAX

-typedef void * XVaNestedList;

-.HP

-XVaNestedList XVaCreateNestedList\^(\^int \fIdummy\fP\^, ...\^); 

-.SH ARGUMENTS

-.IP \fIdummy\fP 1i

-Specifies an unused argument (required by ANSI C).

-.ds Al

-.IP ... 1i

-Specifies the variable length argument list\*(Al.

-.SH DESCRIPTION

-The

-.ZN XVaCreateNestedList

-function allocates memory and copies its arguments into

-a single list pointer,

-which may be used as a value for arguments requiring a list value.

-Any entries are copied as specified.

-Data passed by reference is not copied;

-the caller must ensure data remains valid for the lifetime

-of the nested list.

-The list should be freed using

-.ZN XFree

-when it is no longer needed.

-.SH "SEE ALSO"

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XVaCreateNestedList __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XVaCreateNestedList \- allocate a nested variable argument list
+.SH SYNTAX
+typedef void * XVaNestedList;
+.HP
+XVaNestedList XVaCreateNestedList\^(\^int \fIdummy\fP\^, ...\^); 
+.SH ARGUMENTS
+.IP \fIdummy\fP 1i
+Specifies an unused argument (required by ANSI C).
+.ds Al
+.IP ... 1i
+Specifies the variable length argument list\*(Al.
+.SH DESCRIPTION
+The
+.ZN XVaCreateNestedList
+function allocates memory and copies its arguments into
+a single list pointer,
+which may be used as a value for arguments requiring a list value.
+Any entries are copied as specified.
+Data passed by reference is not copied;
+the caller must ensure data remains valid for the lifetime
+of the nested list.
+The list should be freed using
+.ZN XFree
+when it is no longer needed.
+.SH "SEE ALSO"
+\fI\*(xL\fP
diff --git a/libX11/man/XVisibilityEvent.man b/libX11/man/XVisibilityEvent.man
index c82835807..b406cde95 100644
--- a/libX11/man/XVisibilityEvent.man
+++ b/libX11/man/XVisibilityEvent.man
@@ -1,244 +1,181 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XVisibilityEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XVisibilityEvent \- VisibilityNotify event structure

-.SH STRUCTURES

-The structure for

-.ZN VisibilityNotify

-events contains:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	int type;	/\&* VisibilityNotify */

-	unsigned long serial;	/\&* # of last request processed by server */

-	Bool send_event;	/\&* true if this came from a SendEvent request */

-	Display *display;	/\&* Display the event was read from */

-	Window window;

-	int state;

-} XVisibilityEvent;

-.De

-.LP

-When you receive this event,

-the structure members are set as follows.

-.LP

-The type member is set to the event type constant name that uniquely identifies

-it.

-For example, when the X server reports a

-.ZN GraphicsExpose

-event to a client application, it sends an

-.ZN XGraphicsExposeEvent

-structure with the type member set to

-.ZN GraphicsExpose .

-The display member is set to a pointer to the display the event was read on.

-The send_event member is set to

-.ZN True

-if the event came from a

-.ZN SendEvent

-protocol request.

-The serial member is set from the serial number reported in the protocol

-but expanded from the 16-bit least-significant bits to a full 32-bit value.

-The window member is set to the window that is most useful to toolkit

-dispatchers.

-.LP

-The window member is set to the window whose visibility state changes.

-The state member is set to the state of the window's visibility and can be

-.ZN VisibilityUnobscured ,

-.ZN VisibilityPartiallyObscured ,

-or

-.ZN VisibilityFullyObscured .

-The X server ignores all of a window's subwindows

-when determining the visibility state of the window and processes 

-.ZN VisibilityNotify

-events according to the following:

-.IP \(bu 5

-When the window changes state from partially obscured, fully obscured,

-or not viewable to viewable and completely unobscured,

-the X server generates the event with the state member of the

-.ZN XVisibilityEvent

-structure set to

-.ZN VisibilityUnobscured .

-.IP \(bu 5

-When the window changes state from viewable and completely unobscured or 

-not viewable to viewable and partially obscured,

-the X server generates the event with the state member of the

-.ZN XVisibilityEvent

-structure set to

-.ZN VisibilityPartiallyObscured .

-.IP \(bu 5

-When the window changes state from viewable and completely unobscured, 

-viewable and partially obscured, or not viewable to viewable and 

-fully obscured,

-the X server generates the event with the state member of the

-.ZN XVisibilityEvent

-structure set to

-.ZN VisibilityFullyObscured .

-.SH "SEE ALSO"

-XAnyEvent(__libmansuffix__),

-XButtonEvent(__libmansuffix__),

-XCreateWindowEvent(__libmansuffix__),

-XCirculateEvent(__libmansuffix__),

-XCirculateRequestEvent(__libmansuffix__),

-XColormapEvent(__libmansuffix__),

-XConfigureEvent(__libmansuffix__),

-XConfigureRequestEvent(__libmansuffix__),

-XCrossingEvent(__libmansuffix__),

-XDestroyWindowEvent(__libmansuffix__),

-XErrorEvent(__libmansuffix__),

-XExposeEvent(__libmansuffix__),

-XFocusChangeEvent(__libmansuffix__),

-XGraphicsExposeEvent(__libmansuffix__),

-XGravityEvent(__libmansuffix__),

-XKeymapEvent(__libmansuffix__),

-XMapEvent(__libmansuffix__),

-XMapRequestEvent(__libmansuffix__),

-XPropertyEvent(__libmansuffix__),

-XReparentEvent(__libmansuffix__),

-XResizeRequestEvent(__libmansuffix__),

-XSelectionClearEvent(__libmansuffix__),

-XSelectionEvent(__libmansuffix__),

-XSelectionRequestEvent(__libmansuffix__),

-XUnmapEvent(__libmansuffix__),

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XVisibilityEvent __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XVisibilityEvent \- VisibilityNotify event structure
+.SH STRUCTURES
+The structure for
+.ZN VisibilityNotify
+events contains:
+.LP
+.Ds 0
+typedef struct {
+        int type;       /\&* VisibilityNotify */
+        unsigned long serial;   /\&* # of last request processed by server */
+        Bool send_event;        /\&* true if this came from a SendEvent request */
+        Display *display;       /\&* Display the event was read from */
+        Window window;
+        int state;
+} XVisibilityEvent;
+.De
+.LP
+When you receive this event,
+the structure members are set as follows.
+.LP
+The type member is set to the event type constant name that uniquely identifies
+it.
+For example, when the X server reports a
+.ZN GraphicsExpose
+event to a client application, it sends an
+.ZN XGraphicsExposeEvent
+structure with the type member set to
+.ZN GraphicsExpose .
+The display member is set to a pointer to the display the event was read on.
+The send_event member is set to
+.ZN True
+if the event came from a
+.ZN SendEvent
+protocol request.
+The serial member is set from the serial number reported in the protocol
+but expanded from the 16-bit least-significant bits to a full 32-bit value.
+The window member is set to the window that is most useful to toolkit
+dispatchers.
+.LP
+The window member is set to the window whose visibility state changes.
+The state member is set to the state of the window's visibility and can be
+.ZN VisibilityUnobscured ,
+.ZN VisibilityPartiallyObscured ,
+or
+.ZN VisibilityFullyObscured .
+The X server ignores all of a window's subwindows
+when determining the visibility state of the window and processes 
+.ZN VisibilityNotify
+events according to the following:
+.IP \(bu 5
+When the window changes state from partially obscured, fully obscured,
+or not viewable to viewable and completely unobscured,
+the X server generates the event with the state member of the
+.ZN XVisibilityEvent
+structure set to
+.ZN VisibilityUnobscured .
+.IP \(bu 5
+When the window changes state from viewable and completely unobscured or 
+not viewable to viewable and partially obscured,
+the X server generates the event with the state member of the
+.ZN XVisibilityEvent
+structure set to
+.ZN VisibilityPartiallyObscured .
+.IP \(bu 5
+When the window changes state from viewable and completely unobscured, 
+viewable and partially obscured, or not viewable to viewable and 
+fully obscured,
+the X server generates the event with the state member of the
+.ZN XVisibilityEvent
+structure set to
+.ZN VisibilityFullyObscured .
+.SH "SEE ALSO"
+XAnyEvent(__libmansuffix__),
+XButtonEvent(__libmansuffix__),
+XCreateWindowEvent(__libmansuffix__),
+XCirculateEvent(__libmansuffix__),
+XCirculateRequestEvent(__libmansuffix__),
+XColormapEvent(__libmansuffix__),
+XConfigureEvent(__libmansuffix__),
+XConfigureRequestEvent(__libmansuffix__),
+XCrossingEvent(__libmansuffix__),
+XDestroyWindowEvent(__libmansuffix__),
+XErrorEvent(__libmansuffix__),
+XExposeEvent(__libmansuffix__),
+XFocusChangeEvent(__libmansuffix__),
+XGraphicsExposeEvent(__libmansuffix__),
+XGravityEvent(__libmansuffix__),
+XKeymapEvent(__libmansuffix__),
+XMapEvent(__libmansuffix__),
+XMapRequestEvent(__libmansuffix__),
+XPropertyEvent(__libmansuffix__),
+XReparentEvent(__libmansuffix__),
+XResizeRequestEvent(__libmansuffix__),
+XSelectionClearEvent(__libmansuffix__),
+XSelectionEvent(__libmansuffix__),
+XSelectionRequestEvent(__libmansuffix__),
+XUnmapEvent(__libmansuffix__),
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XWarpPointer.man b/libX11/man/XWarpPointer.man
index 513700fbe..7b10ef2cb 100644
--- a/libX11/man/XWarpPointer.man
+++ b/libX11/man/XWarpPointer.man
@@ -1,217 +1,156 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XWarpPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XWarpPointer \- move pointer

-.SH SYNTAX

-.HP

-int XWarpPointer\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^, Window

-\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned int

-\fIsrc_width\fP\^, unsigned int \fIsrc_height\fP\^, int \fIdest_x\fP\^, int

-\fIdest_y\fP\^); 

-.SH ARGUMENTS

-.IP \fIdest_w\fP 1i

-Specifies the destination window or

-.ZN None .

-.IP \fIdest_x\fP 1i

-.br

-.ns

-.IP \fIdest_y\fP 1i

-Specify the x and y coordinates within the destination window.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIsrc_x\fP 1i

-.br

-.ns

-.IP \fIsrc_y\fP 1i

-.br

-.ns

-.IP \fIsrc_width\fP 1i

-.br

-.ns

-.IP \fIsrc_height\fP 1i

-Specify a rectangle in the source window.

-.IP \fIsrc_w\fP 1i

-Specifies the source window or

-.ZN None .

-.SH DESCRIPTION

-If dest_w is

-.ZN None ,

-.ZN XWarpPointer

-moves the pointer by the offsets (dest_x, dest_y) relative to the current

-position of the pointer.

-If dest_w is a window,

-.ZN XWarpPointer

-moves the pointer to the offsets (dest_x, dest_y) relative to the origin of

-dest_w.

-However, if src_w is a window,

-the move only takes place if the window src_w contains the pointer 

-and if the specified rectangle of src_w contains the pointer.

-.LP

-The src_x and src_y coordinates are relative to the origin of src_w.

-If src_height is zero,

-it is replaced with the current height of src_w minus src_y.

-If src_width is zero,

-it is replaced with the current width of src_w minus src_x.

-.LP

-There is seldom any reason for calling this function. 

-The pointer should normally be left to the user.

-If you do use this function, however, it generates events just as if the user

-had instantaneously moved the pointer from one position to another.

-Note that you cannot use

-.ZN XWarpPointer

-to move the pointer outside the confine_to window of an active pointer grab.

-An attempt to do so will only move the pointer as far as the closest edge of the

-confine_to window. 

-.LP

-.ZN XWarpPointer

-can generate a

-.ZN BadWindow 

-error.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadWindow

-A value for a Window argument does not name a defined Window.

-.SH "SEE ALSO"

-XSetInputFocus(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XWarpPointer __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XWarpPointer \- move pointer
+.SH SYNTAX
+.HP
+int XWarpPointer\^(\^Display *\fIdisplay\fP\^, Window \fIsrc_w\fP\^, Window
+\fIdest_w\fP\^, int \fIsrc_x\fP\^, int \fIsrc_y\fP\^, unsigned int
+\fIsrc_width\fP\^, unsigned int \fIsrc_height\fP\^, int \fIdest_x\fP\^, int
+\fIdest_y\fP\^); 
+.SH ARGUMENTS
+.IP \fIdest_w\fP 1i
+Specifies the destination window or
+.ZN None .
+.IP \fIdest_x\fP 1i
+.br
+.ns
+.IP \fIdest_y\fP 1i
+Specify the x and y coordinates within the destination window.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIsrc_x\fP 1i
+.br
+.ns
+.IP \fIsrc_y\fP 1i
+.br
+.ns
+.IP \fIsrc_width\fP 1i
+.br
+.ns
+.IP \fIsrc_height\fP 1i
+Specify a rectangle in the source window.
+.IP \fIsrc_w\fP 1i
+Specifies the source window or
+.ZN None .
+.SH DESCRIPTION
+If dest_w is
+.ZN None ,
+.ZN XWarpPointer
+moves the pointer by the offsets (dest_x, dest_y) relative to the current
+position of the pointer.
+If dest_w is a window,
+.ZN XWarpPointer
+moves the pointer to the offsets (dest_x, dest_y) relative to the origin of
+dest_w.
+However, if src_w is a window,
+the move only takes place if the window src_w contains the pointer 
+and if the specified rectangle of src_w contains the pointer.
+.LP
+The src_x and src_y coordinates are relative to the origin of src_w.
+If src_height is zero,
+it is replaced with the current height of src_w minus src_y.
+If src_width is zero,
+it is replaced with the current width of src_w minus src_x.
+.LP
+There is seldom any reason for calling this function. 
+The pointer should normally be left to the user.
+If you do use this function, however, it generates events just as if the user
+had instantaneously moved the pointer from one position to another.
+Note that you cannot use
+.ZN XWarpPointer
+to move the pointer outside the confine_to window of an active pointer grab.
+An attempt to do so will only move the pointer as far as the closest edge of the
+confine_to window. 
+.LP
+.ZN XWarpPointer
+can generate a
+.ZN BadWindow 
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XSetInputFocus(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsAllocColor.man b/libX11/man/XcmsAllocColor.man
index 57d742c3b..ebae27cdc 100644
--- a/libX11/man/XcmsAllocColor.man
+++ b/libX11/man/XcmsAllocColor.man
@@ -1,255 +1,194 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsAllocColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsAllocColor, XcmsAllocNamedColor \- allocate colors

-.SH SYNTAX

-.HP

-Status XcmsAllocColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 

-.HP

-Status XcmsAllocNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor

-*\fIcolor_screen_return\fP\^, XcmsColor *\fIcolor_exact_return\fP\^, XcmsColorFormat \fIresult_format\fP\^);

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIcolor_exact_return\fP 1i

-Returns the color specification parsed from the color string

-or parsed from the corresponding string found in a color-name database.

-.IP \fIcolor_in_out\fP 1i

-Specifies the color to allocate and returns the pixel and color 

-that is actually used in the colormap.

-.IP \fIcolor_screen_return\fP 1i

-Returns the pixel value of the color cell and color specification 

-that actually is stored for that cell.

-.ds St \ whose color definition structure is to be returned

-.IP \fIcolor_string\fP 1i

-Specifies the color string\*(St.

-.IP \fIresult_format\fP 1i

-Specifies the color format for the returned color specification.

-.SH DESCRIPTION

-The

-.ZN XcmsAllocColor

-function is similar to

-.ZN XAllocColor

-except the color can be specified in any format.

-The

-.ZN XcmsAllocColor

-function ultimately calls 

-.ZN XAllocColor

-to allocate a read-only color cell (colormap entry) with the specified color.

-.ZN XcmsAllocColor

-first converts the color specified

-to an RGB value and then passes this to

-.ZN XAllocColor .

-.ZN XcmsAllocColor

-returns the pixel value of the color cell and the color specification

-actually allocated.

-This returned color specification is the result of converting the RGB value

-returned by 

-.ZN XAllocColor 

-into the format specified with the result_format argument.

-If there is no interest in a returned color specification, 

-unnecessary computation can be bypassed if result_format is set to

-.ZN XcmsRGBFormat .

-The corresponding colormap cell is read-only.

-If this routine returns 

-.ZN XcmsFailure , 

-the color_in_out color specification is left unchanged.

-.LP

-.ZN XcmsAllocColor

-can generate a

-.ZN BadColor

-errors.

-.LP

-The

-.ZN XcmsAllocNamedColor

-function is similar to

-.ZN XAllocNamedColor

-except that the color returned can be in any format specified.

-This function

-ultimately calls

-.ZN XAllocColor

-to allocate a read-only color cell with

-the color specified by a color string.

-The color string is parsed into an

-.ZN XcmsColor

-structure (see

-.ZN XcmsLookupColor ),

-converted

-to an RGB value, and finally passed to

-.ZN XAllocColor .

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-.LP

-This function returns both the color specification as a result

-of parsing (exact specification) and the actual color specification

-stored (screen specification).

-This screen specification is the result of converting the RGB value

-returned by

-.ZN XAllocColor

-into the format specified in result_format.

-If there is no interest in a returned color specification,

-unnecessary computation can be bypassed if result_format is set to

-.ZN XcmsRGBFormat .

-If color_screen_return and color_exact_return

-point to the same structure, the pixel field will be set correctly,

-but the color values are undefined.

-.LP

-.LP

-.ZN XcmsAllocNamedColor

-can generate a

-.ZN BadColor

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.SH "SEE ALSO"

-XcmsQueryColor(__libmansuffix__),

-XcmsStoreColor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsAllocColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsAllocColor, XcmsAllocNamedColor \- allocate colors
+.SH SYNTAX
+.HP
+Status XcmsAllocColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsAllocNamedColor\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor
+*\fIcolor_screen_return\fP\^, XcmsColor *\fIcolor_exact_return\fP\^, XcmsColorFormat \fIresult_format\fP\^);
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIcolor_exact_return\fP 1i
+Returns the color specification parsed from the color string
+or parsed from the corresponding string found in a color-name database.
+.IP \fIcolor_in_out\fP 1i
+Specifies the color to allocate and returns the pixel and color 
+that is actually used in the colormap.
+.IP \fIcolor_screen_return\fP 1i
+Returns the pixel value of the color cell and color specification 
+that actually is stored for that cell.
+.ds St \ whose color definition structure is to be returned
+.IP \fIcolor_string\fP 1i
+Specifies the color string\*(St.
+.IP \fIresult_format\fP 1i
+Specifies the color format for the returned color specification.
+.SH DESCRIPTION
+The
+.ZN XcmsAllocColor
+function is similar to
+.ZN XAllocColor
+except the color can be specified in any format.
+The
+.ZN XcmsAllocColor
+function ultimately calls 
+.ZN XAllocColor
+to allocate a read-only color cell (colormap entry) with the specified color.
+.ZN XcmsAllocColor
+first converts the color specified
+to an RGB value and then passes this to
+.ZN XAllocColor .
+.ZN XcmsAllocColor
+returns the pixel value of the color cell and the color specification
+actually allocated.
+This returned color specification is the result of converting the RGB value
+returned by 
+.ZN XAllocColor 
+into the format specified with the result_format argument.
+If there is no interest in a returned color specification, 
+unnecessary computation can be bypassed if result_format is set to
+.ZN XcmsRGBFormat .
+The corresponding colormap cell is read-only.
+If this routine returns 
+.ZN XcmsFailure , 
+the color_in_out color specification is left unchanged.
+.LP
+.ZN XcmsAllocColor
+can generate a
+.ZN BadColor
+errors.
+.LP
+The
+.ZN XcmsAllocNamedColor
+function is similar to
+.ZN XAllocNamedColor
+except that the color returned can be in any format specified.
+This function
+ultimately calls
+.ZN XAllocColor
+to allocate a read-only color cell with
+the color specified by a color string.
+The color string is parsed into an
+.ZN XcmsColor
+structure (see
+.ZN XcmsLookupColor ),
+converted
+to an RGB value, and finally passed to
+.ZN XAllocColor .
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+.LP
+This function returns both the color specification as a result
+of parsing (exact specification) and the actual color specification
+stored (screen specification).
+This screen specification is the result of converting the RGB value
+returned by
+.ZN XAllocColor
+into the format specified in result_format.
+If there is no interest in a returned color specification,
+unnecessary computation can be bypassed if result_format is set to
+.ZN XcmsRGBFormat .
+If color_screen_return and color_exact_return
+point to the same structure, the pixel field will be set correctly,
+but the color values are undefined.
+.LP
+.LP
+.ZN XcmsAllocNamedColor
+can generate a
+.ZN BadColor
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.SH "SEE ALSO"
+XcmsQueryColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsCCCOfColormap.man b/libX11/man/XcmsCCCOfColormap.man
index 95310e645..9f0dfc10c 100644
--- a/libX11/man/XcmsCCCOfColormap.man
+++ b/libX11/man/XcmsCCCOfColormap.man
@@ -1,187 +1,126 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsCCCOfColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsCCCOfColormap, XcmsSetCCCOfColormap \- query and modify CCC of a colormap

-.SH SYNTAX

-.HP

-XcmsCCC XcmsCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^);

-.HP

-XcmsCCC XcmsSetCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^, XcmsCCC \fIccc\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIccc\fP 1i

-Specifies the CCC.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.SH DESCRIPTION

-The

-.ZN XcmsCCCOfColormap

-function returns the CCC associated with the specified colormap.

-Once obtained, 

-the CCC attributes can be queried or modified.

-Unless the CCC associated with the specified colormap is changed with

-.ZN XcmsSetCCCOfColormap ,

-this CCC is used when the specified colormap is used as an argument 

-to color functions.

-.LP

-The

-.ZN XcmsSetCCCOfColormap

-function changes the CCC associated with the specified colormap.

-It returns the CCC previously associated with the colormap.

-If they are not used again in the application,

-CCCs should be freed by calling

-.ZN XcmsFreeCCC .

-Several colormaps may share the same CCC without restriction; this

-includes the CCCs generated by Xlib with each colormap.  Xlib, however,

-creates a new CCC with each new colormap.

-.SH "SEE ALSO"

-DisplayOfCCC(__libmansuffix__),

-XcmsConvertColors(__libmansuffix__),

-XcmsCreateCCC(__libmansuffix__),

-XcmsDefaultCCC(__libmansuffix__),

-XcmsSetWhitePoint(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsCCCOfColormap __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsCCCOfColormap, XcmsSetCCCOfColormap \- query and modify CCC of a colormap
+.SH SYNTAX
+.HP
+XcmsCCC XcmsCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^);
+.HP
+XcmsCCC XcmsSetCCCOfColormap\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsCCC \fIccc\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIccc\fP 1i
+Specifies the CCC.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.SH DESCRIPTION
+The
+.ZN XcmsCCCOfColormap
+function returns the CCC associated with the specified colormap.
+Once obtained, 
+the CCC attributes can be queried or modified.
+Unless the CCC associated with the specified colormap is changed with
+.ZN XcmsSetCCCOfColormap ,
+this CCC is used when the specified colormap is used as an argument 
+to color functions.
+.LP
+The
+.ZN XcmsSetCCCOfColormap
+function changes the CCC associated with the specified colormap.
+It returns the CCC previously associated with the colormap.
+If they are not used again in the application,
+CCCs should be freed by calling
+.ZN XcmsFreeCCC .
+Several colormaps may share the same CCC without restriction; this
+includes the CCCs generated by Xlib with each colormap.  Xlib, however,
+creates a new CCC with each new colormap.
+.SH "SEE ALSO"
+DisplayOfCCC(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsCIELabQueryMaxC.man b/libX11/man/XcmsCIELabQueryMaxC.man
index c98099116..69ad94de3 100644
--- a/libX11/man/XcmsCIELabQueryMaxC.man
+++ b/libX11/man/XcmsCIELabQueryMaxC.man
@@ -1,221 +1,160 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsCIELabQueryMax __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsCIELabQueryMaxC, XcmsCIELabQueryMaxL, XcmsCIELabQueryMaxLC, XcmsCIELabQueryMinL \- obtain the CIE L*a*b* coordinates

-.SH SYNTAX

-.HP

-Status XcmsCIELabQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.HP

-Status XcmsCIELabQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.HP

-Status XcmsCIELabQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsCIELabQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-Note that the CCC's Client White Point and White Point Adjustment procedures

-are ignored.

-.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)

-.IP \fIchroma\fP 1i

-Specifies the chroma at which to find \*(Ch.

-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \

-or minimum lightness (MinL)

-.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \

-or hue angle (MaxLC)

-.IP \fIcolor_return\fP 1i

-Returns the CIE L*a*b* coordinates of \*(Lc

-displayable by the screen for the given \*(lC.

-The white point associated with the returned

-color specification is the Screen White Point.

-The value returned in the pixel member is undefined.

-.ds Ha maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \

-or minimum lightness (MinL)

-.IP \fIhue_angle\fP 1i

-Specifies the hue angle (in degrees) at which to find \*(Ha.

-.ds Ls maximum chroma (MaxC)

-.IP \fIL_star\fP 1i

-Specifies the lightness (L*) at which to find \*(Ls.

-.SH DESCRIPTION

-The

-.ZN XcmsCIELabQueryMaxC

-function, given a hue angle and lightness,

-finds the point of maximum chroma displayable by the screen.

-It returns this point in CIE L*a*b* coordinates.

-.LP

-The

-.ZN XcmsCIELabQueryMaxL

-function, given a hue angle and chroma,

-finds the point in CIE L*a*b* color space of maximum 

-lightness (L*) displayable by the screen.

-It returns this point in CIE L*a*b* coordinates.

-An 

-.ZN XcmsFailure

-return value usually indicates that the given chroma

-is beyond maximum for the given hue angle.

-.LP

-The

-.ZN XcmsCIELabQueryMaxLC

-function, given a hue angle,

-finds the point of maximum chroma displayable by the screen.

-It returns this point in CIE L*a*b* coordinates.

-.LP

-The

-.ZN XcmsCIELabQueryMinL

-function, given a hue angle and chroma,

-finds the point of minimum lightness (L*) displayable by the screen.

-It returns this point in CIE L*a*b* coordinates.

-An 

-.ZN XcmsFailure

-return value usually indicates that the given chroma

-is beyond maximum for the given hue angle.

-.SH "SEE ALSO"

-XcmsCIELuvQueryMaxC(__libmansuffix__),

-XcmsTekHVCQueryMaxC(__libmansuffix__),

-XcmsQueryBlack(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsCIELabQueryMax __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsCIELabQueryMaxC, XcmsCIELabQueryMaxL, XcmsCIELabQueryMaxLC, XcmsCIELabQueryMinL \- obtain the CIE L*a*b* coordinates
+.SH SYNTAX
+.HP
+Status XcmsCIELabQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELabQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELabQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsCIELabQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+Note that the CCC's Client White Point and White Point Adjustment procedures
+are ignored.
+.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
+.IP \fIchroma\fP 1i
+Specifies the chroma at which to find \*(Ch.
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
+or minimum lightness (MinL)
+.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
+or hue angle (MaxLC)
+.IP \fIcolor_return\fP 1i
+Returns the CIE L*a*b* coordinates of \*(Lc
+displayable by the screen for the given \*(lC.
+The white point associated with the returned
+color specification is the Screen White Point.
+The value returned in the pixel member is undefined.
+.ds Ha maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
+or minimum lightness (MinL)
+.IP \fIhue_angle\fP 1i
+Specifies the hue angle (in degrees) at which to find \*(Ha.
+.ds Ls maximum chroma (MaxC)
+.IP \fIL_star\fP 1i
+Specifies the lightness (L*) at which to find \*(Ls.
+.SH DESCRIPTION
+The
+.ZN XcmsCIELabQueryMaxC
+function, given a hue angle and lightness,
+finds the point of maximum chroma displayable by the screen.
+It returns this point in CIE L*a*b* coordinates.
+.LP
+The
+.ZN XcmsCIELabQueryMaxL
+function, given a hue angle and chroma,
+finds the point in CIE L*a*b* color space of maximum 
+lightness (L*) displayable by the screen.
+It returns this point in CIE L*a*b* coordinates.
+An 
+.ZN XcmsFailure
+return value usually indicates that the given chroma
+is beyond maximum for the given hue angle.
+.LP
+The
+.ZN XcmsCIELabQueryMaxLC
+function, given a hue angle,
+finds the point of maximum chroma displayable by the screen.
+It returns this point in CIE L*a*b* coordinates.
+.LP
+The
+.ZN XcmsCIELabQueryMinL
+function, given a hue angle and chroma,
+finds the point of minimum lightness (L*) displayable by the screen.
+It returns this point in CIE L*a*b* coordinates.
+An 
+.ZN XcmsFailure
+return value usually indicates that the given chroma
+is beyond maximum for the given hue angle.
+.SH "SEE ALSO"
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsCIELuvQueryMaxC.man b/libX11/man/XcmsCIELuvQueryMaxC.man
index 33bdb3004..14a2a2262 100644
--- a/libX11/man/XcmsCIELuvQueryMaxC.man
+++ b/libX11/man/XcmsCIELuvQueryMaxC.man
@@ -1,221 +1,160 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsCIELuvQueryMaxC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsCIELuvQueryMaxC, XcmsCIELuvQueryMaxL, XcmsCIELuvQueryMaxLC, XcmsCIELuvQueryMinL \- obtain the CIE L*u*v* coordinates

-.SH SYNTAX

-.HP

-Status XcmsCIELuvQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.HP

-Status XcmsCIELuvQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.HP

-Status XcmsCIELuvQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsCIELuvQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-Note that the CCC's Client White Point and White Point Adjustment procedures

-are ignored.

-.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)

-.IP \fIchroma\fP 1i

-Specifies the chroma at which to find \*(Ch.

-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \

-or minimum lightness (MinL)

-.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \

-or hue angle (MaxLC)

-.IP \fIcolor_return\fP 1i

-Returns the CIE L*u*v* coordinates of \*(Lc

-displayable by the screen for the given \*(lC.

-The white point associated with the returned

-color specification is the Screen White Point.

-The value returned in the pixel member is undefined.

-.ds Ha maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \

-or minimum lightness (MinL)

-.IP \fIhue_angle\fP 1i

-Specifies the hue angle (in degrees) at which to find \*(Ha.

-.ds Ls maximum chroma (MaxC) or maximum lightness (MaxL)

-.IP \fIL_star\fP 1i

-Specifies the lightness (L*) at which to find \*(Ls.

-.SH DESCRIPTION

-The

-.ZN XcmsCIELuvQueryMaxC

-function, given a hue angle and lightness,

-finds the point of maximum chroma displayable by the screen.

-It returns this point in CIE L*u*v* coordinates.

-.LP

-The

-.ZN XcmsCIELuvQueryMaxL

-function, given a hue angle and chroma,

-finds the point in CIE L*u*v* color space of maximum 

-lightness (L*) displayable by the screen.

-It returns this point in CIE L*u*v* coordinates.

-An 

-.ZN XcmsFailure

-return value usually indicates that the given chroma

-is beyond maximum for the given hue angle.

-.LP

-The

-.ZN XcmsCIELuvQueryMaxLC

-function, given a hue angle,

-finds the point of maximum chroma displayable by the screen.

-It returns this point in CIE L*u*v* coordinates.

-.LP

-The

-.ZN XcmsCIELuvQueryMinL

-function, given a hue angle and chroma,

-finds the point of minimum lightness (L*) displayable by the screen.

-It returns this point in CIE L*u*v* coordinates.

-An 

-.ZN XcmsFailure

-return value usually indicates that the given chroma

-is beyond maximum for the given hue angle.

-.SH "SEE ALSO"

-XcmsCIELabQueryMaxC(__libmansuffix__),

-XcmsTekHVCQueryMaxC(__libmansuffix__),

-XcmsQueryBlack(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsCIELuvQueryMaxC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsCIELuvQueryMaxC, XcmsCIELuvQueryMaxL, XcmsCIELuvQueryMaxLC, XcmsCIELuvQueryMinL \- obtain the CIE L*u*v* coordinates
+.SH SYNTAX
+.HP
+Status XcmsCIELuvQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIL_star\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELuvQueryMaxL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.HP
+Status XcmsCIELuvQueryMaxLC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsCIELuvQueryMinL\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue_angle\fP\^, XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^);
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+Note that the CCC's Client White Point and White Point Adjustment procedures
+are ignored.
+.ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
+.IP \fIchroma\fP 1i
+Specifies the chroma at which to find \*(Ch.
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
+or minimum lightness (MinL)
+.ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
+or hue angle (MaxLC)
+.IP \fIcolor_return\fP 1i
+Returns the CIE L*u*v* coordinates of \*(Lc
+displayable by the screen for the given \*(lC.
+The white point associated with the returned
+color specification is the Screen White Point.
+The value returned in the pixel member is undefined.
+.ds Ha maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
+or minimum lightness (MinL)
+.IP \fIhue_angle\fP 1i
+Specifies the hue angle (in degrees) at which to find \*(Ha.
+.ds Ls maximum chroma (MaxC) or maximum lightness (MaxL)
+.IP \fIL_star\fP 1i
+Specifies the lightness (L*) at which to find \*(Ls.
+.SH DESCRIPTION
+The
+.ZN XcmsCIELuvQueryMaxC
+function, given a hue angle and lightness,
+finds the point of maximum chroma displayable by the screen.
+It returns this point in CIE L*u*v* coordinates.
+.LP
+The
+.ZN XcmsCIELuvQueryMaxL
+function, given a hue angle and chroma,
+finds the point in CIE L*u*v* color space of maximum 
+lightness (L*) displayable by the screen.
+It returns this point in CIE L*u*v* coordinates.
+An 
+.ZN XcmsFailure
+return value usually indicates that the given chroma
+is beyond maximum for the given hue angle.
+.LP
+The
+.ZN XcmsCIELuvQueryMaxLC
+function, given a hue angle,
+finds the point of maximum chroma displayable by the screen.
+It returns this point in CIE L*u*v* coordinates.
+.LP
+The
+.ZN XcmsCIELuvQueryMinL
+function, given a hue angle and chroma,
+finds the point of minimum lightness (L*) displayable by the screen.
+It returns this point in CIE L*u*v* coordinates.
+An 
+.ZN XcmsFailure
+return value usually indicates that the given chroma
+is beyond maximum for the given hue angle.
+.SH "SEE ALSO"
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsColor.man b/libX11/man/XcmsColor.man
index 273b56fe0..376913d97 100644
--- a/libX11/man/XcmsColor.man
+++ b/libX11/man/XcmsColor.man
@@ -1,263 +1,202 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.de EX

-.sp

-.nf

-.ft CW

-..

-.de EE

-.ft R

-.fi

-.sp

-..

-.TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure

-.SH STRUCTURES

-The structure for

-.ZN XcmsColor

-contains:

-.LP

-.EX

-typedef unsigned long XcmsColorFormat;			/\&* Color Specification Format */

-

-typedef struct {

-	union {

-		XcmsRGB RGB;

-		XcmsRGBi RGBi;

-		XcmsCIEXYZ CIEXYZ;

-		XcmsCIEuvY CIEuvY;

-		XcmsCIExyY CIExyY;

-		XcmsCIELab CIELab;

-		XcmsCIELuv CIELuv;

-		XcmsTekHVC TekHVC;

-		XcmsPad Pad;

-	} spec;

-	unsigned long pixel;

-	XcmsColorFormat format;

-} XcmsColor;			/\&* Xcms Color Structure */

-.EE

-.LP

-.EX

-typedef double XcmsFloat;

-

-typedef struct {

-	unsigned short red;	/\&* 0x0000 to 0xffff */

-	unsigned short green;	/\&* 0x0000 to 0xffff */

-	unsigned short blue;	/\&* 0x0000 to 0xffff */

-} XcmsRGB;		/\&* RGB Device */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat red;	/\&* 0.0 to 1.0 */

-	XcmsFloat green;	/\&* 0.0 to 1.0 */

-	XcmsFloat blue;	/\&* 0.0 to 1.0 */

-} XcmsRGBi;		/\&* RGB Intensity */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat X;

-	XcmsFloat Y;	/\&* 0.0 to 1.0 */

-	XcmsFloat Z;

-} XcmsCIEXYZ;		/\&* CIE XYZ */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat u_prime;	/\&* 0.0 to ~0.6 */

-	XcmsFloat v_prime;	/\&* 0.0 to ~0.6 */

-	XcmsFloat Y; 	/\&* 0.0 to 1.0 */

-} XcmsCIEuvY;		/\&* CIE u'v'Y */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat x; 	/\&* 0.0 to ~.75 */

-	XcmsFloat y; 	/\&* 0.0 to ~.85 */

-	XcmsFloat Y; 	/\&* 0.0 to 1.0 */

-} XcmsCIExyY;		/\&* CIE xyY */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */

-	XcmsFloat a_star;

-	XcmsFloat b_star;

-} XcmsCIELab;		/\&* CIE L*a*b* */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */

-	XcmsFloat u_star;

-	XcmsFloat v_star;

-} XcmsCIELuv;		/\&* CIE L*u*v* */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat H; 	/\&* 0.0 to 360.0 */

-	XcmsFloat V; 	/\&* 0.0 to 100.0 */

-	XcmsFloat C; 	/\&* 0.0 to 100.0 */

-} XcmsTekHVC;		/\&* TekHVC */

-.EE

-.LP

-.EX

-typedef struct {

-	XcmsFloat pad0;

-	XcmsFloat pad1;

-	XcmsFloat pad2;

-	XcmsFloat pad3;

-} XcmsPad;		/\&* four doubles */

-.EE

-.SH DESCRIPTION

-The

-.ZN XcmsColor

-structure contains a union of substructures,

-each supporting color specification encoding for a particular color space.

-.SH "SEE ALSO"

-XcmsAllocColor(__libmansuffix__),

-XcmsStoreColor(__libmansuffix__),

-XcmsConvertColors(__libmansuffix__),

-.LP

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
+.TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure
+.SH STRUCTURES
+The structure for
+.ZN XcmsColor
+contains:
+.LP
+.EX
+typedef unsigned long XcmsColorFormat;			/\&* Color Specification Format */
+
+typedef struct {
+	union {
+		XcmsRGB RGB;
+		XcmsRGBi RGBi;
+		XcmsCIEXYZ CIEXYZ;
+		XcmsCIEuvY CIEuvY;
+		XcmsCIExyY CIExyY;
+		XcmsCIELab CIELab;
+		XcmsCIELuv CIELuv;
+		XcmsTekHVC TekHVC;
+		XcmsPad Pad;
+	} spec;
+	unsigned long pixel;
+	XcmsColorFormat format;
+} XcmsColor;			/\&* Xcms Color Structure */
+.EE
+.LP
+.EX
+typedef double XcmsFloat;
+
+typedef struct {
+	unsigned short red;	/\&* 0x0000 to 0xffff */
+	unsigned short green;	/\&* 0x0000 to 0xffff */
+	unsigned short blue;	/\&* 0x0000 to 0xffff */
+} XcmsRGB;		/\&* RGB Device */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat red;	/\&* 0.0 to 1.0 */
+	XcmsFloat green;	/\&* 0.0 to 1.0 */
+	XcmsFloat blue;	/\&* 0.0 to 1.0 */
+} XcmsRGBi;		/\&* RGB Intensity */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat X;
+	XcmsFloat Y;	/\&* 0.0 to 1.0 */
+	XcmsFloat Z;
+} XcmsCIEXYZ;		/\&* CIE XYZ */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat u_prime;	/\&* 0.0 to ~0.6 */
+	XcmsFloat v_prime;	/\&* 0.0 to ~0.6 */
+	XcmsFloat Y; 	/\&* 0.0 to 1.0 */
+} XcmsCIEuvY;		/\&* CIE u'v'Y */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat x; 	/\&* 0.0 to ~.75 */
+	XcmsFloat y; 	/\&* 0.0 to ~.85 */
+	XcmsFloat Y; 	/\&* 0.0 to 1.0 */
+} XcmsCIExyY;		/\&* CIE xyY */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */
+	XcmsFloat a_star;
+	XcmsFloat b_star;
+} XcmsCIELab;		/\&* CIE L*a*b* */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */
+	XcmsFloat u_star;
+	XcmsFloat v_star;
+} XcmsCIELuv;		/\&* CIE L*u*v* */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat H; 	/\&* 0.0 to 360.0 */
+	XcmsFloat V; 	/\&* 0.0 to 100.0 */
+	XcmsFloat C; 	/\&* 0.0 to 100.0 */
+} XcmsTekHVC;		/\&* TekHVC */
+.EE
+.LP
+.EX
+typedef struct {
+	XcmsFloat pad0;
+	XcmsFloat pad1;
+	XcmsFloat pad2;
+	XcmsFloat pad3;
+} XcmsPad;		/\&* four doubles */
+.EE
+.SH DESCRIPTION
+The
+.ZN XcmsColor
+structure contains a union of substructures,
+each supporting color specification encoding for a particular color space.
+.SH "SEE ALSO"
+XcmsAllocColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+.LP
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsConvertColors.man b/libX11/man/XcmsConvertColors.man
index 7c71f4d65..941873bb9 100644
--- a/libX11/man/XcmsConvertColors.man
+++ b/libX11/man/XcmsConvertColors.man
@@ -1,201 +1,140 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsConvertColors __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsConvertColors \- convert CCC color specifications

-.SH SYNTAX

-.HP

-Status XcmsConvertColors\^(\^XcmsCCC \fIccc\fP\^, XcmsColor

-\fIcolors_in_out\fP\^[\^]\^, unsigned int \fIncolors\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, Bool \fIcompression_flags_return\fP\^[\^]\^); 

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-If Conversion is between device-independent color spaces only

-(for example, TekHVC to CIELuv),

-the CCC is necessary only to specify the Client White Point.

-.IP \fIcolors_in_out\fP 1i

-Specifies an array of color specifications.

-Pixel members are ignored and remain unchanged upon return.

-.IP \fIcompression_flags_return\fP 1i

-Returns an array of Boolean values indicating compression status.

-If a non-NULL pointer is supplied,

-each element of the array is set to

-.ZN True

-if the corresponding color was compressed and

-.ZN False

-otherwise.

-Pass NULL if the compression status is not useful.

-.IP \fIncolors\fP 1i

-Specifies the number of 

-.ZN XcmsColor

-structures in the color-specification array.

-.IP \fItarget_format\fP 1i

-Specifies the target color specification format.

-.SH DESCRIPTION

-The

-.ZN XcmsConvertColors

-function converts the color specifications in the specified array of

-.ZN XcmsColor

-structures from their current format to a single target format,

-using the specified CCC.

-When the return value is

-.ZN XcmsFailure ,

-the contents of the color specification array are left unchanged.

-.LP

-The array may contain a mixture of color specification formats

-(for example, 3 CIE XYZ, 2 CIE Luv, and so on).

-When the array contains both device-independent and

-device-dependent color specifications and the target_format argument specifies

-a device-dependent format (for example,

-.ZN XcmsRGBiFormat ,

-.ZN XcmsRGBFormat ),

-all specifications are converted to CIE XYZ format and then to the target

-device-dependent format.

-.SH "SEE ALSO"

-DisplayOfCCC(__libmansuffix__),

-XcmsCCCOfColormap(__libmansuffix__),

-XcmsCreateCCC(__libmansuffix__),

-XcmsDefaultCCC(__libmansuffix__),

-XcmsSetWhitePoint(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsConvertColors __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsConvertColors \- convert CCC color specifications
+.SH SYNTAX
+.HP
+Status XcmsConvertColors\^(\^XcmsCCC \fIccc\fP\^, XcmsColor
+\fIcolors_in_out\fP\^[\^]\^, unsigned int \fIncolors\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, Bool \fIcompression_flags_return\fP\^[\^]\^); 
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+If Conversion is between device-independent color spaces only
+(for example, TekHVC to CIELuv),
+the CCC is necessary only to specify the Client White Point.
+.IP \fIcolors_in_out\fP 1i
+Specifies an array of color specifications.
+Pixel members are ignored and remain unchanged upon return.
+.IP \fIcompression_flags_return\fP 1i
+Returns an array of Boolean values indicating compression status.
+If a non-NULL pointer is supplied,
+each element of the array is set to
+.ZN True
+if the corresponding color was compressed and
+.ZN False
+otherwise.
+Pass NULL if the compression status is not useful.
+.IP \fIncolors\fP 1i
+Specifies the number of 
+.ZN XcmsColor
+structures in the color-specification array.
+.IP \fItarget_format\fP 1i
+Specifies the target color specification format.
+.SH DESCRIPTION
+The
+.ZN XcmsConvertColors
+function converts the color specifications in the specified array of
+.ZN XcmsColor
+structures from their current format to a single target format,
+using the specified CCC.
+When the return value is
+.ZN XcmsFailure ,
+the contents of the color specification array are left unchanged.
+.LP
+The array may contain a mixture of color specification formats
+(for example, 3 CIE XYZ, 2 CIE Luv, and so on).
+When the array contains both device-independent and
+device-dependent color specifications and the target_format argument specifies
+a device-dependent format (for example,
+.ZN XcmsRGBiFormat ,
+.ZN XcmsRGBFormat ),
+all specifications are converted to CIE XYZ format and then to the target
+device-dependent format.
+.SH "SEE ALSO"
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsCreateCCC.man b/libX11/man/XcmsCreateCCC.man
index 54a15075f..1c260170e 100644
--- a/libX11/man/XcmsCreateCCC.man
+++ b/libX11/man/XcmsCreateCCC.man
@@ -1,202 +1,141 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsCreateCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsCreateCCC, XcmsFreeCCC \- creating and destroying CCCs

-.SH SYNTAX

-.HP

-XcmsCCC XcmsCreateCCC\^(\^Display *\fIdisplay\fP\^, int \fIscreen_number\fP\^,

-Visual *\fIvisual\fP\^, XcmsColor *\fIclient_white_point\fP\^,

-XcmsCompressionProc \fIcompression_proc\fP\^, XPointer

-\fIcompression_client_data\fP\^, XcmsWhiteAdjustProc

-\fIwhite_adjust_proc\fP\^, XPointer \fIwhite_adjust_client_data\fP\^); 

-.LP

-void XcmsFreeCCC\^(\^XcmsCCC \fIccc\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIccc\fP 1i

-Specifies the CCC.

-.IP \fIclient_white_point\fP 1i

-Specifies the Client White Point.

-If NULL is specified, 

-the Client White Point is to be assumed to be the same as the

-Screen White Point.

-Note that the pixel member is ignored.

-.IP \fIcompression_client_data\fP 1i

-Specifies client data for use by the gamut compression procedure or NULL.

-.IP \fIcompression_proc\fP 1i

-Specifies the gamut compression procedure that is to be applied 

-when a color lies outside the screen's color gamut.

-If NULL is specified and a function using this CCC must convert

-a color specification to a device-dependent format and encounters a color

-that lies outside the screen's color gamut, 

-that function will return

-.ZN XcmsFailure .

-.IP \fIscreen_number\fP 1i

-Specifies the appropriate screen number on the host server.

-.IP \fIvisual\fP 1i

-Specifies the visual type.

-.IP \fIwhite_adjust_client_data\fP 1i

-Specifies client data for use with the white point adjustment procedure or NULL.

-.IP \fIwhite_adjust_proc\fP 1i

-Specifies the white adjustment procedure that is to be applied

-when the Client White Point differs from the Screen White Point.

-NULL indicates that no white point adjustment is desired.

-.SH DESCRIPTION

-The

-.ZN XcmsCreateCCC

-function creates a CCC for the specified display, screen, and visual.

-.LP

-The

-.ZN XcmsFreeCCC

-function frees the memory used for the specified CCC.

-Note that default CCCs and those currently associated with colormaps

-are ignored.

-.SH "SEE ALSO"

-DisplayOfCCC(__libmansuffix__),

-XcmsCCCOfColormap(__libmansuffix__),

-XcmsConvertColors(__libmansuffix__),

-XcmsDefaultCCC(__libmansuffix__),

-XcmsSetWhitePoint(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsCreateCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsCreateCCC, XcmsFreeCCC \- creating and destroying CCCs
+.SH SYNTAX
+.HP
+XcmsCCC XcmsCreateCCC\^(\^Display *\fIdisplay\fP\^, int \fIscreen_number\fP\^,
+Visual *\fIvisual\fP\^, XcmsColor *\fIclient_white_point\fP\^,
+XcmsCompressionProc \fIcompression_proc\fP\^, XPointer
+\fIcompression_client_data\fP\^, XcmsWhiteAdjustProc
+\fIwhite_adjust_proc\fP\^, XPointer \fIwhite_adjust_client_data\fP\^); 
+.LP
+void XcmsFreeCCC\^(\^XcmsCCC \fIccc\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIccc\fP 1i
+Specifies the CCC.
+.IP \fIclient_white_point\fP 1i
+Specifies the Client White Point.
+If NULL is specified, 
+the Client White Point is to be assumed to be the same as the
+Screen White Point.
+Note that the pixel member is ignored.
+.IP \fIcompression_client_data\fP 1i
+Specifies client data for use by the gamut compression procedure or NULL.
+.IP \fIcompression_proc\fP 1i
+Specifies the gamut compression procedure that is to be applied 
+when a color lies outside the screen's color gamut.
+If NULL is specified and a function using this CCC must convert
+a color specification to a device-dependent format and encounters a color
+that lies outside the screen's color gamut, 
+that function will return
+.ZN XcmsFailure .
+.IP \fIscreen_number\fP 1i
+Specifies the appropriate screen number on the host server.
+.IP \fIvisual\fP 1i
+Specifies the visual type.
+.IP \fIwhite_adjust_client_data\fP 1i
+Specifies client data for use with the white point adjustment procedure or NULL.
+.IP \fIwhite_adjust_proc\fP 1i
+Specifies the white adjustment procedure that is to be applied
+when the Client White Point differs from the Screen White Point.
+NULL indicates that no white point adjustment is desired.
+.SH DESCRIPTION
+The
+.ZN XcmsCreateCCC
+function creates a CCC for the specified display, screen, and visual.
+.LP
+The
+.ZN XcmsFreeCCC
+function frees the memory used for the specified CCC.
+Note that default CCCs and those currently associated with colormaps
+are ignored.
+.SH "SEE ALSO"
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsDefaultCCC.man b/libX11/man/XcmsDefaultCCC.man
index d4d7732bb..21bf6cfcc 100644
--- a/libX11/man/XcmsDefaultCCC.man
+++ b/libX11/man/XcmsDefaultCCC.man
@@ -1,169 +1,108 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsDefaultCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsDefaultCCC \- obtain the default CCC for a screen

-.SH SYNTAX

-.HP

-XcmsCCC XcmsDefaultCCC\^(\^Display *\fIdisplay\fP\^, int

-\fIscreen_number\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIscreen_number\fP 1i

-Specifies the appropriate screen number on the host server.

-.SH DESCRIPTION

-The

-.ZN XcmsDefaultCCC

-function returns the default CCC for the specified screen.

-Its visual is the default visual of the screen.

-Its initial gamut compression and white point

-adjustment procedures as well as the associated client data are implementation

-specific.

-.SH "SEE ALSO"

-DisplayOfCCC(__libmansuffix__),

-XcmsCCCOfColormap(__libmansuffix__),

-XcmsConvertColors(__libmansuffix__),

-XcmsCreateCCC(__libmansuffix__),

-XcmsSetWhitePoint(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsDefaultCCC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsDefaultCCC \- obtain the default CCC for a screen
+.SH SYNTAX
+.HP
+XcmsCCC XcmsDefaultCCC\^(\^Display *\fIdisplay\fP\^, int
+\fIscreen_number\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIscreen_number\fP 1i
+Specifies the appropriate screen number on the host server.
+.SH DESCRIPTION
+The
+.ZN XcmsDefaultCCC
+function returns the default CCC for the specified screen.
+Its visual is the default visual of the screen.
+Its initial gamut compression and white point
+adjustment procedures as well as the associated client data are implementation
+specific.
+.SH "SEE ALSO"
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsSetWhitePoint(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsQueryBlack.man b/libX11/man/XcmsQueryBlack.man
index 3874acedd..4c65f9008 100644
--- a/libX11/man/XcmsQueryBlack.man
+++ b/libX11/man/XcmsQueryBlack.man
@@ -1,205 +1,144 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsQueryBlack __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsQueryBlack, XcmsQueryBlue, XcmsQueryGreen, XcmsQueryRed, XcmsQueryWhite \- obtain black, blue, green, red, and white CCC color specifications

-.SH SYNTAX

-.HP

-Status XcmsQueryBlack\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsQueryBlue\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsQueryGreen\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsQueryRed\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsQueryWhite\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat

-\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-Note that the CCC's Client White Point and White Point Adjustment procedures

-are ignored.

-.ds Cs

-.IP \fIcolor_return\fP 1i

-Returns the color specification in the specified target format

-for \*(Cs.

-The white point associated with the returned

-color specification is the Screen White Point.

-The value returned in the pixel member is undefined.

-.IP \fItarget_format\fP 1i

-Specifies the target color specification format.

-.SH DESCRIPTION

-The

-.ZN XcmsQueryBlack

-function returns the color specification in the specified target format

-for zero-intensity red, green, and blue.

-.LP

-The

-.ZN XcmsQueryBlue

-function returns the color specification in the specified target format

-for full-intensity blue while red and green are zero.

-.LP

-The

-.ZN XcmsQueryGreen

-function returns the color specification in the specified target format

-for full-intensity green while red and blue are zero.

-.LP

-The

-.ZN XcmsQueryRed

-function returns the color specification in the specified target format

-for full-intensity red while green and blue are zero.

-.LP

-The

-.ZN XcmsQueryWhite

-function returns the color specification in the specified target format

-for full-intensity red, green, and blue.

-.SH "SEE ALSO"

-XcmsCIELabQueryMaxC(__libmansuffix__),

-XcmsCIELuvQueryMaxC(__libmansuffix__),

-XcmsTekHVCQueryMaxC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsQueryBlack __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsQueryBlack, XcmsQueryBlue, XcmsQueryGreen, XcmsQueryRed, XcmsQueryWhite \- obtain black, blue, green, red, and white CCC color specifications
+.SH SYNTAX
+.HP
+Status XcmsQueryBlack\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryBlue\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryGreen\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryRed\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsQueryWhite\^(\^XcmsCCC \fIccc\fP\^, XcmsColorFormat
+\fItarget_format\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+Note that the CCC's Client White Point and White Point Adjustment procedures
+are ignored.
+.ds Cs
+.IP \fIcolor_return\fP 1i
+Returns the color specification in the specified target format
+for \*(Cs.
+The white point associated with the returned
+color specification is the Screen White Point.
+The value returned in the pixel member is undefined.
+.IP \fItarget_format\fP 1i
+Specifies the target color specification format.
+.SH DESCRIPTION
+The
+.ZN XcmsQueryBlack
+function returns the color specification in the specified target format
+for zero-intensity red, green, and blue.
+.LP
+The
+.ZN XcmsQueryBlue
+function returns the color specification in the specified target format
+for full-intensity blue while red and green are zero.
+.LP
+The
+.ZN XcmsQueryGreen
+function returns the color specification in the specified target format
+for full-intensity green while red and blue are zero.
+.LP
+The
+.ZN XcmsQueryRed
+function returns the color specification in the specified target format
+for full-intensity red while green and blue are zero.
+.LP
+The
+.ZN XcmsQueryWhite
+function returns the color specification in the specified target format
+for full-intensity red, green, and blue.
+.SH "SEE ALSO"
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsTekHVCQueryMaxC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsQueryColor.man b/libX11/man/XcmsQueryColor.man
index 9cba008b0..cc4742aed 100644
--- a/libX11/man/XcmsQueryColor.man
+++ b/libX11/man/XcmsQueryColor.man
@@ -1,266 +1,205 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsQueryColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsQueryColor, XcmsQueryColors, XcmsLookupColor \- obtain color values

-.SH SYNTAX

-.HP

-Status XcmsQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 

-.HP

-Status XcmsQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^, XcmsColor \fIcolors_in_out\fP\^[\^]\^, unsigned int

-\fIncolors\fP\^, XcmsColorFormat \fIresult_format\fP\^); 

-.HP

-Status XcmsLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor

-*\fIcolor_exact_return\fP\^, XcmsColor *\fIcolor_screen_return\fP\^,

-XcmsColorFormat \fIresult_format\fP\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIcolor_exact_return\fP 1i

-Returns the color specification parsed from the color string

-or parsed from the corresponding string found in a color-name database.

-.IP \fIcolor_in_out\fP 1i

-Specifies the pixel member that indicates the color cell to query.

-The color specification stored for the color cell is returned in this

-.ZN XcmsColor

-structure.

-.IP \fIcolor_screen_return\fP 1i

-Returns the color that can be reproduced on the screen.

-.ds St

-.IP \fIcolor_string\fP 1i

-Specifies the color string\*(St.

-.IP \fIresult_format\fP 1i

-Specifies the color format for the returned color

-specifications (color_screen_return and color_exact_return arguments).

-If the format is

-.ZN XcmsUndefinedFormat

-and the color string contains a

-numerical color specification,

-the specification is returned in the format used in that numerical

-color specification.

-If the format is

-.ZN XcmsUndefinedFormat

-and the color string contains a color name,

-the specification is returned in the format used 

-to store the color in the database.

-.IP \fIncolors\fP 1i

-Specifies the number of 

-.ZN XcmsColor

-structures in the color-specification array.

-.SH DESCRIPTION

-The

-.ZN XcmsQueryColor

-function obtains the RGB value

-for the pixel value in the pixel member of the specified

-.ZN XcmsColor

-structure and then

-converts the value to the target format as

-specified by the result_format argument.

-If the pixel is not a valid index in the specified colormap, a

-.ZN BadValue

-error results.

-The

-.ZN XcmsQueryColors

-function obtains the RGB values

-for pixel values in the pixel members of

-.ZN XcmsColor

-structures and then

-converts the values to the target format as

-specified by the result_format argument.

-If a pixel is not a valid index into the specified colormap, a

-.ZN BadValue

-error results.

-If more than one pixel is in error,

-the one that gets reported is arbitrary.

-.LP

-.ZN XcmsQueryColor

-and

-.ZN XcmsQueryColors

-can generate

-.ZN BadColor

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XcmsLookupColor

-function looks up the string name of a color with respect to the screen

-associated with the specified colormap.

-It returns both the exact color values and

-the closest values provided by the screen 

-with respect to the visual type of the specified colormap.

-The values are returned in the format specified by result_format.

-If the color name is not in the Host Portable Character Encoding, 

-the result is implementation-dependent.

-Use of uppercase or lowercase does not matter.

-.ZN XcmsLookupColor

-returns

-.ZN XcmsSuccess

-or

-.ZN XcmsSuccessWithCompression

-if the name is resolved; otherwise, it returns

-.ZN XcmsFailure .

-If

-.ZN XcmsSuccessWithCompression

-is returned, the color specification returned in 

-color_screen_return is the result of gamut compression.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XcmsAllocColor(__libmansuffix__),

-XcmsStoreColor(__libmansuffix__),

-XQueryColor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsQueryColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsQueryColor, XcmsQueryColors, XcmsLookupColor \- obtain color values
+.SH SYNTAX
+.HP
+Status XcmsQueryColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor_in_out\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsQueryColors\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsColor \fIcolors_in_out\fP\^[\^]\^, unsigned int
+\fIncolors\fP\^, XcmsColorFormat \fIresult_format\fP\^); 
+.HP
+Status XcmsLookupColor\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, char *\fIcolor_string\fP\^, XcmsColor
+*\fIcolor_exact_return\fP\^, XcmsColor *\fIcolor_screen_return\fP\^,
+XcmsColorFormat \fIresult_format\fP\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIcolor_exact_return\fP 1i
+Returns the color specification parsed from the color string
+or parsed from the corresponding string found in a color-name database.
+.IP \fIcolor_in_out\fP 1i
+Specifies the pixel member that indicates the color cell to query.
+The color specification stored for the color cell is returned in this
+.ZN XcmsColor
+structure.
+.IP \fIcolor_screen_return\fP 1i
+Returns the color that can be reproduced on the screen.
+.ds St
+.IP \fIcolor_string\fP 1i
+Specifies the color string\*(St.
+.IP \fIresult_format\fP 1i
+Specifies the color format for the returned color
+specifications (color_screen_return and color_exact_return arguments).
+If the format is
+.ZN XcmsUndefinedFormat
+and the color string contains a
+numerical color specification,
+the specification is returned in the format used in that numerical
+color specification.
+If the format is
+.ZN XcmsUndefinedFormat
+and the color string contains a color name,
+the specification is returned in the format used 
+to store the color in the database.
+.IP \fIncolors\fP 1i
+Specifies the number of 
+.ZN XcmsColor
+structures in the color-specification array.
+.SH DESCRIPTION
+The
+.ZN XcmsQueryColor
+function obtains the RGB value
+for the pixel value in the pixel member of the specified
+.ZN XcmsColor
+structure and then
+converts the value to the target format as
+specified by the result_format argument.
+If the pixel is not a valid index in the specified colormap, a
+.ZN BadValue
+error results.
+The
+.ZN XcmsQueryColors
+function obtains the RGB values
+for pixel values in the pixel members of
+.ZN XcmsColor
+structures and then
+converts the values to the target format as
+specified by the result_format argument.
+If a pixel is not a valid index into the specified colormap, a
+.ZN BadValue
+error results.
+If more than one pixel is in error,
+the one that gets reported is arbitrary.
+.LP
+.ZN XcmsQueryColor
+and
+.ZN XcmsQueryColors
+can generate
+.ZN BadColor
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XcmsLookupColor
+function looks up the string name of a color with respect to the screen
+associated with the specified colormap.
+It returns both the exact color values and
+the closest values provided by the screen 
+with respect to the visual type of the specified colormap.
+The values are returned in the format specified by result_format.
+If the color name is not in the Host Portable Character Encoding, 
+the result is implementation-dependent.
+Use of uppercase or lowercase does not matter.
+.ZN XcmsLookupColor
+returns
+.ZN XcmsSuccess
+or
+.ZN XcmsSuccessWithCompression
+if the name is resolved; otherwise, it returns
+.ZN XcmsFailure .
+If
+.ZN XcmsSuccessWithCompression
+is returned, the color specification returned in 
+color_screen_return is the result of gamut compression.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XcmsAllocColor(__libmansuffix__),
+XcmsStoreColor(__libmansuffix__),
+XQueryColor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsSetWhitePoint.man b/libX11/man/XcmsSetWhitePoint.man
index 7298d52f2..c44b7dee1 100644
--- a/libX11/man/XcmsSetWhitePoint.man
+++ b/libX11/man/XcmsSetWhitePoint.man
@@ -1,197 +1,136 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsSetWhitePoint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsSetWhitePoint, XcmsSetWhiteAdjustProc \- modifying CCC attributes

-.SH SYNTAX

-.HP

-Status XcmsSetWhitePoint\^(\^XcmsCCC \fIccc\fP\^, XcmsColor *\fIcolor\fP\^); 

-.HP

-XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc\^(\^XcmsCCC \fIccc\fP\^,

-XcmsWhiteAdjustProc \fIwhite_adjust_proc\fP\^, XPointer \fIclient_data\fP\^); 

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-.ds Cd the white point adjustment procedure

-.IP \fIclient_data\fP 1i

-Specifies client data for \*(Cd or NULL.

-.ds Co new Client White Point

-.IP \fIcolor\fP 1i

-Specifies the \*(Co.

-.IP \fIwhite_adjust_proc\fP 1i

-Specifies the white point adjustment procedure.

-.SH DESCRIPTION

-The

-.ZN XcmsSetWhitePoint

-function changes the Client White Point in the specified CCC.

-Note that the pixel member is ignored 

-and that the color specification is left unchanged upon return.

-The format for the new white point must be

-.ZN XcmsCIEXYZFormat ,

-.ZN XcmsCIEuvYFormat ,

-.ZN XcmsCIExyYFormat ,

-or

-.ZN XcmsUndefinedFormat .

-If the color argument is NULL, this function sets the format component of the

-Client White Point specification to

-.ZN XcmsUndefinedFormat ,

-indicating that the Client White Point is assumed to be the same as the

-Screen White Point.

-.LP

-This function returns nonzero status

-if the format for the new white point is valid;

-otherwise, it returns zero.

-

-.LP

-The

-.ZN XcmsSetWhiteAdjustProc

-function first sets the white point adjustment procedure and client data 

-in the specified CCC with the newly specified procedure and client data

-and then returns the old procedure.

-.SH "SEE ALSO"

-DisplayOfCCC(__libmansuffix__),

-XcmsCCCOfColormap(__libmansuffix__),

-XcmsConvertColors(__libmansuffix__),

-XcmsCreateCCC(__libmansuffix__),

-XcmsDefaultCCC(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsSetWhitePoint __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsSetWhitePoint, XcmsSetWhiteAdjustProc \- modifying CCC attributes
+.SH SYNTAX
+.HP
+Status XcmsSetWhitePoint\^(\^XcmsCCC \fIccc\fP\^, XcmsColor *\fIcolor\fP\^); 
+.HP
+XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc\^(\^XcmsCCC \fIccc\fP\^,
+XcmsWhiteAdjustProc \fIwhite_adjust_proc\fP\^, XPointer \fIclient_data\fP\^); 
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+.ds Cd the white point adjustment procedure
+.IP \fIclient_data\fP 1i
+Specifies client data for \*(Cd or NULL.
+.ds Co new Client White Point
+.IP \fIcolor\fP 1i
+Specifies the \*(Co.
+.IP \fIwhite_adjust_proc\fP 1i
+Specifies the white point adjustment procedure.
+.SH DESCRIPTION
+The
+.ZN XcmsSetWhitePoint
+function changes the Client White Point in the specified CCC.
+Note that the pixel member is ignored 
+and that the color specification is left unchanged upon return.
+The format for the new white point must be
+.ZN XcmsCIEXYZFormat ,
+.ZN XcmsCIEuvYFormat ,
+.ZN XcmsCIExyYFormat ,
+or
+.ZN XcmsUndefinedFormat .
+If the color argument is NULL, this function sets the format component of the
+Client White Point specification to
+.ZN XcmsUndefinedFormat ,
+indicating that the Client White Point is assumed to be the same as the
+Screen White Point.
+.LP
+This function returns nonzero status
+if the format for the new white point is valid;
+otherwise, it returns zero.
+
+.LP
+The
+.ZN XcmsSetWhiteAdjustProc
+function first sets the white point adjustment procedure and client data 
+in the specified CCC with the newly specified procedure and client data
+and then returns the old procedure.
+.SH "SEE ALSO"
+DisplayOfCCC(__libmansuffix__),
+XcmsCCCOfColormap(__libmansuffix__),
+XcmsConvertColors(__libmansuffix__),
+XcmsCreateCCC(__libmansuffix__),
+XcmsDefaultCCC(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsStoreColor.man b/libX11/man/XcmsStoreColor.man
index d49c7efdd..58282886e 100644
--- a/libX11/man/XcmsStoreColor.man
+++ b/libX11/man/XcmsStoreColor.man
@@ -1,306 +1,245 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsStoreColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsStoreColor, XcmsStoreColors \- set colors

-.SH SYNTAX

-.HP

-Status XcmsStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,

-XcmsColor *\fIcolor\fP\^); 

-.HP

-Status XcmsStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap

-\fIcolormap\fP\^, XcmsColor \fIcolors\fP\^[\^]\^, int \fIncolors\fP\^, Bool

-\fIcompression_flags_return\fP\^[\^]\^); 

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIcolor\fP 1i

-Specifies the color cell and the color to store.

-Values specified in this

-.ZN XcmsColor

-structure remain unchanged on return.

-.IP \fIcolors\fP 1i

-Specifies the color specification array of

-.ZN XcmsColor

-structures, each specifying a color cell and the color to store in that

-cell.

-Values specified in the array remain unchanged upon return.

-.IP \fIcolormap\fP 1i

-Specifies the colormap.

-.IP \fIcompression_flags_return\fP 1i

-Returns an array of Boolean values indicating compression status.

-If a non-NULL pointer is supplied,

-each element of the array is set to

-.ZN True

-if the corresponding color was compressed and

-.ZN False

-otherwise.

-Pass NULL if the compression status is not useful.

-.IP \fIncolors\fP 1i

-Specifies the number of 

-.ZN XcmsColor

-structures in the color-specification array.

-.SH DESCRIPTION

-The

-.ZN XcmsStoreColor

-function converts the color specified in the

-.ZN XcmsColor

-structure into RGB values.

-It then uses this RGB specification in an

-.ZN XColor

-structure, whose three flags 

-.Pn ( DoRed , 

-.ZN DoGreen ,

-and

-.ZN DoBlue )

-are set, in a call to

-.ZN XStoreColor

-to change the color cell specified by the pixel member of the

-.ZN XcmsColor

-structure.

-This pixel value must be a valid index for the specified colormap,

-and the color cell specified by the pixel value must be a read/write cell.

-If the pixel value is not a valid index, a

-.ZN BadValue

-error results.

-If the color cell is unallocated or is allocated read-only, a

-.ZN BadAccess

-error results.

-If the colormap is an installed map for its screen, 

-the changes are visible immediately.

-.LP

-Note that 

-.ZN XStoreColor

-has no return value; therefore, an

-.ZN XcmsSuccess

-return value from this function indicates that the conversion 

-to RGB succeeded and the call to

-.ZN XStoreColor

-was made.

-To obtain the actual color stored, use

-.ZN XcmsQueryColor .

-Because of the screen's hardware limitations or gamut compression,

-the color stored in the colormap may not be identical

-to the color specified.

-.LP

-.ZN XcmsStoreColor

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-and

-.ZN BadValue

-errors.

-.LP

-The

-.ZN XcmsStoreColors

-function converts the colors specified in the array of

-.ZN XcmsColor

-structures into RGB values and then uses these RGB specifications in

-.ZN XColor

-structures, whose three flags 

-.Pn ( DoRed , 

-.ZN DoGreen ,

-and

-.ZN DoBlue )

-are set, in a call to

-.ZN XStoreColors

-to change the color cells specified by the pixel member of the corresponding

-.ZN XcmsColor

-structure.

-Each pixel value must be a valid index for the specified colormap,

-and the color cell specified by each pixel value must be a read/write cell.

-If a pixel value is not a valid index, a

-.ZN BadValue

-error results.

-If a color cell is unallocated or is allocated read-only, a

-.ZN BadAccess

-error results.

-If more than one pixel is in error,

-the one that gets reported is arbitrary.

-If the colormap is an installed map for its screen, 

-the changes are visible immediately.

-.LP

-Note that 

-.ZN XStoreColors

-has no return value; therefore, an

-.ZN XcmsSuccess

-return value from this function indicates that conversions 

-to RGB succeeded and the call to

-.ZN XStoreColors

-was made.

-To obtain the actual colors stored, use

-.ZN XcmsQueryColors .

-Because of the screen's hardware limitations or gamut compression,

-the colors stored in the colormap may not be identical

-to the colors specified.

-.LP

-.LP

-.ZN XcmsStoreColors

-can generate

-.ZN BadAccess ,

-.ZN BadColor ,

-and

-.ZN BadValue

-errors.

-.SH DIAGNOSTICS

-.TP 1i

-.ZN BadAccess

-A client attempted

-to free a color map entry that it did not already allocate.

-.TP 1i

-.ZN BadAccess

-A client attempted

-to store into a read-only color map entry.

-.TP 1i

-.ZN BadColor

-A value for a Colormap argument does not name a defined Colormap.

-.TP 1i

-.ZN BadValue

-Some numeric value falls outside the range of values accepted by the request.

-Unless a specific range is specified for an argument, the full range defined

-by the argument's type is accepted.  Any argument defined as a set of

-alternatives can generate this error.

-.SH "SEE ALSO"

-XcmsAllocColor(__libmansuffix__),

-XcmsQueryColor(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsStoreColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsStoreColor, XcmsStoreColors \- set colors
+.SH SYNTAX
+.HP
+Status XcmsStoreColor\^(\^Display *\fIdisplay\fP\^, Colormap \fIcolormap\fP\^,
+XcmsColor *\fIcolor\fP\^); 
+.HP
+Status XcmsStoreColors\^(\^Display *\fIdisplay\fP\^, Colormap
+\fIcolormap\fP\^, XcmsColor \fIcolors\fP\^[\^]\^, int \fIncolors\fP\^, Bool
+\fIcompression_flags_return\fP\^[\^]\^); 
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIcolor\fP 1i
+Specifies the color cell and the color to store.
+Values specified in this
+.ZN XcmsColor
+structure remain unchanged on return.
+.IP \fIcolors\fP 1i
+Specifies the color specification array of
+.ZN XcmsColor
+structures, each specifying a color cell and the color to store in that
+cell.
+Values specified in the array remain unchanged upon return.
+.IP \fIcolormap\fP 1i
+Specifies the colormap.
+.IP \fIcompression_flags_return\fP 1i
+Returns an array of Boolean values indicating compression status.
+If a non-NULL pointer is supplied,
+each element of the array is set to
+.ZN True
+if the corresponding color was compressed and
+.ZN False
+otherwise.
+Pass NULL if the compression status is not useful.
+.IP \fIncolors\fP 1i
+Specifies the number of 
+.ZN XcmsColor
+structures in the color-specification array.
+.SH DESCRIPTION
+The
+.ZN XcmsStoreColor
+function converts the color specified in the
+.ZN XcmsColor
+structure into RGB values.
+It then uses this RGB specification in an
+.ZN XColor
+structure, whose three flags 
+.Pn ( DoRed , 
+.ZN DoGreen ,
+and
+.ZN DoBlue )
+are set, in a call to
+.ZN XStoreColor
+to change the color cell specified by the pixel member of the
+.ZN XcmsColor
+structure.
+This pixel value must be a valid index for the specified colormap,
+and the color cell specified by the pixel value must be a read/write cell.
+If the pixel value is not a valid index, a
+.ZN BadValue
+error results.
+If the color cell is unallocated or is allocated read-only, a
+.ZN BadAccess
+error results.
+If the colormap is an installed map for its screen, 
+the changes are visible immediately.
+.LP
+Note that 
+.ZN XStoreColor
+has no return value; therefore, an
+.ZN XcmsSuccess
+return value from this function indicates that the conversion 
+to RGB succeeded and the call to
+.ZN XStoreColor
+was made.
+To obtain the actual color stored, use
+.ZN XcmsQueryColor .
+Because of the screen's hardware limitations or gamut compression,
+the color stored in the colormap may not be identical
+to the color specified.
+.LP
+.ZN XcmsStoreColor
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+and
+.ZN BadValue
+errors.
+.LP
+The
+.ZN XcmsStoreColors
+function converts the colors specified in the array of
+.ZN XcmsColor
+structures into RGB values and then uses these RGB specifications in
+.ZN XColor
+structures, whose three flags 
+.Pn ( DoRed , 
+.ZN DoGreen ,
+and
+.ZN DoBlue )
+are set, in a call to
+.ZN XStoreColors
+to change the color cells specified by the pixel member of the corresponding
+.ZN XcmsColor
+structure.
+Each pixel value must be a valid index for the specified colormap,
+and the color cell specified by each pixel value must be a read/write cell.
+If a pixel value is not a valid index, a
+.ZN BadValue
+error results.
+If a color cell is unallocated or is allocated read-only, a
+.ZN BadAccess
+error results.
+If more than one pixel is in error,
+the one that gets reported is arbitrary.
+If the colormap is an installed map for its screen, 
+the changes are visible immediately.
+.LP
+Note that 
+.ZN XStoreColors
+has no return value; therefore, an
+.ZN XcmsSuccess
+return value from this function indicates that conversions 
+to RGB succeeded and the call to
+.ZN XStoreColors
+was made.
+To obtain the actual colors stored, use
+.ZN XcmsQueryColors .
+Because of the screen's hardware limitations or gamut compression,
+the colors stored in the colormap may not be identical
+to the colors specified.
+.LP
+.LP
+.ZN XcmsStoreColors
+can generate
+.ZN BadAccess ,
+.ZN BadColor ,
+and
+.ZN BadValue
+errors.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadAccess
+A client attempted
+to free a color map entry that it did not already allocate.
+.TP 1i
+.ZN BadAccess
+A client attempted
+to store into a read-only color map entry.
+.TP 1i
+.ZN BadColor
+A value for a Colormap argument does not name a defined Colormap.
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted.  Any argument defined as a set of
+alternatives can generate this error.
+.SH "SEE ALSO"
+XcmsAllocColor(__libmansuffix__),
+XcmsQueryColor(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XcmsTekHVCQueryMaxC.man b/libX11/man/XcmsTekHVCQueryMaxC.man
index 2f868778a..5d682ccb2 100644
--- a/libX11/man/XcmsTekHVCQueryMaxC.man
+++ b/libX11/man/XcmsTekHVCQueryMaxC.man
@@ -1,243 +1,182 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XcmsTekHVCQueryMaxC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XcmsTekHVCQueryMaxC, XcmsTekHVCQueryMaxV, XcmsTekHVCQueryMaxVC, XcmsTekHVCQueryMaxVSamples, XcmsTekHVCQueryMinV \- obtain the TekHVC coordinates

-.SH SYNTAX

-.HP

-Status XcmsTekHVCQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,

-XcmsFloat \fIvalue\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsTekHVCQueryMaxV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,

-XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsTekHVCQueryMaxVC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,

-XcmsColor *\fIcolor_return\fP\^); 

-.HP

-Status XcmsTekHVCQueryMaxVSamples\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat

-\fIhue\fP\^, XcmsColor \fIcolors_return[]\fP\^, unsigned int

-\fInsamples\fP\^); 

-.HP

-Status XcmsTekHVCQueryMinV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,

-XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIccc\fP 1i

-Specifies the CCC.

-Note that the CCC's Client White Point and White Point Adjustment procedures

-are ignored.

-.ds Ch maximum Value (MaxV)

-.IP \fIchroma\fP 1i

-Specifies the chroma at which to find \*(Ch.

-.IP \fIcolors_return\fP 1i

-Returns nsamples of color specifications in XcmsTekHVC

-such that the Chroma is the maximum attainable for the Value and Hue.

-The white point associated with the returned

-color specification is the Screen White Point.

-The value returned in the pixel member is undefined.

-.ds Lc maximum Chroma along with the actual Hue and Value (MaxC), \

-maximum Value along with the Hue and Chroma (MaxV), \

-color specification in XcmsTekHVC for the maximum Chroma, \

-the Value at which that maximum Chroma is reached and actual Hue (MaxVC) \

-or minimum Value and the actual Hue and Chroma (MinL)

-.ds lC maximum Chroma (MaxC and MaxVC), maximum Value (MaxV), or \

-minimum Value (MinL)

-.IP \fIcolor_return\fP 1i

-Returns the \*(Lc at which the \*(lC was found.

-The white point associated with the returned

-color specification is the Screen White Point.

-The value returned in the pixel member is undefined.

-.ds Hu in which to find the maximum Chroma (MaxC and MaxVC), \

-maximum Value (MaxV), the maximum Chroma/Value samples (MaxVSamples), \

-or the minimum Value (MinL)

-.IP \fIhue\fP 1i

-Specifies the Hue \*(Hu.

-.IP \fInsamples\fP 1i

-Specifies the number of samples.

-.ds Va maximum Chroma (MaxC) or minimum Value (MinL)

-.IP \fIvalue\fP 1i

-Specifies the Value in which to find the \*(Va.

-.SH DESCRIPTION

-The

-.ZN XcmsTekHVCQueryMaxC

-function, given a Hue and Value,

-determines the maximum Chroma in TekHVC color space

-displayable by the screen.

-It returns the maximum Chroma along with the actual Hue

-and Value at which the maximum Chroma was found.

-.LP

-The

-.ZN XcmsTekHVCQueryMaxV

-function, given a Hue and Chroma,

-determines the maximum Value in TekHVC color space

-displayable by the screen.

-It returns the maximum Value and the actual Hue and Chroma

-at which the maximum Value was found.

-.LP

-The

-.ZN XcmsTekHVCQueryMaxVC

-function, given a Hue,

-determines the maximum Chroma in TekHVC color space displayable by the screen

-and the Value at which that maximum Chroma is reached.

-It returns the maximum Chroma,

-the Value at which that maximum Chroma is reached,

-and the actual Hue for which the maximum Chroma was found.

-.LP

-The

-.ZN XcmsTekHVCQueryMaxVSamples

-returns nsamples of maximum Value, the Chroma at which that maximum Value

-is reached, and the actual Hue for which the maximum Chroma was found.

-These sample points may then be used to plot the maximum Value/Chroma

-boundary of the screen's color gamut for the specified Hue in TekHVC color

-space.

-.LP

-The

-.ZN XcmsTekHVCQueryMinV

-function, given a Hue and Chroma,

-determines the minimum Value in TekHVC color space displayable by the screen.

-It returns the minimum Value and the actual Hue and Chroma at which

-the minimum Value was found.

-.SH "SEE ALSO"

-XcmsCIELabQueryMaxC(__libmansuffix__),

-XcmsCIELuvQueryMaxC(__libmansuffix__),

-XcmsQueryBlack(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XcmsTekHVCQueryMaxC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XcmsTekHVCQueryMaxC, XcmsTekHVCQueryMaxV, XcmsTekHVCQueryMaxVC, XcmsTekHVCQueryMaxVSamples, XcmsTekHVCQueryMinV \- obtain the TekHVC coordinates
+.SH SYNTAX
+.HP
+Status XcmsTekHVCQueryMaxC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIvalue\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxVC\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsColor *\fIcolor_return\fP\^); 
+.HP
+Status XcmsTekHVCQueryMaxVSamples\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat
+\fIhue\fP\^, XcmsColor \fIcolors_return[]\fP\^, unsigned int
+\fInsamples\fP\^); 
+.HP
+Status XcmsTekHVCQueryMinV\^(\^XcmsCCC \fIccc\fP\^, XcmsFloat \fIhue\fP\^,
+XcmsFloat \fIchroma\fP\^, XcmsColor *\fIcolor_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIccc\fP 1i
+Specifies the CCC.
+Note that the CCC's Client White Point and White Point Adjustment procedures
+are ignored.
+.ds Ch maximum Value (MaxV)
+.IP \fIchroma\fP 1i
+Specifies the chroma at which to find \*(Ch.
+.IP \fIcolors_return\fP 1i
+Returns nsamples of color specifications in XcmsTekHVC
+such that the Chroma is the maximum attainable for the Value and Hue.
+The white point associated with the returned
+color specification is the Screen White Point.
+The value returned in the pixel member is undefined.
+.ds Lc maximum Chroma along with the actual Hue and Value (MaxC), \
+maximum Value along with the Hue and Chroma (MaxV), \
+color specification in XcmsTekHVC for the maximum Chroma, \
+the Value at which that maximum Chroma is reached and actual Hue (MaxVC) \
+or minimum Value and the actual Hue and Chroma (MinL)
+.ds lC maximum Chroma (MaxC and MaxVC), maximum Value (MaxV), or \
+minimum Value (MinL)
+.IP \fIcolor_return\fP 1i
+Returns the \*(Lc at which the \*(lC was found.
+The white point associated with the returned
+color specification is the Screen White Point.
+The value returned in the pixel member is undefined.
+.ds Hu in which to find the maximum Chroma (MaxC and MaxVC), \
+maximum Value (MaxV), the maximum Chroma/Value samples (MaxVSamples), \
+or the minimum Value (MinL)
+.IP \fIhue\fP 1i
+Specifies the Hue \*(Hu.
+.IP \fInsamples\fP 1i
+Specifies the number of samples.
+.ds Va maximum Chroma (MaxC) or minimum Value (MinL)
+.IP \fIvalue\fP 1i
+Specifies the Value in which to find the \*(Va.
+.SH DESCRIPTION
+The
+.ZN XcmsTekHVCQueryMaxC
+function, given a Hue and Value,
+determines the maximum Chroma in TekHVC color space
+displayable by the screen.
+It returns the maximum Chroma along with the actual Hue
+and Value at which the maximum Chroma was found.
+.LP
+The
+.ZN XcmsTekHVCQueryMaxV
+function, given a Hue and Chroma,
+determines the maximum Value in TekHVC color space
+displayable by the screen.
+It returns the maximum Value and the actual Hue and Chroma
+at which the maximum Value was found.
+.LP
+The
+.ZN XcmsTekHVCQueryMaxVC
+function, given a Hue,
+determines the maximum Chroma in TekHVC color space displayable by the screen
+and the Value at which that maximum Chroma is reached.
+It returns the maximum Chroma,
+the Value at which that maximum Chroma is reached,
+and the actual Hue for which the maximum Chroma was found.
+.LP
+The
+.ZN XcmsTekHVCQueryMaxVSamples
+returns nsamples of maximum Value, the Chroma at which that maximum Value
+is reached, and the actual Hue for which the maximum Chroma was found.
+These sample points may then be used to plot the maximum Value/Chroma
+boundary of the screen's color gamut for the specified Hue in TekHVC color
+space.
+.LP
+The
+.ZN XcmsTekHVCQueryMinV
+function, given a Hue and Chroma,
+determines the minimum Value in TekHVC color space displayable by the screen.
+It returns the minimum Value and the actual Hue and Chroma at which
+the minimum Value was found.
+.SH "SEE ALSO"
+XcmsCIELabQueryMaxC(__libmansuffix__),
+XcmsCIELuvQueryMaxC(__libmansuffix__),
+XcmsQueryBlack(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbDrawImageString.man b/libX11/man/XmbDrawImageString.man
index d7284da9b..6599f5002 100644
--- a/libX11/man/XmbDrawImageString.man
+++ b/libX11/man/XmbDrawImageString.man
@@ -1,216 +1,155 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbDrawImageString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set

-.SH SYNTAX

-.HP

-void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^); 

-.HP

-void XwcDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,

-wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^); 

-.HP

-void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^); 

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fInum_bytes\fP 1i

-Specifies the number of bytes in the string argument.

-.IP \fInum_wchars\fP 1i

-Specifies the number of characters in the string argument.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.ds Xy

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XmbDrawImageString ,

-.ZN XwcDrawImageString

-and

-.ZN Xutf8DrawImageString

-functions fill a destination rectangle with the background pixel defined

-in the GC and then paint the text with the foreground pixel.

-The filled rectangle is the rectangle returned to overall_logical_return by

-.ZN XmbTextExtents ,

-.ZN XwcTextExtents

-or 

-.ZN Xutf8TextExtents

-for the same text and 

-.ZN XFontSet .

-.LP

-When the 

-.ZN XFontSet

-has missing charsets, each unavailable character is drawn 

-with the default string returned by 

-.ZN XCreateFontSet .

-The behavior for an invalid codepoint is undefined.

-.LP

-The function

-.ZN Xutf8TextExtents

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XDrawImageString(__libmansuffix__),

-XDrawString(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XmbDrawString(__libmansuffix__),

-XmbDrawText(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbDrawImageString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbDrawImageString, XwcDrawImageString, Xutf8DrawImageString \- draw image text using a single font set
+.SH SYNTAX
+.HP
+void XmbDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
+.HP
+void XwcDrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^,
+wchar_t *\fIstring\fP\^, int \fInum_wchars\fP\^); 
+.HP
+void Xutf8DrawImageString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fInum_bytes\fP 1i
+Specifies the number of bytes in the string argument.
+.IP \fInum_wchars\fP 1i
+Specifies the number of characters in the string argument.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.ds Xy
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XmbDrawImageString ,
+.ZN XwcDrawImageString
+and
+.ZN Xutf8DrawImageString
+functions fill a destination rectangle with the background pixel defined
+in the GC and then paint the text with the foreground pixel.
+The filled rectangle is the rectangle returned to overall_logical_return by
+.ZN XmbTextExtents ,
+.ZN XwcTextExtents
+or 
+.ZN Xutf8TextExtents
+for the same text and 
+.ZN XFontSet .
+.LP
+When the 
+.ZN XFontSet
+has missing charsets, each unavailable character is drawn 
+with the default string returned by 
+.ZN XCreateFontSet .
+The behavior for an invalid codepoint is undefined.
+.LP
+The function
+.ZN Xutf8TextExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawString(__libmansuffix__),
+XmbDrawText(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbDrawString.man b/libX11/man/XmbDrawString.man
index 0e15cf0bd..1c608d619 100644
--- a/libX11/man/XmbDrawString.man
+++ b/libX11/man/XmbDrawString.man
@@ -1,207 +1,146 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbDrawString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set

-.SH SYNTAX

-.HP

-void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet

-\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^); 

-.HP

-void XwcDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet

-\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t

-*\fIstring\fP\^, int \fInum_wchars\fP\^); 

-.HP

-void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,

-XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^);

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fInum_bytes\fP 1i

-Specifies the number of bytes in the string argument.

-.IP \fInum_wchars\fP 1i

-Specifies the number of characters in the string argument.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.ds Xy

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XmbDrawString ,

-.ZN XwcDrawString

-and

-.ZN Xutf8DrawString

-functions draw the specified text with the foreground pixel.

-When the 

-.ZN XFontSet

-has missing charsets, each unavailable character is drawn 

-with the default string returned by 

-.ZN XCreateFontSet .

-The behavior for an invalid codepoint is undefined.

-.LP

-The function

-.ZN Xutf8DrawString

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XDrawImageString(__libmansuffix__),

-XDrawString(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XmbDrawImageString(__libmansuffix__),

-XmbDrawText(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbDrawString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbDrawString, XwcDrawString, Xutf8DrawString \- draw text using a single font set
+.SH SYNTAX
+.HP
+void XmbDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^); 
+.HP
+void XwcDrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, XFontSet
+\fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, wchar_t
+*\fIstring\fP\^, int \fInum_wchars\fP\^); 
+.HP
+void Xutf8DrawString\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^,
+XFontSet \fIfont_set\fP\^, GC \fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^);
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fInum_bytes\fP 1i
+Specifies the number of bytes in the string argument.
+.IP \fInum_wchars\fP 1i
+Specifies the number of characters in the string argument.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.ds Xy
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XmbDrawString ,
+.ZN XwcDrawString
+and
+.ZN Xutf8DrawString
+functions draw the specified text with the foreground pixel.
+When the 
+.ZN XFontSet
+has missing charsets, each unavailable character is drawn 
+with the default string returned by 
+.ZN XCreateFontSet .
+The behavior for an invalid codepoint is undefined.
+.LP
+The function
+.ZN Xutf8DrawString
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawImageString(__libmansuffix__),
+XmbDrawText(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbDrawText.man b/libX11/man/XmbDrawText.man
index 02b18301e..81bd284a2 100644
--- a/libX11/man/XmbDrawText.man
+++ b/libX11/man/XmbDrawText.man
@@ -1,255 +1,190 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbDrawText __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets 

-.SH SYNTAX

-.HP

-void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int

-\fInitems\fP\^); 

-.HP

-void XwcDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int

-\fInitems\fP\^); 

-.HP

-void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC

-\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);

-.SH ARGUMENTS

-.IP \fId\fP 1i

-Specifies the drawable. 

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIgc\fP 1i

-Specifies the GC.

-.IP \fIitems\fP 1i

-Specifies an array of text items.

-.IP \fInitems\fP 1i

-Specifies the number of text items in the array.

-.ds Xy

-.IP \fIx\fP 1i

-.br

-.ns

-.IP \fIy\fP 1i

-Specify the x and y coordinates\*(Xy.

-.SH DESCRIPTION

-The

-.ZN XmbDrawText ,

-.ZN XwcDrawText 

-and 

-.ZN Xutf8DrawText 

-functions allow complex spacing and font set shifts between text strings.

-Each text item is processed in turn, with the origin of a text

-element advanced in the primary draw direction by the escapement of the

-previous text item.

-A text item delta specifies an additional escapement of the text item

-drawing origin in the primary draw direction.

-A font_set member other than 

-.ZN None

-in an item causes the font set to be used for this and subsequent text items

-in the text_items list.

-Leading text items with a font_set member set to

-.ZN None

-will not be drawn.

-.LP

-.ZN XmbDrawText ,

-.ZN XwcDrawText

-and

-.ZN Xutf8DrawText

-do not perform any context-dependent rendering between text segments.

-Clients may compute the drawing metrics by passing each text segment to

-.ZN XmbTextExtents ,

-.ZN XwcTextExtents ,

-.ZN Xutf8TextExtents

-or

-.ZN XmbTextPerCharExtents ,

-.ZN XwcTextPerCharExtents .

-.ZN Xutf8TextPerCharExtents .

-When the 

-.ZN XFontSet

-has missing charsets, each unavailable character is drawn 

-with the default string returned by 

-.ZN XCreateFontSet .

-The behavior for an invalid codepoint is undefined.

-.LP

-The function

-.ZN Xutf8DrawText

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH STRUCTURES

-The

-.ZN XmbTextItem

-structure contains:

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	char *chars;	/\&* pointer to string */

-	int nchars;	/\&* number of bytes */

-	int delta;	/\&* pixel delta between strings */

-	XFontSet font_set; 	/\&* fonts, None means don't change */

-} XmbTextItem;

-.De

-The

-.ZN XwcTextItem

-structure contains:

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	wchar_t *chars;	/\&* pointer to wide char string */

-	int nchars;	/\&* number of wide characters */

-	int delta;	/\&* pixel delta between strings */

-	XFontSet font_set;	/\&* fonts, None means don't change */

-} XwcTextItem;

-.De

-.SH "SEE ALSO"

-XDrawImageString(__libmansuffix__),

-XDrawString(__libmansuffix__),

-XDrawText(__libmansuffix__),

-XmbDrawImageString(__libmansuffix__),

-XmbDrawString(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbDrawText __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbDrawText, XwcDrawText, Xutf8DrawText \- draw text using multiple font sets 
+.SH SYNTAX
+.HP
+void XmbDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int
+\fInitems\fP\^); 
+.HP
+void XwcDrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XwcTextItem *\fIitems\fP\^, int
+\fInitems\fP\^); 
+.HP
+void Xutf8DrawText\^(\^Display *\fIdisplay\fP\^, Drawable \fId\fP\^, GC
+\fIgc\fP\^, int \fIx\fP\^, int \fIy\fP\^, XmbTextItem *\fIitems\fP\^, int \fInitems\fP\^);
+.SH ARGUMENTS
+.IP \fId\fP 1i
+Specifies the drawable. 
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIgc\fP 1i
+Specifies the GC.
+.IP \fIitems\fP 1i
+Specifies an array of text items.
+.IP \fInitems\fP 1i
+Specifies the number of text items in the array.
+.ds Xy
+.IP \fIx\fP 1i
+.br
+.ns
+.IP \fIy\fP 1i
+Specify the x and y coordinates\*(Xy.
+.SH DESCRIPTION
+The
+.ZN XmbDrawText ,
+.ZN XwcDrawText 
+and 
+.ZN Xutf8DrawText 
+functions allow complex spacing and font set shifts between text strings.
+Each text item is processed in turn, with the origin of a text
+element advanced in the primary draw direction by the escapement of the
+previous text item.
+A text item delta specifies an additional escapement of the text item
+drawing origin in the primary draw direction.
+A font_set member other than 
+.ZN None
+in an item causes the font set to be used for this and subsequent text items
+in the text_items list.
+Leading text items with a font_set member set to
+.ZN None
+will not be drawn.
+.LP
+.ZN XmbDrawText ,
+.ZN XwcDrawText
+and
+.ZN Xutf8DrawText
+do not perform any context-dependent rendering between text segments.
+Clients may compute the drawing metrics by passing each text segment to
+.ZN XmbTextExtents ,
+.ZN XwcTextExtents ,
+.ZN Xutf8TextExtents
+or
+.ZN XmbTextPerCharExtents ,
+.ZN XwcTextPerCharExtents .
+.ZN Xutf8TextPerCharExtents .
+When the 
+.ZN XFontSet
+has missing charsets, each unavailable character is drawn 
+with the default string returned by 
+.ZN XCreateFontSet .
+The behavior for an invalid codepoint is undefined.
+.LP
+The function
+.ZN Xutf8DrawText
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH STRUCTURES
+The
+.ZN XmbTextItem
+structure contains:
+.Ds 0
+typedef struct {
+        char *chars;    /\&* pointer to string */
+        int nchars;     /\&* number of bytes */
+        int delta;      /\&* pixel delta between strings */
+        XFontSet font_set;      /\&* fonts, None means don't change */
+} XmbTextItem;
+.De
+The
+.ZN XwcTextItem
+structure contains:
+.Ds 0
+typedef struct {
+        wchar_t *chars; /\&* pointer to wide char string */
+        int nchars;     /\&* number of wide characters */
+        int delta;      /\&* pixel delta between strings */
+        XFontSet font_set;      /\&* fonts, None means don't change */
+} XwcTextItem;
+.De
+.SH "SEE ALSO"
+XDrawImageString(__libmansuffix__),
+XDrawString(__libmansuffix__),
+XDrawText(__libmansuffix__),
+XmbDrawImageString(__libmansuffix__),
+XmbDrawString(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbLookupString.man b/libX11/man/XmbLookupString.man
index 73897f5d2..c03a58291 100644
--- a/libX11/man/XmbLookupString.man
+++ b/libX11/man/XmbLookupString.man
@@ -1,311 +1,249 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XmbLookupString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method

-.SH SYNTAX

-.HP

-int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char

-*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym

-*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 

-.HP

-int XwcLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP\^,

-wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym

-*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 

-.HP

-int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char

-*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym

-*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIbuffer_return\fP 1i

-Returns a multibyte string or wide character string (if any)

-from the input method.

-.IP \fIbytes_buffer\fP 1i

-.br

-.ns

-.IP \fIwchars_buffer\fP 1i

-Specifies space available in the return buffer.

-.ds Ev key event to be used

-.IP \fIevent\fP 1i

-Specifies the \*(Ev.

-.IP \fIic\fP 1i

-Specifies the input context.

-.IP \fIkeysym_return\fP 1i

-Returns the KeySym computed from the event if this argument is not NULL.

-.IP \fIstatus_return\fP 1i

-Returns a value indicating what kind of data is returned.

-.SH DESCRIPTION

-The

-.ZN XmbLookupString ,

-.ZN XwcLookupString

-and

-.ZN Xutf8LookupString

-functions return the string from the input method specified

-in the buffer_return argument.

-If no string is returned,

-the buffer_return argument is unchanged.

-.LP

-The KeySym into which the KeyCode from the event was mapped is returned

-in the keysym_return argument if it is non-NULL and the status_return

-argument indicates that a KeySym was returned.

-If both a string and a KeySym are returned,

-the KeySym value does not necessarily correspond to the string returned.

-.LP

-.ZN XmbLookupString

-and

-.ZN Xutf8LookupString

-return the length of the string in bytes, and

-.ZN XwcLookupString

-returns the length of the string in characters.

-Both

-.ZN XmbLookupString

-and

-.ZN XwcLookupString

-return text in the encoding of the locale bound to the input method

-of the specified input context, and

-.ZN Xutf8LookupString

-returns text in UTF-8 encoding.

-.LP

-Each string returned by

-.ZN XmbLookupString

-and

-.ZN XwcLookupString

-begins in the initial state of the encoding of the locale

-(if the encoding of the locale is state-dependent).

-.NT

-To ensure proper input processing,

-it is essential that the client pass only 

-.ZN KeyPress

-events to

-.ZN XmbLookupString ,

-.ZN XwcLookupString

-and

-.ZN Xutf8LookupString .

-Their behavior when a client passes a 

-.ZN KeyRelease

-event is undefined.

-.NE

-.LP

-Clients should check the status_return argument before

-using the other returned values.

-These three functions each return a value to status_return 

-that indicates what has been returned in the other arguments.

-The possible values returned are:

-.TS

-lw(1.5i) lw(4.3i).

-T{

-.ZN XBufferOverflow

-T}	T{

-The input string to be returned is too large for the supplied buffer_return.

-The required size (for

-.ZN XmbLookupString ,

-.ZN Xutf8LookupString

-in bytes; for

-.ZN XwcLookupString

-in characters) is returned as the value of the function,

-and the contents of buffer_return and keysym_return are not modified.

-The client should recall the function with the same event

-and a buffer of adequate size to obtain the string.

-T}

-T{

-.ZN XLookupNone

-T}	T{

-No consistent input has been composed so far.

-The contents of buffer_return and keysym_return are not modified, 

-and the function returns zero.

-T}

-T{

-.ZN XLookupChars

-T}	T{

-Some input characters have been composed.

-They are placed in the buffer_return argument, using the encoding

-described above,

-and the string length is returned as the value of the function.

-The content of the keysym_return argument is not modified.

-T}

-T{

-.ZN XLookupKeySym

-T}	T{

-A KeySym has been returned instead of a string

-and is returned in keysym_return.

-The content of the buffer_return argument is not modified,

-and the function returns zero.

-T}

-T{

-.ZN XLookupBoth

-T}	T{

-Both a KeySym and a string are returned;

-.ZN XLookupChars

-and

-.ZN XLookupKeySym

-occur simultaneously.

-T}

-.TE

-.LP

-It does not make any difference if the input context passed as an argument to

-.ZN XmbLookupString ,

-.ZN XwcLookupString

-and

-.ZN Xutf8LookupString

-is the one currently in possession of the focus or not.

-Input may have been composed within an input context before it lost the focus,

-and that input may be returned on subsequent calls to

-.ZN XmbLookupString ,

-.ZN XwcLookupString

-or

-.ZN Xutf8LookupString

-even though it does not have any more keyboard focus.

-.LP

-The function

-.ZN Xutf8LookupString

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XLookupKeysym(__libmansuffix__),

-Compose(__filemansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XmbLookupString __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbLookupString, XwcLookupString, Xutf8LookupString \- obtain composed input from an input method
+.SH SYNTAX
+.HP
+int XmbLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
+.HP
+int XwcLookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP\^,
+wchar_t *\fIbuffer_return\fP\^, int \fIwchars_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
+.HP
+int Xutf8LookupString\^(\^XIC \fIic\fP\^, XKeyPressedEvent *\fIevent\fP, char
+*\fIbuffer_return\fP\^, int \fIbytes_buffer\fP\^, KeySym
+*\fIkeysym_return\fP\^, Status *\fIstatus_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIbuffer_return\fP 1i
+Returns a multibyte string or wide character string (if any)
+from the input method.
+.IP \fIbytes_buffer\fP 1i
+.br
+.ns
+.IP \fIwchars_buffer\fP 1i
+Specifies space available in the return buffer.
+.ds Ev key event to be used
+.IP \fIevent\fP 1i
+Specifies the \*(Ev.
+.IP \fIic\fP 1i
+Specifies the input context.
+.IP \fIkeysym_return\fP 1i
+Returns the KeySym computed from the event if this argument is not NULL.
+.IP \fIstatus_return\fP 1i
+Returns a value indicating what kind of data is returned.
+.SH DESCRIPTION
+The
+.ZN XmbLookupString ,
+.ZN XwcLookupString
+and
+.ZN Xutf8LookupString
+functions return the string from the input method specified
+in the buffer_return argument.
+If no string is returned,
+the buffer_return argument is unchanged.
+.LP
+The KeySym into which the KeyCode from the event was mapped is returned
+in the keysym_return argument if it is non-NULL and the status_return
+argument indicates that a KeySym was returned.
+If both a string and a KeySym are returned,
+the KeySym value does not necessarily correspond to the string returned.
+.LP
+.ZN XmbLookupString
+and
+.ZN Xutf8LookupString
+return the length of the string in bytes, and
+.ZN XwcLookupString
+returns the length of the string in characters.
+Both
+.ZN XmbLookupString
+and
+.ZN XwcLookupString
+return text in the encoding of the locale bound to the input method
+of the specified input context, and
+.ZN Xutf8LookupString
+returns text in UTF-8 encoding.
+.LP
+Each string returned by
+.ZN XmbLookupString
+and
+.ZN XwcLookupString
+begins in the initial state of the encoding of the locale
+(if the encoding of the locale is state-dependent).
+.LP
+Note: To ensure proper input processing,
+it is essential that the client pass only 
+.ZN KeyPress
+events to
+.ZN XmbLookupString ,
+.ZN XwcLookupString
+and
+.ZN Xutf8LookupString .
+Their behavior when a client passes a 
+.ZN KeyRelease
+event is undefined.
+.LP
+Clients should check the status_return argument before
+using the other returned values.
+These three functions each return a value to status_return 
+that indicates what has been returned in the other arguments.
+The possible values returned are:
+.TS
+lw(1.5i) lw(4.3i).
+T{
+.ZN XBufferOverflow
+T}	T{
+The input string to be returned is too large for the supplied buffer_return.
+The required size (for
+.ZN XmbLookupString ,
+.ZN Xutf8LookupString
+in bytes; for
+.ZN XwcLookupString
+in characters) is returned as the value of the function,
+and the contents of buffer_return and keysym_return are not modified.
+The client should recall the function with the same event
+and a buffer of adequate size to obtain the string.
+T}
+T{
+.ZN XLookupNone
+T}	T{
+No consistent input has been composed so far.
+The contents of buffer_return and keysym_return are not modified, 
+and the function returns zero.
+T}
+T{
+.ZN XLookupChars
+T}	T{
+Some input characters have been composed.
+They are placed in the buffer_return argument, using the encoding
+described above,
+and the string length is returned as the value of the function.
+The content of the keysym_return argument is not modified.
+T}
+T{
+.ZN XLookupKeySym
+T}	T{
+A KeySym has been returned instead of a string
+and is returned in keysym_return.
+The content of the buffer_return argument is not modified,
+and the function returns zero.
+T}
+T{
+.ZN XLookupBoth
+T}	T{
+Both a KeySym and a string are returned;
+.ZN XLookupChars
+and
+.ZN XLookupKeySym
+occur simultaneously.
+T}
+.TE
+.LP
+It does not make any difference if the input context passed as an argument to
+.ZN XmbLookupString ,
+.ZN XwcLookupString
+and
+.ZN Xutf8LookupString
+is the one currently in possession of the focus or not.
+Input may have been composed within an input context before it lost the focus,
+and that input may be returned on subsequent calls to
+.ZN XmbLookupString ,
+.ZN XwcLookupString
+or
+.ZN Xutf8LookupString
+even though it does not have any more keyboard focus.
+.LP
+The function
+.ZN Xutf8LookupString
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XLookupKeysym(__libmansuffix__),
+Compose(__filemansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbResetIC.man b/libX11/man/XmbResetIC.man
index bd9adb59a..f265ee2fe 100644
--- a/libX11/man/XmbResetIC.man
+++ b/libX11/man/XmbResetIC.man
@@ -1,211 +1,150 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbResetIC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context

-.SH SYNTAX

-.HP

-char *XmbResetIC\^(\^XIC \fIic\fP\^); 

-.HP

-wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^); 

-.HP

-char *Xutf8ResetIC\^(\^XIC \fIic\fP\^); 

-.SH ARGUMENTS

-.IP \fIic\fP 1i

-Specifies the input context.

-.SH DESCRIPTION

-When

-.ZN XNResetState

-is set to

-.ZN XIMInitialState ,

-.ZN XmbResetIC ,

-.ZN XwcResetIC

-and

-.ZN Xutf8ResetIC

-reset an input context to its initial state;

-when

-.ZN XNResetState

-is set to

-.ZN XIMPreserveState ,

-the current input context state is preserved.

-In both cases, any input pending on that context is deleted.

-The input method is required to clear the preedit area, if any,

-and update the status accordingly.

-Calling 

-.ZN XmbResetIC ,

-.ZN XwcResetIC

-or

-.ZN Xutf8ResetIC

-does not change the focus.

-.LP

-The return value of

-.ZN XmbResetIC

-is its current preedit string as a multibyte string.

-The return value of

-.ZN XwcResetIC

-is its current preedit string as a wide character string.

-The return value of

-.ZN Xutf8ResetIC

-is its current preedit string as an UTF-8 string.

-If there is any preedit text drawn or visible to the user,

-then these procedures must return a non-NULL string.

-If there is no visible preedit text, 

-then it is input method implementation-dependent 

-whether these procedures return a non-NULL string or NULL.

-.LP

-The client should free the returned string by calling

-.ZN XFree .

-.LP

-The function

-.ZN Xutf8ResetIC

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XCreateIC(__libmansuffix__),

-XOpenIM(__libmansuffix__),

-XSetICFocus(__libmansuffix__),

-XSetICValues(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbResetIC __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbResetIC, XwcResetIC, Xutf8ResetIC \- reset the state of an input context
+.SH SYNTAX
+.HP
+char *XmbResetIC\^(\^XIC \fIic\fP\^); 
+.HP
+wchar_t *XwcResetIC\^(\^XIC \fIic\fP\^); 
+.HP
+char *Xutf8ResetIC\^(\^XIC \fIic\fP\^); 
+.SH ARGUMENTS
+.IP \fIic\fP 1i
+Specifies the input context.
+.SH DESCRIPTION
+When
+.ZN XNResetState
+is set to
+.ZN XIMInitialState ,
+.ZN XmbResetIC ,
+.ZN XwcResetIC
+and
+.ZN Xutf8ResetIC
+reset an input context to its initial state;
+when
+.ZN XNResetState
+is set to
+.ZN XIMPreserveState ,
+the current input context state is preserved.
+In both cases, any input pending on that context is deleted.
+The input method is required to clear the preedit area, if any,
+and update the status accordingly.
+Calling 
+.ZN XmbResetIC ,
+.ZN XwcResetIC
+or
+.ZN Xutf8ResetIC
+does not change the focus.
+.LP
+The return value of
+.ZN XmbResetIC
+is its current preedit string as a multibyte string.
+The return value of
+.ZN XwcResetIC
+is its current preedit string as a wide character string.
+The return value of
+.ZN Xutf8ResetIC
+is its current preedit string as an UTF-8 string.
+If there is any preedit text drawn or visible to the user,
+then these procedures must return a non-NULL string.
+If there is no visible preedit text, 
+then it is input method implementation-dependent 
+whether these procedures return a non-NULL string or NULL.
+.LP
+The client should free the returned string by calling
+.ZN XFree .
+.LP
+The function
+.ZN Xutf8ResetIC
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XCreateIC(__libmansuffix__),
+XOpenIM(__libmansuffix__),
+XSetICFocus(__libmansuffix__),
+XSetICValues(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbTextEscapement.man b/libX11/man/XmbTextEscapement.man
index 283911069..35da94c1b 100644
--- a/libX11/man/XmbTextEscapement.man
+++ b/libX11/man/XmbTextEscapement.man
@@ -1,190 +1,129 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbTextEscapement __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text

-.SH SYNTAX

-.HP

-int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int

-\fInum_bytes\fP\^); 

-.HP

-int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,

-int \fInum_wchars\fP\^); 

-.HP

-int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, 

-int \fInum_bytes\fP\^); 

-.SH ARGUMENTS

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fInum_bytes\fP 1i

-Specifies the number of bytes in the string argument.

-.IP \fInum_wchars\fP 1i

-Specifies the number of characters in the string argument.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.SH DESCRIPTION

-The

-.ZN XmbTextEscapement ,

-.ZN XwcTextEscapement

-and

-.ZN Xutf8TextEscapement

-functions return the escapement in pixels of the specified string as a value,

-using the fonts loaded for the specified font set.

-The escapement is the distance in pixels in the primary draw

-direction from the drawing origin to the origin of the next character to

-be drawn, assuming that the rendering of the next character is not

-dependent on the supplied string.

-.LP

-Regardless of the character rendering order,

-the escapement is always positive.

-.LP

-The function

-.ZN Xutf8TextEscapement

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XmbTextExtents(__libmansuffix__),

-XmbTextPerCharExtents(__libmansuffix__)

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbTextEscapement __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbTextEscapement, XwcTextEscapement, Xutf8TextEscapement \- obtain the escapement of text
+.SH SYNTAX
+.HP
+int XmbTextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^); 
+.HP
+int XwcTextEscapement\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^,
+int \fInum_wchars\fP\^); 
+.HP
+int Xutf8TextEscapement\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, 
+int \fInum_bytes\fP\^); 
+.SH ARGUMENTS
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fInum_bytes\fP 1i
+Specifies the number of bytes in the string argument.
+.IP \fInum_wchars\fP 1i
+Specifies the number of characters in the string argument.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.SH DESCRIPTION
+The
+.ZN XmbTextEscapement ,
+.ZN XwcTextEscapement
+and
+.ZN Xutf8TextEscapement
+functions return the escapement in pixels of the specified string as a value,
+using the fonts loaded for the specified font set.
+The escapement is the distance in pixels in the primary draw
+direction from the drawing origin to the origin of the next character to
+be drawn, assuming that the rendering of the next character is not
+dependent on the supplied string.
+.LP
+Regardless of the character rendering order,
+the escapement is always positive.
+.LP
+The function
+.ZN Xutf8TextEscapement
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XmbTextExtents(__libmansuffix__),
+XmbTextPerCharExtents(__libmansuffix__)
+\fI\*(xL\fP
diff --git a/libX11/man/XmbTextExtents.man b/libX11/man/XmbTextExtents.man
index 6d44c52a7..8ede8fc09 100644
--- a/libX11/man/XmbTextExtents.man
+++ b/libX11/man/XmbTextExtents.man
@@ -1,226 +1,165 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbTextExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents

-.SH SYNTAX

-.HP

-int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int

-\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle

-*\fIoverall_logical_return\fP\^); 

-.HP

-int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^, int

-\fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle

-*\fIoverall_logical_return\fP\^); 

-.HP

-int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int

-\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle

-*\fIoverall_logical_return\fP\^);

-.SH ARGUMENTS

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fInum_bytes\fP 1i

-Specifies the number of bytes in the string argument.

-.IP \fInum_wchars\fP 1i

-Specifies the number of characters in the string argument.

-.ds Ov dimensions

-.IP \fIoverall_ink_return\fP 1i

-Returns the overall ink \*(Ov.

-.IP \fIoverall_logical_return\fP 1i

-Returns the overall logical \*(Ov.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.SH DESCRIPTION

-The

-.ZN XmbTextExtents ,

-.ZN XwcTextExtents

-and

-.ZN Xutf8TextExtents

-functions set the components of the specified overall_ink_return and

-overall_logical_return

-arguments to the overall bounding box of the string's image

-and a logical bounding box for spacing purposes, respectively.

-They return the value returned by 

-.ZN XmbTextEscapement ,

-.ZN XwcTextEscapement

-or

-.ZN Xutf8TextEscapement .

-These metrics are relative to the drawing origin of the string,

-using the fonts loaded for the specified font set.

-.LP

-If the overall_ink_return argument is non-NULL,

-it is set to the bounding box of the string's character ink.

-The overall_ink_return for a nondescending, horizontally drawn

-Latin character is conventionally entirely above the baseline;

-that is, overall_ink_return.height <= \-overall_ink_return.y.

-The overall_ink_return for a nonkerned character

-is entirely at, and to the right of, the origin;

-that is, overall_ink_return.x >= 0.

-A character consisting of a single pixel at the origin would set

-overall_ink_return fields y = 0, x = 0, width = 1, and height = 1.

-.LP

-If the overall_logical_return argument is non-NULL,

-it is set to the bounding box that provides minimum spacing

-to other graphical features for the string.

-Other graphical features, for example, a border surrounding the text,

-should not intersect this rectangle.

-.LP

-When the 

-.ZN XFontSet

-has missing charsets,

-metrics for each unavailable character are taken 

-from the default string returned by 

-.ZN XCreateFontSet 

-so that the metrics represent the text as it will actually be drawn.

-The behavior for an invalid codepoint is undefined.

-.LP

-The function

-.ZN Xutf8TextExtents

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XmbTextEscapement(__libmansuffix__),

-XmbTextPerCharExtents(__libmansuffix__)

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbTextExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbTextExtents, XwcTextExtents, Xutf8TextExtents \- compute text extents
+.SH SYNTAX
+.HP
+int XmbTextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+int XwcTextExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t *\fIstring\fP\^, int
+\fInum_wchars\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+int Xutf8TextExtents\^(\^XFontSet \fIfont_set\fP\^, char *\fIstring\fP\^, int
+\fInum_bytes\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^);
+.SH ARGUMENTS
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fInum_bytes\fP 1i
+Specifies the number of bytes in the string argument.
+.IP \fInum_wchars\fP 1i
+Specifies the number of characters in the string argument.
+.ds Ov dimensions
+.IP \fIoverall_ink_return\fP 1i
+Returns the overall ink \*(Ov.
+.IP \fIoverall_logical_return\fP 1i
+Returns the overall logical \*(Ov.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.SH DESCRIPTION
+The
+.ZN XmbTextExtents ,
+.ZN XwcTextExtents
+and
+.ZN Xutf8TextExtents
+functions set the components of the specified overall_ink_return and
+overall_logical_return
+arguments to the overall bounding box of the string's image
+and a logical bounding box for spacing purposes, respectively.
+They return the value returned by 
+.ZN XmbTextEscapement ,
+.ZN XwcTextEscapement
+or
+.ZN Xutf8TextEscapement .
+These metrics are relative to the drawing origin of the string,
+using the fonts loaded for the specified font set.
+.LP
+If the overall_ink_return argument is non-NULL,
+it is set to the bounding box of the string's character ink.
+The overall_ink_return for a nondescending, horizontally drawn
+Latin character is conventionally entirely above the baseline;
+that is, overall_ink_return.height <= \-overall_ink_return.y.
+The overall_ink_return for a nonkerned character
+is entirely at, and to the right of, the origin;
+that is, overall_ink_return.x >= 0.
+A character consisting of a single pixel at the origin would set
+overall_ink_return fields y = 0, x = 0, width = 1, and height = 1.
+.LP
+If the overall_logical_return argument is non-NULL,
+it is set to the bounding box that provides minimum spacing
+to other graphical features for the string.
+Other graphical features, for example, a border surrounding the text,
+should not intersect this rectangle.
+.LP
+When the 
+.ZN XFontSet
+has missing charsets,
+metrics for each unavailable character are taken 
+from the default string returned by 
+.ZN XCreateFontSet 
+so that the metrics represent the text as it will actually be drawn.
+The behavior for an invalid codepoint is undefined.
+.LP
+The function
+.ZN Xutf8TextExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XmbTextEscapement(__libmansuffix__),
+XmbTextPerCharExtents(__libmansuffix__)
+\fI\*(xL\fP
diff --git a/libX11/man/XmbTextListToTextProperty.man b/libX11/man/XmbTextListToTextProperty.man
index 0c9a9d855..b937761ee 100644
--- a/libX11/man/XmbTextListToTextProperty.man
+++ b/libX11/man/XmbTextListToTextProperty.man
@@ -1,459 +1,394 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XmbTextListToTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbTextListToTextProperty, XwcTextListToTextProperty, Xutf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, Xutf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures

-.SH SYNTAX

-.HP

-int XmbTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char

-**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-int XwcTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, wchar_t

-**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-int Xutf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char

-**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,

-XTextProperty *\fItext_prop_return\fP\^); 

-.HP

-int XmbTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty

-*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 

-.HP

-int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty

-*\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int

-*\fIcount_return\fP\^); 

-.HP

-int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty

-*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 

-.HP

-void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^); 

-.HP

-char *XDefaultString\^(void)

-.SH ARGUMENTS

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.IP \fIlist\fP 1i

-Specifies a list of null-terminated character strings.

-.IP \fIcount\fP 1i

-Specifies the number of strings specified.

-.IP \fIstyle\fP 1i

-Specifies the manner in which the property is encoded.

-.IP \fItext_prop_return\fP 1i

-Returns the

-.ZN XTextProperty

-structure.

-.IP \fItext_prop\fP 1i

-Specifies the

-.ZN XTextProperty

-structure to be used.

-.IP \fIlist_return\fP 1i

-Returns a list of null-terminated character strings.

-.ds Cn strings

-.IP \fIcount_return\fP 1i

-Returns the number of \*(Cn.

-.IP \fIlist\fP 1i

-Specifies the list of strings to be freed.

-.SH DESCRIPTION

-The

-.ZN XmbTextListToTextProperty ,

-.ZN XwcTextListToTextProperty

-and

-.ZN Xutf8TextListToTextProperty

-functions set the specified 

-.ZN XTextProperty

-value to a set of null-separated elements representing the concatenation

-of the specified list of null-terminated text strings. The input text

-strings must be given in the current locale encoding (for

-.ZN XmbTextListToTextProperty

-and

-.ZN XwcTextListToTextProperty ),

-or in UTF-8 encoding (for

-.ZN Xutf8TextListToTextProperty ).

-.LP

-The functions set the encoding field of text_prop_return to an

-.ZN Atom 

-for the specified display 

-naming the encoding determined by the specified style

-and convert the specified text list to this encoding for storage in

-the text_prop_return value field.

-If the style 

-.ZN XStringStyle

-or 

-.ZN XCompoundTextStyle

-is specified,

-this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.

-If the style

-.ZN XUTF8StringStyle

-is specified,

-this encoding is ``UTF8_STRING''. 

-(This is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is indicated by the macro

-.ZN X_HAVE_UTF8_STRING .)

-If the style 

-.ZN XTextStyle

-is specified,

-this encoding is the encoding of the current locale.

-If the style 

-.ZN XStdICCTextStyle

-is specified,

-this encoding is ``STRING'' if the text is fully convertible to STRING,

-else ``COMPOUND_TEXT''.

-A final terminating null byte is stored at the end of the value field 

-of text_prop_return but is not included in the nitems member.

-.LP

-If insufficient memory is available for the new value string,

-the functions return 

-.ZN XNoMemory .

-If the current locale is not supported,

-the functions return 

-.ZN XLocaleNotSupported .

-In both of these error cases,

-the functions do not set text_prop_return.

-.LP

-To determine if the functions are guaranteed not to return

-.ZN XLocaleNotSupported ,

-use

-.ZN XSupportsLocale .

-.LP

-If the supplied text is not fully convertible to the specified encoding,

-the functions return the number of unconvertible characters.

-Each unconvertible character is converted to an implementation-defined and

-encoding-specific default string.

-Otherwise, the functions return 

-.ZN Success .

-Note that full convertibility to all styles except 

-.ZN XStringStyle

-is guaranteed.

-.LP

-To free the storage for the value field, use

-.ZN XFree .

-.LP

-The 

-.ZN XmbTextPropertyToTextList ,

-.ZN XwcTextPropertyToTextList

-and 

-.ZN Xutf8TextPropertyToTextList

-functions return a list of text strings representing the

-null-separated elements of the specified

-.ZN XTextProperty

-structure. The returned strings are encoded using the current locale encoding

-(for

-.ZN XmbTextPropertyToTextList

-and

-.ZN XwcTextPropertyToTextList )

-or in UTF-8 (for

-.ZN Xutf8TextPropertyToTextList ).

-The data in text_prop must be format 8.

-.LP

-Multiple elements of the property (for example, the strings in a disjoint

-text selection) are separated by a null byte.

-The contents of the property are not required to be null-terminated;

-any terminating null should not be included in text_prop.nitems.

-.LP

-If insufficient memory is available for the list and its elements,

-.ZN XmbTextPropertyToTextList ,

-.ZN XwcTextPropertyToTextList

-and

-.ZN Xutf8TextPropertyToTextList

-return 

-.ZN XNoMemory .

-If the current locale is not supported,

-the functions return

-.ZN XLocaleNotSupported .

-Otherwise, if the encoding field of text_prop is not convertible 

-to the encoding of the current locale,

-the functions return

-.ZN XConverterNotFound .

-For supported locales,

-existence of a converter from COMPOUND_TEXT, STRING, UTF8_STRING

-or the encoding of the current locale is guaranteed if

-.ZN XSupportsLocale 

-returns 

-.ZN True

-for the current locale (but the actual text

-may contain unconvertible characters).

-Conversion of other encodings is implementation-dependent.

-In all of these error cases,

-the functions do not set any return values.

-.LP

-Otherwise, 

-.ZN XmbTextPropertyToTextList ,

-.ZN XwcTextPropertyToTextList

-and

-.ZN Xutf8TextPropertyToTextList

-return the list of null-terminated text strings to list_return

-and the number of text strings to count_return.

-.LP

-If the value field of text_prop is not fully convertible to the

-encoding of the current locale,

-the functions return the number of unconvertible characters.

-Each unconvertible character is converted to a string in the

-current locale that is specific to the current locale.

-To obtain the value of this string, 

-use

-.ZN XDefaultString .

-Otherwise,

-.ZN XmbTextPropertyToTextList ,

-.ZN XwcTextPropertyToTextList

-and

-.ZN Xutf8TextPropertyToTextList

-return 

-.ZN Success .

-.LP

-To free the storage for the list and its contents returned by

-.ZN XmbTextPropertyToTextList

-or

-.ZN Xutf8TextPropertyToTextList ,

-use

-.ZN XFreeStringList .

-To free the storage for the list and its contents returned by

-.ZN XwcTextPropertyToTextList ,

-use

-.ZN XwcFreeStringList .

-.LP

-The

-.ZN XwcFreeStringList

-function frees memory allocated by

-.ZN XwcTextPropertyToTextList .

-.LP

-The

-.ZN XDefaultString

-function returns the default string used by Xlib for text conversion

-(for example, in 

-.ZN XmbTextPropertyToTextList ).

-The default string is the string in the current locale that is output 

-when an unconvertible character is found during text conversion.

-If the string returned by

-.ZN XDefaultString

-is the empty string ("\^"),

-no character is output in the converted text.

-.ZN XDefaultString

-does not return NULL.

-.LP

-The string returned by 

-.ZN XDefaultString

-is independent of the default string for text drawing;

-see 

-.ZN XCreateFontSet

-to obtain the default string for an

-.ZN XFontSet .

-.LP

-The behavior when an invalid codepoint is supplied to any Xlib function is

-undefined.

-.LP

-The returned string is null-terminated.

-It is owned by Xlib and should not be modified or freed by the client.

-It may be freed after the current locale is changed.

-Until freed, it will not be modified by Xlib.

-.LP

-The functions

-.ZN Xutf8TextListToTextProperty

-and

-.ZN Xutf8TextPropertyToTextList

-are extensions introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Their presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH STRUCTURES

-The

-.ZN XTextProperty

-structure contains:

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	unsigned char *value;	/\&* property data */

-	Atom encoding;	/\&* type of property */

-	int format;	/\&* 8, 16, or 32 */

-	unsigned long nitems;	/\&* number of items in value */

-} XTextProperty;

-.De

-.LP

-The

-.ZN XICCEncodingStyle

-structure contains:

-.LP

-.TS

-lw(.5i) lw(2i) lw(2.5i).

-T{

-\&#define

-T}	T{

-.ZN XNoMemory

-T}	T{

-\-1

-T}

-T{

-\&#define

-T}	T{

-.ZN XLocaleNotSupported

-T}	T{

-\-2

-T}

-T{

-\&#define

-T}	T{

-.ZN XConverterNotFound

-T}	T{

-\-3

-T}

-.TE

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef enum {

-	XStringStyle,		/\&* STRING */

-	XCompoundTextStyle,	/\&* COMPOUND_TEXT */

-	XTextStyle,		/\&* text in owner's encoding (current locale) */

-	XStdICCTextStyle,	/\&* STRING, else COMPOUND_TEXT */

-	XUTF8StringStyle	/\&* UTF8_STRING */

-} XICCEncodingStyle;

-.De

-.SH "SEE ALSO"

-XSetTextProperty(__libmansuffix__),

-XStringListToTextProperty(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XmbTextListToTextProperty __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbTextListToTextProperty, XwcTextListToTextProperty, Xutf8TextListToTextProperty, XmbTextPropertyToTextList, XwcTextPropertyToTextList, Xutf8TextPropertyToTextList, XwcFreeStringList, XDefaultString \- convert text lists and text property structures
+.SH SYNTAX
+.HP
+int XmbTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XwcTextListToTextProperty\^(\^Display *\fIdisplay\fP\^, wchar_t
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int Xutf8TextListToTextProperty\^(\^Display *\fIdisplay\fP\^, char
+**\fIlist\fP\^, int \fIcount\fP\^, XICCEncodingStyle \fIstyle\fP\^,
+XTextProperty *\fItext_prop_return\fP\^); 
+.HP
+int XmbTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+int XwcTextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, wchar_t ***\fIlist_return\fP\^, int
+*\fIcount_return\fP\^); 
+.HP
+int Xutf8TextPropertyToTextList\^(\^Display *\fIdisplay\fP\^, XTextProperty
+*\fItext_prop\fP\^, char ***\fIlist_return\fP\^, int *\fIcount_return\fP\^); 
+.HP
+void XwcFreeStringList\^(\^wchar_t **\fIlist\fP\^); 
+.HP
+char *XDefaultString\^(void)
+.SH ARGUMENTS
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fIlist\fP 1i
+Specifies a list of null-terminated character strings.
+.IP \fIcount\fP 1i
+Specifies the number of strings specified.
+.IP \fIstyle\fP 1i
+Specifies the manner in which the property is encoded.
+.IP \fItext_prop_return\fP 1i
+Returns the
+.ZN XTextProperty
+structure.
+.IP \fItext_prop\fP 1i
+Specifies the
+.ZN XTextProperty
+structure to be used.
+.IP \fIlist_return\fP 1i
+Returns a list of null-terminated character strings.
+.ds Cn strings
+.IP \fIcount_return\fP 1i
+Returns the number of \*(Cn.
+.IP \fIlist\fP 1i
+Specifies the list of strings to be freed.
+.SH DESCRIPTION
+The
+.ZN XmbTextListToTextProperty ,
+.ZN XwcTextListToTextProperty
+and
+.ZN Xutf8TextListToTextProperty
+functions set the specified 
+.ZN XTextProperty
+value to a set of null-separated elements representing the concatenation
+of the specified list of null-terminated text strings. The input text
+strings must be given in the current locale encoding (for
+.ZN XmbTextListToTextProperty
+and
+.ZN XwcTextListToTextProperty ),
+or in UTF-8 encoding (for
+.ZN Xutf8TextListToTextProperty ).
+.LP
+The functions set the encoding field of text_prop_return to an
+.ZN Atom 
+for the specified display 
+naming the encoding determined by the specified style
+and convert the specified text list to this encoding for storage in
+the text_prop_return value field.
+If the style 
+.ZN XStringStyle
+or 
+.ZN XCompoundTextStyle
+is specified,
+this encoding is ``STRING'' or ``COMPOUND_TEXT'', respectively.
+If the style
+.ZN XUTF8StringStyle
+is specified,
+this encoding is ``UTF8_STRING''. 
+(This is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is indicated by the macro
+.ZN X_HAVE_UTF8_STRING .)
+If the style 
+.ZN XTextStyle
+is specified,
+this encoding is the encoding of the current locale.
+If the style 
+.ZN XStdICCTextStyle
+is specified,
+this encoding is ``STRING'' if the text is fully convertible to STRING,
+else ``COMPOUND_TEXT''.
+A final terminating null byte is stored at the end of the value field 
+of text_prop_return but is not included in the nitems member.
+.LP
+If insufficient memory is available for the new value string,
+the functions return 
+.ZN XNoMemory .
+If the current locale is not supported,
+the functions return 
+.ZN XLocaleNotSupported .
+In both of these error cases,
+the functions do not set text_prop_return.
+.LP
+To determine if the functions are guaranteed not to return
+.ZN XLocaleNotSupported ,
+use
+.ZN XSupportsLocale .
+.LP
+If the supplied text is not fully convertible to the specified encoding,
+the functions return the number of unconvertible characters.
+Each unconvertible character is converted to an implementation-defined and
+encoding-specific default string.
+Otherwise, the functions return 
+.ZN Success .
+Note that full convertibility to all styles except 
+.ZN XStringStyle
+is guaranteed.
+.LP
+To free the storage for the value field, use
+.ZN XFree .
+.LP
+The 
+.ZN XmbTextPropertyToTextList ,
+.ZN XwcTextPropertyToTextList
+and 
+.ZN Xutf8TextPropertyToTextList
+functions return a list of text strings representing the
+null-separated elements of the specified
+.ZN XTextProperty
+structure. The returned strings are encoded using the current locale encoding
+(for
+.ZN XmbTextPropertyToTextList
+and
+.ZN XwcTextPropertyToTextList )
+or in UTF-8 (for
+.ZN Xutf8TextPropertyToTextList ).
+The data in text_prop must be format 8.
+.LP
+Multiple elements of the property (for example, the strings in a disjoint
+text selection) are separated by a null byte.
+The contents of the property are not required to be null-terminated;
+any terminating null should not be included in text_prop.nitems.
+.LP
+If insufficient memory is available for the list and its elements,
+.ZN XmbTextPropertyToTextList ,
+.ZN XwcTextPropertyToTextList
+and
+.ZN Xutf8TextPropertyToTextList
+return 
+.ZN XNoMemory .
+If the current locale is not supported,
+the functions return
+.ZN XLocaleNotSupported .
+Otherwise, if the encoding field of text_prop is not convertible 
+to the encoding of the current locale,
+the functions return
+.ZN XConverterNotFound .
+For supported locales,
+existence of a converter from COMPOUND_TEXT, STRING, UTF8_STRING
+or the encoding of the current locale is guaranteed if
+.ZN XSupportsLocale 
+returns 
+.ZN True
+for the current locale (but the actual text
+may contain unconvertible characters).
+Conversion of other encodings is implementation-dependent.
+In all of these error cases,
+the functions do not set any return values.
+.LP
+Otherwise, 
+.ZN XmbTextPropertyToTextList ,
+.ZN XwcTextPropertyToTextList
+and
+.ZN Xutf8TextPropertyToTextList
+return the list of null-terminated text strings to list_return
+and the number of text strings to count_return.
+.LP
+If the value field of text_prop is not fully convertible to the
+encoding of the current locale,
+the functions return the number of unconvertible characters.
+Each unconvertible character is converted to a string in the
+current locale that is specific to the current locale.
+To obtain the value of this string, 
+use
+.ZN XDefaultString .
+Otherwise,
+.ZN XmbTextPropertyToTextList ,
+.ZN XwcTextPropertyToTextList
+and
+.ZN Xutf8TextPropertyToTextList
+return 
+.ZN Success .
+.LP
+To free the storage for the list and its contents returned by
+.ZN XmbTextPropertyToTextList
+or
+.ZN Xutf8TextPropertyToTextList ,
+use
+.ZN XFreeStringList .
+To free the storage for the list and its contents returned by
+.ZN XwcTextPropertyToTextList ,
+use
+.ZN XwcFreeStringList .
+.LP
+The
+.ZN XwcFreeStringList
+function frees memory allocated by
+.ZN XwcTextPropertyToTextList .
+.LP
+The
+.ZN XDefaultString
+function returns the default string used by Xlib for text conversion
+(for example, in 
+.ZN XmbTextPropertyToTextList ).
+The default string is the string in the current locale that is output 
+when an unconvertible character is found during text conversion.
+If the string returned by
+.ZN XDefaultString
+is the empty string ("\^"),
+no character is output in the converted text.
+.ZN XDefaultString
+does not return NULL.
+.LP
+The string returned by 
+.ZN XDefaultString
+is independent of the default string for text drawing;
+see 
+.ZN XCreateFontSet
+to obtain the default string for an
+.ZN XFontSet .
+.LP
+The behavior when an invalid codepoint is supplied to any Xlib function is
+undefined.
+.LP
+The returned string is null-terminated.
+It is owned by Xlib and should not be modified or freed by the client.
+It may be freed after the current locale is changed.
+Until freed, it will not be modified by Xlib.
+.LP
+The functions
+.ZN Xutf8TextListToTextProperty
+and
+.ZN Xutf8TextPropertyToTextList
+are extensions introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Their presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH STRUCTURES
+The
+.ZN XTextProperty
+structure contains:
+.LP
+.Ds 0
+typedef struct {
+        unsigned char *value;   /\&* property data */
+        Atom encoding;  /\&* type of property */
+        int format;     /\&* 8, 16, or 32 */
+        unsigned long nitems;   /\&* number of items in value */
+} XTextProperty;
+.De
+.LP
+The
+.ZN XICCEncodingStyle
+structure contains:
+.LP
+.TS
+lw(.5i) lw(2i) lw(2.5i).
+T{
+\&#define
+T}	T{
+.ZN XNoMemory
+T}	T{
+\-1
+T}
+T{
+\&#define
+T}	T{
+.ZN XLocaleNotSupported
+T}	T{
+\-2
+T}
+T{
+\&#define
+T}	T{
+.ZN XConverterNotFound
+T}	T{
+\-3
+T}
+.TE
+.Ds 0
+typedef enum {
+        XStringStyle,           /\&* STRING */
+        XCompoundTextStyle,     /\&* COMPOUND_TEXT */
+        XTextStyle,             /\&* text in owner's encoding (current locale) */
+        XStdICCTextStyle,       /\&* STRING, else COMPOUND_TEXT */
+        XUTF8StringStyle        /\&* UTF8_STRING */
+} XICCEncodingStyle;
+.De
+.SH "SEE ALSO"
+XSetTextProperty(__libmansuffix__),
+XStringListToTextProperty(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XmbTextPerCharExtents.man b/libX11/man/XmbTextPerCharExtents.man
index 7d96a2399..eceaf6aed 100644
--- a/libX11/man/XmbTextPerCharExtents.man
+++ b/libX11/man/XmbTextPerCharExtents.man
@@ -1,256 +1,195 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\" Copyright \(co 2000  The XFree86 Project, Inc.

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\"

-.\" 

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XmbTextPerCharExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string

-.SH SYNTAX

-.HP

-Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,

-XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int

-*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle

-*\fIoverall_logical_return\fP\^); 

-.HP

-Status XwcTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t

-*\fIstring\fP\^, int \fInum_wchars\fP\^, XRectangle

-*\fIink_array_return\fP\^, XRectangle *\fIlogical_array_return\fP, int

-\fIarray_size\fP\^, int *\fInum_chars_return\fP\^, XRectangle

-*\fIoverall_ink_return\fP\^, XRectangle *\fIoverall_logical_return\fP\^); 

-.HP

-Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char

-*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,

-XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int

-*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle

-*\fIoverall_logical_return\fP\^);

-.SH ARGUMENTS

-.IP \fIarray_size\fP 1i

-Specifies the size of ink_array_return and logical_array_return.

-The caller must pass in arrays of this size.

-.IP \fIfont_set\fP 1i

-Specifies the font set.

-.IP \fIink_array_return\fP 1i

-Returns the ink dimensions for each character.

-.IP \fIlogical_array_return\fP 1i

-Returns the logical dimensions for each character.

-.IP \fInum_bytes\fP 1i

-Specifies the number of bytes in the string argument.

-.IP \fInum_chars_return\fP 1i

-Returns the number of characters in the string argument.

-.IP \fInum_wchars\fP 1i

-Specifies the number of characters in the string argument.

-.ds Ov extents of the entire string

-.IP \fIoverall_ink_return\fP 1i

-Returns the overall ink \*(Ov.

-.IP \fIoverall_logical_return\fP 1i

-Returns the overall logical \*(Ov.

-.IP \fIstring\fP 1i

-Specifies the character string.

-.SH DESCRIPTION

-The

-.ZN XmbTextPerCharExtents ,

-.ZN XwcTextPerCharExtents

-and

-.ZN Xutf8TextPerCharExtents

-functions return the text dimensions of each character of the specified text,

-using the fonts loaded for the specified font set.

-Each successive element of ink_array_return and logical_array_return

-is set to the successive character's drawn metrics,

-relative to the drawing origin of the string and one 

-rectangle

-for each character in the supplied text string.

-The number of elements of ink_array_return and logical_array_return

-that have been set is returned to num_chars_return.

-.LP

-Each element of ink_array_return is set to the bounding box 

-of the corresponding character's drawn foreground color.

-Each element of logical_array_return is set to the bounding box 

-that provides minimum spacing to other graphical features

-for the corresponding character.

-Other graphical features should not intersect any of the

-logical_array_return rectangles.

-.LP

-Note that an 

-.ZN XRectangle

-represents the effective drawing dimensions of the character,

-regardless of the number of font glyphs that are used to draw

-the character or the direction in which the character is drawn.

-If multiple characters map to a single character glyph,

-the dimensions of all the 

-.ZN XRectangles

-of those characters are the same.

-.LP

-When the 

-.ZN XFontSet

-has missing charsets, metrics for each unavailable

-character are taken from the default string returned by 

-.ZN XCreateFontSet

-so that the metrics represent the text as it will actually be drawn.

-The behavior for an invalid codepoint is undefined.

-.LP

-If the array_size is too small for the number of characters in the

-supplied text, the functions return zero

-and num_chars_return is set to the number of rectangles required.

-Otherwise, the functions return a nonzero value.

-.LP

-If the overall_ink_return or overall_logical_return argument is non-NULL,

-.ZN XmbTextPerCharExtents ,

-.ZN XwcTextPerCharExtents

-and 

-.ZN Xutf8TextPerCharExtents

-return the maximum extent of the string's metrics to overall_ink_return

-or overall_logical_return, as returned by 

-.ZN XmbTextExtents ,

-.ZN XwcTextExtents

-or 

-.ZN Xutf8TextExtents .

-.LP

-The function

-.ZN Xutf8TextPerCharExtents

-is an extension introduced by The XFree86 Project, Inc. in their 4.0.2

-release. Its presence is

-indicated by the macro

-.ZN X_HAVE_UTF8_STRING .

-.SH "SEE ALSO"

-XmbTextEscapement(__libmansuffix__),

-XmbTextExtents(__libmansuffix__)

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\" Copyright \(co 2000  The XFree86 Project, Inc.
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\" 
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XmbTextPerCharExtents __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XmbTextPerCharExtents, XwcTextPerCharExtents, Xutf8TextPerCharExtents \- obtain per-character information for a text string
+.SH SYNTAX
+.HP
+Status XmbTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
+XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
+*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^); 
+.HP
+Status XwcTextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, wchar_t
+*\fIstring\fP\^, int \fInum_wchars\fP\^, XRectangle
+*\fIink_array_return\fP\^, XRectangle *\fIlogical_array_return\fP, int
+\fIarray_size\fP\^, int *\fInum_chars_return\fP\^, XRectangle
+*\fIoverall_ink_return\fP\^, XRectangle *\fIoverall_logical_return\fP\^); 
+.HP
+Status Xutf8TextPerCharExtents\^(\^XFontSet \fIfont_set\fP\^, char
+*\fIstring\fP\^, int \fInum_bytes\fP\^, XRectangle *\fIink_array_return\fP\^,
+XRectangle *\fIlogical_array_return\fP\^, int \fIarray_size\fP\^, int
+*\fInum_chars_return\fP\^, XRectangle *\fIoverall_ink_return\fP\^, XRectangle
+*\fIoverall_logical_return\fP\^);
+.SH ARGUMENTS
+.IP \fIarray_size\fP 1i
+Specifies the size of ink_array_return and logical_array_return.
+The caller must pass in arrays of this size.
+.IP \fIfont_set\fP 1i
+Specifies the font set.
+.IP \fIink_array_return\fP 1i
+Returns the ink dimensions for each character.
+.IP \fIlogical_array_return\fP 1i
+Returns the logical dimensions for each character.
+.IP \fInum_bytes\fP 1i
+Specifies the number of bytes in the string argument.
+.IP \fInum_chars_return\fP 1i
+Returns the number of characters in the string argument.
+.IP \fInum_wchars\fP 1i
+Specifies the number of characters in the string argument.
+.ds Ov extents of the entire string
+.IP \fIoverall_ink_return\fP 1i
+Returns the overall ink \*(Ov.
+.IP \fIoverall_logical_return\fP 1i
+Returns the overall logical \*(Ov.
+.IP \fIstring\fP 1i
+Specifies the character string.
+.SH DESCRIPTION
+The
+.ZN XmbTextPerCharExtents ,
+.ZN XwcTextPerCharExtents
+and
+.ZN Xutf8TextPerCharExtents
+functions return the text dimensions of each character of the specified text,
+using the fonts loaded for the specified font set.
+Each successive element of ink_array_return and logical_array_return
+is set to the successive character's drawn metrics,
+relative to the drawing origin of the string and one 
+rectangle
+for each character in the supplied text string.
+The number of elements of ink_array_return and logical_array_return
+that have been set is returned to num_chars_return.
+.LP
+Each element of ink_array_return is set to the bounding box 
+of the corresponding character's drawn foreground color.
+Each element of logical_array_return is set to the bounding box 
+that provides minimum spacing to other graphical features
+for the corresponding character.
+Other graphical features should not intersect any of the
+logical_array_return rectangles.
+.LP
+Note that an 
+.ZN XRectangle
+represents the effective drawing dimensions of the character,
+regardless of the number of font glyphs that are used to draw
+the character or the direction in which the character is drawn.
+If multiple characters map to a single character glyph,
+the dimensions of all the 
+.ZN XRectangles
+of those characters are the same.
+.LP
+When the 
+.ZN XFontSet
+has missing charsets, metrics for each unavailable
+character are taken from the default string returned by 
+.ZN XCreateFontSet
+so that the metrics represent the text as it will actually be drawn.
+The behavior for an invalid codepoint is undefined.
+.LP
+If the array_size is too small for the number of characters in the
+supplied text, the functions return zero
+and num_chars_return is set to the number of rectangles required.
+Otherwise, the functions return a nonzero value.
+.LP
+If the overall_ink_return or overall_logical_return argument is non-NULL,
+.ZN XmbTextPerCharExtents ,
+.ZN XwcTextPerCharExtents
+and 
+.ZN Xutf8TextPerCharExtents
+return the maximum extent of the string's metrics to overall_ink_return
+or overall_logical_return, as returned by 
+.ZN XmbTextExtents ,
+.ZN XwcTextExtents
+or 
+.ZN Xutf8TextExtents .
+.LP
+The function
+.ZN Xutf8TextPerCharExtents
+is an extension introduced by The XFree86 Project, Inc. in their 4.0.2
+release. Its presence is
+indicated by the macro
+.ZN X_HAVE_UTF8_STRING .
+.SH "SEE ALSO"
+XmbTextEscapement(__libmansuffix__),
+XmbTextExtents(__libmansuffix__)
+\fI\*(xL\fP
diff --git a/libX11/man/XrmEnumerateDatabase.man b/libX11/man/XrmEnumerateDatabase.man
index a11c658bf..843100635 100644
--- a/libX11/man/XrmEnumerateDatabase.man
+++ b/libX11/man/XrmEnumerateDatabase.man
@@ -1,234 +1,171 @@
-'\" t

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" t

-.TH XrmEnumerateDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmEnumerateDatabase \- enumerate resource database entries

-.SH SYNTAX

-.TS

-lw(.5i) lw(2i) lw(2.5i).

-T{

-\&#define

-T}	T{

-.ZN XrmEnumAllLevels

-T}	T{

-0

-T}

-T{

-\&#define

-T}	T{

-.ZN XrmEnumOneLevel

-T}	T{

-1

-T}

-.TE

-.HP

-Bool XrmEnumerateDatabase\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList

-\fIname_prefix\fP\^, XrmClassList \fIclass_prefix\fP\^, int \fImode\fP\^, Bool

-(\^*\fIproc\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 

-.SH ARGUMENTS

-.IP \fIdatabase\fP 1i

-Specifies the resource database.

-.IP \fIname_prefix\fP 1i

-Specifies the resource name prefix.

-.IP \fIclass_prefix\fP 1i

-Specifies the resource class prefix.

-.IP \fImode\fP 1i

-Specifies the number of levels to enumerate.

-.IP \fIproc\fP 1i

-Specifies the procedure that is to be called for each matching entry.

-.IP \fIarg\fP 1i

-Specifies the user-supplied argument that will be passed to the procedure.

-.SH DESCRIPTION

-The

-.ZN XrmEnumerateDatabase

-function calls the specified procedure for each resource in the database

-that would match some completion of the given name/class resource prefix.

-The order in which resources are found is implementation-dependent.

-If mode is

-.ZN XrmEnumOneLevel ,

-a resource must match the given name/class prefix with

-just a single name and class appended.  If mode is

-.ZN XrmEnumAllLevels ,

-the resource must match the given name/class prefix with one or more names and

-classes appended.

-If the procedure returns

-.ZN True ,

-the enumeration terminates and the function returns

-.ZN True . 

-If the procedure always returns

-.ZN False ,

-all matching resources are enumerated and the function returns

-.ZN False .

-.LP

-The procedure is called with the following arguments:

-.LP

-.\" Start marker code here

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-(*\fIproc\fP\^)(\^\fIdatabase\fP, \fIbindings\fP, \fIquarks\fP, \fItype\fP, \fIvalue\fP, \fIarg\fP\^)

-	XrmDatabase *\fIdatabase\fP\^;

-	XrmBindingList \fIbindings\fP\^;

-	XrmQuarkList \fIquarks\fP\^;

-	XrmRepresentation *\fItype\fP\^;

-	XrmValue *\fIvalue\fP\^;

-	XPointer \fIarg\fP\^;

-.De

-.\" End marker code here

-.LP

-The bindings and quarks lists are terminated by

-.ZN NULLQUARK .

-Note that pointers

-to the database and type are passed, but these values should not be modified.

-.LP

-The procedure must not modify the database.

-If Xlib has been initialized for threads, the procedure is called with

-the database locked and the result of a call by the procedure to any

-Xlib function using the same database is not defined.

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmInitialize(__libmansuffix__),

-XrmPutResource(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" t
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" t
+.TH XrmEnumerateDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmEnumerateDatabase \- enumerate resource database entries
+.SH SYNTAX
+.TS
+lw(.5i) lw(2i) lw(2.5i).
+T{
+\&#define
+T}	T{
+.ZN XrmEnumAllLevels
+T}	T{
+0
+T}
+T{
+\&#define
+T}	T{
+.ZN XrmEnumOneLevel
+T}	T{
+1
+T}
+.TE
+.HP
+Bool XrmEnumerateDatabase\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fIname_prefix\fP\^, XrmClassList \fIclass_prefix\fP\^, int \fImode\fP\^, Bool
+(\^*\fIproc\fP\^)\^(\^)\^, XPointer \fIarg\fP\^); 
+.SH ARGUMENTS
+.IP \fIdatabase\fP 1i
+Specifies the resource database.
+.IP \fIname_prefix\fP 1i
+Specifies the resource name prefix.
+.IP \fIclass_prefix\fP 1i
+Specifies the resource class prefix.
+.IP \fImode\fP 1i
+Specifies the number of levels to enumerate.
+.IP \fIproc\fP 1i
+Specifies the procedure that is to be called for each matching entry.
+.IP \fIarg\fP 1i
+Specifies the user-supplied argument that will be passed to the procedure.
+.SH DESCRIPTION
+The
+.ZN XrmEnumerateDatabase
+function calls the specified procedure for each resource in the database
+that would match some completion of the given name/class resource prefix.
+The order in which resources are found is implementation-dependent.
+If mode is
+.ZN XrmEnumOneLevel ,
+a resource must match the given name/class prefix with
+just a single name and class appended.  If mode is
+.ZN XrmEnumAllLevels ,
+the resource must match the given name/class prefix with one or more names and
+classes appended.
+If the procedure returns
+.ZN True ,
+the enumeration terminates and the function returns
+.ZN True . 
+If the procedure always returns
+.ZN False ,
+all matching resources are enumerated and the function returns
+.ZN False .
+.LP
+The procedure is called with the following arguments:
+.LP
+.\" Start marker code here
+.Ds 0
+(*\fIproc\fP\^)(\^\fIdatabase\fP, \fIbindings\fP, \fIquarks\fP, \fItype\fP, \fIvalue\fP, \fIarg\fP\^)
+        XrmDatabase *\fIdatabase\fP\^;
+        XrmBindingList \fIbindings\fP\^;
+        XrmQuarkList \fIquarks\fP\^;
+        XrmRepresentation *\fItype\fP\^;
+        XrmValue *\fIvalue\fP\^;
+        XPointer \fIarg\fP\^;
+.De
+.\" End marker code here
+.LP
+The bindings and quarks lists are terminated by
+.ZN NULLQUARK .
+Note that pointers
+to the database and type are passed, but these values should not be modified.
+.LP
+The procedure must not modify the database.
+If Xlib has been initialized for threads, the procedure is called with
+the database locked and the result of a call by the procedure to any
+Xlib function using the same database is not defined.
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmGetFileDatabase.man b/libX11/man/XrmGetFileDatabase.man
index 67190a02e..3a8a6fa82 100644
--- a/libX11/man/XrmGetFileDatabase.man
+++ b/libX11/man/XrmGetFileDatabase.man
@@ -1,323 +1,262 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.de EX

-.sp

-.nf

-.ft CW

-..

-.de EE

-.ft R

-.fi

-.sp

-..

-.TH XrmGetFileDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases

-.SH SYNTAX

-.HP

-XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^); 

-.HP

-void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char

-*\fIstored_db\fP\^); 

-.HP

-XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^, 

-.HP

-char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 

-.HP

-XrmDatabase XrmGetDatabase\^(\^Display *\fIdisplay\fP\^); 

-.HP

-void XrmSetDatabase\^(\^Display *\fIdisplay\fP\^, XrmDatabase

-\fIdatabase\fP\^); 

-.HP

-void XrmDestroyDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 

-.SH ARGUMENTS

-.IP \fIfilename\fP 1i

-Specifies the resource database file name.

-.IP \fIdatabase\fP 1i

-Specifies the database that is to be used.

-.IP \fIstored_db\fP 1i

-Specifies the file name for the stored database.

-.IP \fIdata\fP 1i

-Specifies the database contents using a string.

-.IP \fIdatabase\fP 1i

-Specifies the resource database.

-.IP \fIdisplay\fP 1i

-Specifies the connection to the X server.

-.SH DESCRIPTION

-The

-.ZN XrmGetFileDatabase

-function opens the specified file,

-creates a new resource database, and loads it with the specifications

-read in from the specified file.

-The specified file should contain a sequence of entries in valid ResourceLine

-format (see section 15.1); the database that results from reading a file

-with incorrect syntax is implementation-dependent.

-The file is parsed in the current locale, 

-and the database is created in the current locale.

-If it cannot open the specified file,

-.ZN XrmGetFileDatabase

-returns NULL.

-.LP

-The

-.ZN XrmPutFileDatabase

-function stores a copy of the specified database in the specified file.

-Text is written to the file as a sequence of entries in valid

-ResourceLine format (see section 15.1).

-The file is written in the locale of the database.

-Entries containing resource names that are not in the Host Portable Character

-Encoding or containing values that are not in the encoding of the database

-locale, are written in an implementation-dependent manner.

-The order in which entries are written is implementation-dependent.

-Entries with representation types other than ``String'' are ignored.

-.LP

-The

-.ZN XrmGetStringDatabase

-function creates a new database and stores the resources specified

-in the specified null-terminated string.

-.ZN XrmGetStringDatabase

-is similar to

-.ZN XrmGetFileDatabase

-except that it reads the information out of a string instead of out of a file.

-The string should contain a sequence of entries in valid ResourceLine

-format (see section 15.1) terminated by a null character;

-the database that results from using a string

-with incorrect syntax is implementation-dependent.

-The string is parsed in the current locale, 

-and the database is created in the current locale.

-.LP

-If database is NULL,

-.ZN XrmDestroyDatabase

-returns immediately.

-.LP

-The

-.ZN XrmLocaleOfDatabase

-function returns the name of the locale bound to the specified

-database, as a null-terminated string.

-The returned locale name string is owned by Xlib and should not be

-modified or freed by the client.

-Xlib is not permitted to free the string until the database is destroyed.

-Until the string is freed,

-it will not be modified by Xlib.

-.LP

-The

-.ZN XrmGetDatabase

-function returns the database associated with the specified display.

-It returns NULL if a database has not yet been set.

-.LP

-The

-.ZN XrmSetDatabase

-function associates the specified resource database (or NULL)

-with the specified display.

-The database previously associated with the display (if any) is not destroyed.

-A client or toolkit may find this function convenient for retaining a database

-once it is constructed.

-.SH "FILE SYNTAX"

-The syntax of a resource file is a sequence of resource lines

-terminated by newline characters or the end of the file.

-The syntax of an individual resource line is:

-.LP

-.\" Start marker code here

-.EX

-ResourceLine	=	Comment | IncludeFile | ResourceSpec | <empty line>

-Comment	=	"!" {<any character except null or newline>}

-IncludeFile	=	"#" WhiteSpace "include" WhiteSpace FileName WhiteSpace

-FileName	=	<valid filename for operating system>

-ResourceSpec	=	WhiteSpace ResourceName WhiteSpace ":" WhiteSpace Value

-ResourceName	=	[Binding] {Component Binding} ComponentName

-Binding	=	"\&." | "*"

-WhiteSpace	=	{<space> | <horizontal tab>}

-Component	=	"?" | ComponentName

-ComponentName	=	NameChar {NameChar}

-NameChar	=	"a"\-"z" | "A"\-"Z" | "0"\-"9" | "_" | "-"

-Value	=	{<any character except null or unescaped newline>}

-.EE

-.LP

-Elements separated by vertical bar (|) are alternatives.

-Curly braces ({\&.\&.\&.}) indicate zero or more repetitions

-of the enclosed elements.

-Square brackets ([\&.\&.\&.]) indicate that the enclosed element is optional.

-Quotes ("\&.\&.\&.") are used around literal characters.

-.LP

-IncludeFile lines are interpreted by replacing the line with the

-contents of the specified file.

-The word ``include'' must be in lowercase.

-The file name is interpreted relative to the directory of the file in

-which the line occurs (for example, if the file name contains no

-directory or contains a relative directory specification).

-.LP

-If a ResourceName contains a contiguous sequence of two or more Binding

-characters, the sequence will be replaced with single ``\&.'' character

-if the sequence contains only ``\&.'' characters;

-otherwise, the sequence will be replaced with a single ``*'' character.

-.LP

-A resource database never contains more than one entry for a given

-ResourceName.  If a resource file contains multiple lines with the

-same ResourceName, the last line in the file is used.

-.LP

-Any white space characters before or after the name or colon in a ResourceSpec

-are ignored.

-To allow a Value to begin with white space,

-the two-character sequence ``\^\\\^\fIspace\fP'' (backslash followed by space)

-is recognized and replaced by a space character,

-and the two-character sequence ``\^\\\^\fItab\fP''

-(backslash followed by horizontal tab)

-is recognized and replaced by a horizontal tab character.

-To allow a Value to contain embedded newline characters,

-the two-character sequence ``\^\\\^n'' is recognized and replaced by a

-newline character.

-To allow a Value to be broken across multiple lines in a text file,

-the two-character sequence ``\^\\\^\fInewline\fP''

-(backslash followed by newline) is

-recognized and removed from the value.

-To allow a Value to contain arbitrary character codes,

-the four-character sequence ``\^\\\^\fInnn\fP'',

-where each \fIn\fP is a digit character in the range of ``0''\^\-``7'',

-is recognized and replaced with a single byte that contains

-the octal value specified by the sequence.

-Finally, the two-character sequence ``\^\\\\'' is recognized

-and replaced with a single backslash.

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmInitialize(__libmansuffix__),

-XrmPutResource(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.de EX
+.sp
+.nf
+.ft CW
+..
+.de EE
+.ft R
+.fi
+.sp
+..
+.TH XrmGetFileDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
+.SH SYNTAX
+.HP
+XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^); 
+.HP
+void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
+*\fIstored_db\fP\^); 
+.HP
+XrmDatabase XrmGetStringDatabase\^(\^char *\fIdata\fP\^, 
+.HP
+char *XrmLocaleOfDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 
+.HP
+XrmDatabase XrmGetDatabase\^(\^Display *\fIdisplay\fP\^); 
+.HP
+void XrmSetDatabase\^(\^Display *\fIdisplay\fP\^, XrmDatabase
+\fIdatabase\fP\^); 
+.HP
+void XrmDestroyDatabase\^(\^XrmDatabase \fIdatabase\fP\^); 
+.SH ARGUMENTS
+.IP \fIfilename\fP 1i
+Specifies the resource database file name.
+.IP \fIdatabase\fP 1i
+Specifies the database that is to be used.
+.IP \fIstored_db\fP 1i
+Specifies the file name for the stored database.
+.IP \fIdata\fP 1i
+Specifies the database contents using a string.
+.IP \fIdatabase\fP 1i
+Specifies the resource database.
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.SH DESCRIPTION
+The
+.ZN XrmGetFileDatabase
+function opens the specified file,
+creates a new resource database, and loads it with the specifications
+read in from the specified file.
+The specified file should contain a sequence of entries in valid ResourceLine
+format (see section 15.1); the database that results from reading a file
+with incorrect syntax is implementation-dependent.
+The file is parsed in the current locale, 
+and the database is created in the current locale.
+If it cannot open the specified file,
+.ZN XrmGetFileDatabase
+returns NULL.
+.LP
+The
+.ZN XrmPutFileDatabase
+function stores a copy of the specified database in the specified file.
+Text is written to the file as a sequence of entries in valid
+ResourceLine format (see section 15.1).
+The file is written in the locale of the database.
+Entries containing resource names that are not in the Host Portable Character
+Encoding or containing values that are not in the encoding of the database
+locale, are written in an implementation-dependent manner.
+The order in which entries are written is implementation-dependent.
+Entries with representation types other than ``String'' are ignored.
+.LP
+The
+.ZN XrmGetStringDatabase
+function creates a new database and stores the resources specified
+in the specified null-terminated string.
+.ZN XrmGetStringDatabase
+is similar to
+.ZN XrmGetFileDatabase
+except that it reads the information out of a string instead of out of a file.
+The string should contain a sequence of entries in valid ResourceLine
+format (see section 15.1) terminated by a null character;
+the database that results from using a string
+with incorrect syntax is implementation-dependent.
+The string is parsed in the current locale, 
+and the database is created in the current locale.
+.LP
+If database is NULL,
+.ZN XrmDestroyDatabase
+returns immediately.
+.LP
+The
+.ZN XrmLocaleOfDatabase
+function returns the name of the locale bound to the specified
+database, as a null-terminated string.
+The returned locale name string is owned by Xlib and should not be
+modified or freed by the client.
+Xlib is not permitted to free the string until the database is destroyed.
+Until the string is freed,
+it will not be modified by Xlib.
+.LP
+The
+.ZN XrmGetDatabase
+function returns the database associated with the specified display.
+It returns NULL if a database has not yet been set.
+.LP
+The
+.ZN XrmSetDatabase
+function associates the specified resource database (or NULL)
+with the specified display.
+The database previously associated with the display (if any) is not destroyed.
+A client or toolkit may find this function convenient for retaining a database
+once it is constructed.
+.SH "FILE SYNTAX"
+The syntax of a resource file is a sequence of resource lines
+terminated by newline characters or the end of the file.
+The syntax of an individual resource line is:
+.LP
+.\" Start marker code here
+.EX
+ResourceLine	=	Comment | IncludeFile | ResourceSpec | <empty line>
+Comment	=	"!" {<any character except null or newline>}
+IncludeFile	=	"#" WhiteSpace "include" WhiteSpace FileName WhiteSpace
+FileName	=	<valid filename for operating system>
+ResourceSpec	=	WhiteSpace ResourceName WhiteSpace ":" WhiteSpace Value
+ResourceName	=	[Binding] {Component Binding} ComponentName
+Binding	=	"\&." | "*"
+WhiteSpace	=	{<space> | <horizontal tab>}
+Component	=	"?" | ComponentName
+ComponentName	=	NameChar {NameChar}
+NameChar	=	"a"\-"z" | "A"\-"Z" | "0"\-"9" | "_" | "-"
+Value	=	{<any character except null or unescaped newline>}
+.EE
+.LP
+Elements separated by vertical bar (|) are alternatives.
+Curly braces ({\&.\&.\&.}) indicate zero or more repetitions
+of the enclosed elements.
+Square brackets ([\&.\&.\&.]) indicate that the enclosed element is optional.
+Quotes ("\&.\&.\&.") are used around literal characters.
+.LP
+IncludeFile lines are interpreted by replacing the line with the
+contents of the specified file.
+The word ``include'' must be in lowercase.
+The file name is interpreted relative to the directory of the file in
+which the line occurs (for example, if the file name contains no
+directory or contains a relative directory specification).
+.LP
+If a ResourceName contains a contiguous sequence of two or more Binding
+characters, the sequence will be replaced with single ``\&.'' character
+if the sequence contains only ``\&.'' characters;
+otherwise, the sequence will be replaced with a single ``*'' character.
+.LP
+A resource database never contains more than one entry for a given
+ResourceName.  If a resource file contains multiple lines with the
+same ResourceName, the last line in the file is used.
+.LP
+Any white space characters before or after the name or colon in a ResourceSpec
+are ignored.
+To allow a Value to begin with white space,
+the two-character sequence ``\^\\\^\fIspace\fP'' (backslash followed by space)
+is recognized and replaced by a space character,
+and the two-character sequence ``\^\\\^\fItab\fP''
+(backslash followed by horizontal tab)
+is recognized and replaced by a horizontal tab character.
+To allow a Value to contain embedded newline characters,
+the two-character sequence ``\^\\\^n'' is recognized and replaced by a
+newline character.
+To allow a Value to be broken across multiple lines in a text file,
+the two-character sequence ``\^\\\^\fInewline\fP''
+(backslash followed by newline) is
+recognized and removed from the value.
+To allow a Value to contain arbitrary character codes,
+the four-character sequence ``\^\\\^\fInnn\fP'',
+where each \fIn\fP is a digit character in the range of ``0''\^\-``7'',
+is recognized and replaced with a single byte that contains
+the octal value specified by the sequence.
+Finally, the two-character sequence ``\^\\\\'' is recognized
+and replaced with a single backslash.
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmGetResource.man b/libX11/man/XrmGetResource.man
index 651992eb0..76ca9218c 100644
--- a/libX11/man/XrmGetResource.man
+++ b/libX11/man/XrmGetResource.man
@@ -1,325 +1,264 @@
-'\" e

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-'\" e

-.TH XrmGetResource __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmGetResource, XrmQGetResource, XrmQGetSearchList, XrmQGetSearchResource \- retrieve database resources and search lists

-.SH SYNTAX

-.HP

-Bool XrmGetResource\^(\^XrmDatabase \fIdatabase\fP\^, char *\fIstr_name\fP\^,

-char *\fIstr_class\fP\^, char **\fIstr_type_return\fP\^, XrmValue

-*\fIvalue_return\fP\^); 

-.HP

-Bool XrmQGetResource\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList

-\fIquark_name\fP\^, XrmClassList \fIquark_class\fP\^, XrmRepresentation

-*\fIquark_type_return\fP\^, XrmValue *\fIvalue_return\fP\^); 

-.HP

-typedef XrmHashTable *XrmSearchList;

-.sp

-Bool XrmQGetSearchList\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList

-\fInames\fP\^, XrmClassList \fIclasses\fP\^, XrmSearchList

-\fIlist_return\fP\^, int \fIlist_length\fP\^); 

-.HP

-Bool XrmQGetSearchResource\^(\^XrmSearchList \fIlist\fP\^, XrmName

-\fIname\fP\^, XrmClass \fIclass\fP\^, XrmRepresentation *\fItype_return\fP\^, 

-XrmValue *\fIvalue_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIclass\fP 1i

-Specifies the resource class.

-.IP \fIclasses\fP 1i

-Specifies a list of resource classes.

-.IP \fIdatabase\fP 1i

-Specifies the database that is to be used.

-.IP \fIlist\fP 1i

-Specifies the search list returned by

-.ZN XrmQGetSearchList .

-.IP \fIlist_length\fP 1i

-Specifies the number of entries (not the byte size) allocated for list_return.

-.IP \fIlist_return\fP 1i

-Returns a search list for further use.

-.IP \fIname\fP 1i

-Specifies the resource name.

-.IP \fInames\fP 1i

-Specifies a list of resource names.

-.IP \fIquark_class\fP 1i

-Specifies the fully qualified class of the value being retrieved (as a quark).

-.IP \fIquark_name\fP 1i

-Specifies the fully qualified name of the value being retrieved (as a quark).

-.IP \fIquark_type_return\fP 1i

-Returns the representation type of the destination (as a quark).

-.IP \fIstr_class\fP 1i

-Specifies the fully qualified class of the value being retrieved (as a string).

-.IP \fIstr_name\fP 1i

-Specifies the fully qualified name of the value being retrieved (as a string).

-.IP \fIstr_type_return\fP 1i

-Returns the representation type of the destination (as a string).

-.IP \fItype_return\fP 1i

-Returns data representation type.

-.IP \fIvalue_return\fP 1i

-Returns the value in the database.

-.SH DESCRIPTION

-The 

-.ZN XrmGetResource 

-and 

-.ZN XrmQGetResource 

-functions retrieve a resource from the specified database.

-Both take a fully qualified name/class pair, a destination

-resource representation, and the address of a value

-(size/address pair).  

-The value and returned type point into database memory;

-therefore, you must not modify the data.

-.LP

-The database only frees or overwrites entries on

-.ZN XrmPutResource , 

-.ZN XrmQPutResource ,

-or 

-.ZN XrmMergeDatabases .

-A client that is not storing new values into the database or

-is not merging the database should be safe using the address passed 

-back at any time until it exits.

-If a resource was found, both

-.ZN XrmGetResource 

-and

-.ZN XrmQGetResource 

-return 

-.ZN True ;

-otherwise, they return 

-.ZN False .

-.LP

-The

-.ZN XrmQGetSearchList

-function takes a list of names and classes

-and returns a list of database levels where a match might occur.

-The returned list is in best-to-worst order and

-uses the same algorithm as 

-.ZN XrmGetResource 

-for determining precedence.

-If list_return was large enough for the search list,

-.ZN XrmQGetSearchList

-returns 

-.ZN True ;

-otherwise, it returns

-.ZN False .

-.LP

-The size of the search list that the caller must allocate is

-dependent upon the number of levels and wildcards in the resource specifiers 

-that are stored in the database.

-The worst case length is %3 sup n%,

-where \fIn\fP is the number of name or class components in names or classes.

-.LP

-When using 

-.ZN XrmQGetSearchList 

-followed by multiple probes for resources with a common name and class prefix,

-only the common prefix should be specified in the name and class list to 

-.ZN XrmQGetSearchList .

-.LP

-The

-.ZN XrmQGetSearchResource

-function searches the specified database levels for the resource 

-that is fully identified by the specified name and class.

-The search stops with the first match.

-.ZN XrmQGetSearchResource

-returns 

-.ZN True 

-if the resource was found;

-otherwise, it returns

-.ZN False .

-.LP

-A call to 

-.ZN XrmQGetSearchList 

-with a name and class list containing all but the last component 

-of a resource name followed by a call to 

-.ZN XrmQGetSearchResource 

-with the last component name and class returns the same database entry as 

-.ZN XrmGetResource 

-and 

-.ZN XrmQGetResource 

-with the fully qualified name and class.

-.SH "MATCHING RULES"

-The algorithm for determining which resource database entry

-matches a given query is the heart of the resource manager.

-All queries must fully specify the name and class of the desired resource

-(use of the characters ``*'' and ``?'' are not permitted).

-The library supports up to 100 components in a full name or class.

-Resources are stored in the database with only partially specified

-names and classes, using pattern matching constructs.

-An asterisk (*) is a loose binding and is used to represent any number

-of intervening components, including none.

-A period (.) is a tight binding and is used to separate immediately

-adjacent components.

-A question mark (?) is used to match any single component name or class.

-A database entry cannot end in a loose binding;

-the final component (which cannot be the character ``?'') must be specified.

-The lookup algorithm searches the database for the entry that most

-closely matches (is most specific for) the full name and class being queried.

-When more than one database entry matches the full name and class,

-precedence rules are used to select just one.

-.LP

-The full name and class are scanned from left to right (from highest

-level in the hierarchy to lowest), one component at a time.

-At each level, the corresponding component and/or binding of each

-matching entry is determined, and these matching components and

-bindings are compared according to precedence rules.

-Each of the rules is applied at each level before moving to the next level,

-until a rule selects a single entry over all others.

-The rules, in order of precedence, are:

-.IP 1. 5

-An entry that contains a matching component (whether name, class,

-or the character ``?'')

-takes precedence over entries that elide the level (that is, entries

-that match the level in a loose binding).

-.IP 2. 5

-An entry with a matching name takes precedence over both

-entries with a matching class and entries that match using the character ``?''.

-An entry with a matching class takes precedence over

-entries that match using the character ``?''.

-.IP 3. 5

-An entry preceded by a tight binding takes precedence over entries

-preceded by a loose binding.

-.SH "SEE ALSO"

-XrmInitialize(__libmansuffix__),

-XrmMergeDatabases(__libmansuffix__),

-XrmPutResource(__libmansuffix__),

-XrmUniqueQuark(__libmansuffix__)

-.br

-\fI\*(xL\fP

+'\" e
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+'\" e
+.TH XrmGetResource __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmGetResource, XrmQGetResource, XrmQGetSearchList, XrmQGetSearchResource \- retrieve database resources and search lists
+.SH SYNTAX
+.HP
+Bool XrmGetResource\^(\^XrmDatabase \fIdatabase\fP\^, char *\fIstr_name\fP\^,
+char *\fIstr_class\fP\^, char **\fIstr_type_return\fP\^, XrmValue
+*\fIvalue_return\fP\^); 
+.HP
+Bool XrmQGetResource\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fIquark_name\fP\^, XrmClassList \fIquark_class\fP\^, XrmRepresentation
+*\fIquark_type_return\fP\^, XrmValue *\fIvalue_return\fP\^); 
+.HP
+typedef XrmHashTable *XrmSearchList;
+.sp
+Bool XrmQGetSearchList\^(\^XrmDatabase \fIdatabase\fP\^, XrmNameList
+\fInames\fP\^, XrmClassList \fIclasses\fP\^, XrmSearchList
+\fIlist_return\fP\^, int \fIlist_length\fP\^); 
+.HP
+Bool XrmQGetSearchResource\^(\^XrmSearchList \fIlist\fP\^, XrmName
+\fIname\fP\^, XrmClass \fIclass\fP\^, XrmRepresentation *\fItype_return\fP\^, 
+XrmValue *\fIvalue_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIclass\fP 1i
+Specifies the resource class.
+.IP \fIclasses\fP 1i
+Specifies a list of resource classes.
+.IP \fIdatabase\fP 1i
+Specifies the database that is to be used.
+.IP \fIlist\fP 1i
+Specifies the search list returned by
+.ZN XrmQGetSearchList .
+.IP \fIlist_length\fP 1i
+Specifies the number of entries (not the byte size) allocated for list_return.
+.IP \fIlist_return\fP 1i
+Returns a search list for further use.
+.IP \fIname\fP 1i
+Specifies the resource name.
+.IP \fInames\fP 1i
+Specifies a list of resource names.
+.IP \fIquark_class\fP 1i
+Specifies the fully qualified class of the value being retrieved (as a quark).
+.IP \fIquark_name\fP 1i
+Specifies the fully qualified name of the value being retrieved (as a quark).
+.IP \fIquark_type_return\fP 1i
+Returns the representation type of the destination (as a quark).
+.IP \fIstr_class\fP 1i
+Specifies the fully qualified class of the value being retrieved (as a string).
+.IP \fIstr_name\fP 1i
+Specifies the fully qualified name of the value being retrieved (as a string).
+.IP \fIstr_type_return\fP 1i
+Returns the representation type of the destination (as a string).
+.IP \fItype_return\fP 1i
+Returns data representation type.
+.IP \fIvalue_return\fP 1i
+Returns the value in the database.
+.SH DESCRIPTION
+The 
+.ZN XrmGetResource 
+and 
+.ZN XrmQGetResource 
+functions retrieve a resource from the specified database.
+Both take a fully qualified name/class pair, a destination
+resource representation, and the address of a value
+(size/address pair).  
+The value and returned type point into database memory;
+therefore, you must not modify the data.
+.LP
+The database only frees or overwrites entries on
+.ZN XrmPutResource , 
+.ZN XrmQPutResource ,
+or 
+.ZN XrmMergeDatabases .
+A client that is not storing new values into the database or
+is not merging the database should be safe using the address passed 
+back at any time until it exits.
+If a resource was found, both
+.ZN XrmGetResource 
+and
+.ZN XrmQGetResource 
+return 
+.ZN True ;
+otherwise, they return 
+.ZN False .
+.LP
+The
+.ZN XrmQGetSearchList
+function takes a list of names and classes
+and returns a list of database levels where a match might occur.
+The returned list is in best-to-worst order and
+uses the same algorithm as 
+.ZN XrmGetResource 
+for determining precedence.
+If list_return was large enough for the search list,
+.ZN XrmQGetSearchList
+returns 
+.ZN True ;
+otherwise, it returns
+.ZN False .
+.LP
+The size of the search list that the caller must allocate is
+dependent upon the number of levels and wildcards in the resource specifiers 
+that are stored in the database.
+The worst case length is %3 sup n%,
+where \fIn\fP is the number of name or class components in names or classes.
+.LP
+When using 
+.ZN XrmQGetSearchList 
+followed by multiple probes for resources with a common name and class prefix,
+only the common prefix should be specified in the name and class list to 
+.ZN XrmQGetSearchList .
+.LP
+The
+.ZN XrmQGetSearchResource
+function searches the specified database levels for the resource 
+that is fully identified by the specified name and class.
+The search stops with the first match.
+.ZN XrmQGetSearchResource
+returns 
+.ZN True 
+if the resource was found;
+otherwise, it returns
+.ZN False .
+.LP
+A call to 
+.ZN XrmQGetSearchList 
+with a name and class list containing all but the last component 
+of a resource name followed by a call to 
+.ZN XrmQGetSearchResource 
+with the last component name and class returns the same database entry as 
+.ZN XrmGetResource 
+and 
+.ZN XrmQGetResource 
+with the fully qualified name and class.
+.SH "MATCHING RULES"
+The algorithm for determining which resource database entry
+matches a given query is the heart of the resource manager.
+All queries must fully specify the name and class of the desired resource
+(use of the characters ``*'' and ``?'' are not permitted).
+The library supports up to 100 components in a full name or class.
+Resources are stored in the database with only partially specified
+names and classes, using pattern matching constructs.
+An asterisk (*) is a loose binding and is used to represent any number
+of intervening components, including none.
+A period (.) is a tight binding and is used to separate immediately
+adjacent components.
+A question mark (?) is used to match any single component name or class.
+A database entry cannot end in a loose binding;
+the final component (which cannot be the character ``?'') must be specified.
+The lookup algorithm searches the database for the entry that most
+closely matches (is most specific for) the full name and class being queried.
+When more than one database entry matches the full name and class,
+precedence rules are used to select just one.
+.LP
+The full name and class are scanned from left to right (from highest
+level in the hierarchy to lowest), one component at a time.
+At each level, the corresponding component and/or binding of each
+matching entry is determined, and these matching components and
+bindings are compared according to precedence rules.
+Each of the rules is applied at each level before moving to the next level,
+until a rule selects a single entry over all others.
+The rules, in order of precedence, are:
+.IP 1. 5
+An entry that contains a matching component (whether name, class,
+or the character ``?'')
+takes precedence over entries that elide the level (that is, entries
+that match the level in a loose binding).
+.IP 2. 5
+An entry with a matching name takes precedence over both
+entries with a matching class and entries that match using the character ``?''.
+An entry with a matching class takes precedence over
+entries that match using the character ``?''.
+.IP 3. 5
+An entry preceded by a tight binding takes precedence over entries
+preceded by a loose binding.
+.SH "SEE ALSO"
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmInitialize.man b/libX11/man/XrmInitialize.man
index 813ed1cd8..b8b549db6 100644
--- a/libX11/man/XrmInitialize.man
+++ b/libX11/man/XrmInitialize.man
@@ -1,263 +1,196 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XrmInitialize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- initialize the Resource Manager, Resource Manager structures, and parse the command line

-.SH SYNTAX

-.HP

-void XrmInitialize\^(void\^);

-.HP

-void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList

-\fItable\fP\^, int \fItable_count\fP\^, char *\fIname\fP\^, int

-*\fIargc_in_out\fP\^, char **\fIargv_in_out\fP\^); 

-.SH ARGUMENTS

-.IP \fIargc_in_out\fP 1i

-Specifies the number of arguments and returns the number of remaining arguments.

-.IP \fIargv_in_out\fP 1i

-Specifies the command line arguments

-and returns the remaining arguments.

-.IP \fIdatabase\fP 1i

-Specifies the resource database.

-.IP \fIname\fP 1i

-Specifies the application name.

-.IP \fItable\fP 1i

-Specifies the table of command line arguments to be parsed.

-.IP \fItable_count\fP 1i

-Specifies the number of entries in the table.

-.SH DESCRIPTION

-The

-.ZN XrmInitialize

-function initialize the resource manager.

-It must be called before any other Xrm functions are used.

-.LP

-The

-.ZN XrmParseCommand

-function parses an (argc, argv) pair according to the specified option table,

-loads recognized options into the specified database with type ``String,''

-and modifies the (argc, argv) pair to remove all recognized options.

-If database contains NULL,

-.ZN XrmParseCommand

-creates a new database and returns a pointer to it.

-Otherwise, entries are added to the database specified.

-If a database is created, it is created in the current locale.

-.LP

-The specified table is used to parse the command line.

-Recognized options in the table are removed from argv,

-and entries are added to the specified resource database

-in the order they occur in argv.

-The table entries contain information on the option string,

-the option name, the style of option, 

-and a value to provide if the option kind is 

-.ZN XrmoptionNoArg .

-The option names are compared byte-for-byte to arguments in argv,

-independent of any locale.

-The resource values given in the table are stored in the resource database

-without modification.

-All resource database entries are created

-using a ``String'' representation type.

-The argc argument specifies the number of arguments in argv

-and is set on return to the remaining number of arguments that were not parsed.

-The name argument should be the name of your application

-for use in building the database entry.

-The name argument is prefixed to the resourceName in the option table

-before storing a database entry.

-The name argument is treated as a single component, even if it

-has embedded periods.

-No separating (binding) character is inserted,

-so the table must contain either a period (.) or an asterisk (*)

-as the first character in each resourceName entry.

-To specify a more completely qualified resource name,

-the resourceName entry can contain multiple components.

-If the name argument and the resourceNames are not in the

-Host Portable Character Encoding,

-the result is implementation-dependent.

-.SH STRUCTURES

-The

-.ZN XrmValue ,

-.ZN XrmOptionKind ,

-and

-.ZN XrmOptionDescRec

-structures contain:

-.LP

-.Ds 0

-.TA .5i 3i

-.ta .5i 3i

-typedef struct {

-	unsigned int size;

-	XPointer addr;

-} XrmValue, *XrmValuePtr;

-.De

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef enum {

-	XrmoptionNoArg,	/\&* Value is specified in XrmOptionDescRec.value */

-	XrmoptionIsArg,	/\&* Value is the option string itself */

-	XrmoptionStickyArg,	/\&* Value is characters immediately following option */

-	XrmoptionSepArg,	/\&* Value is next argument in argv */

-	XrmoptionResArg,	/\&* Resource and value in next argument in argv */

-	XrmoptionSkipArg,	/\&* Ignore this option and the next argument in argv */

-	XrmoptionSkipLine,	/\&* Ignore this option and the rest of argv */

-	XrmoptionSkipNArgs	/\&* Ignore this option and the next

-		\ \ \ XrmOptionDescRec.value arguments in argv */

-} XrmOptionKind;

-.De

-.LP

-.Ds 0

-.TA .5i 2.5i

-.ta .5i 2.5i

-typedef struct {

-	char *option;	/\&* Option specification string in argv		    */

-	char *specifier;	/\&* Binding and resource name (sans application name)    */

-	XrmOptionKind argKind;	/\&* Which style of option it is	    */

-	XPointer value;	/\&* Value to provide if XrmoptionNoArg or 

-		\ \ \ XrmoptionSkipNArgs   */

-} XrmOptionDescRec, *XrmOptionDescList;

-.De

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmMergeDatabases(__libmansuffix__),

-XrmPutResource(__libmansuffix__),

-XrmUniqueQuark(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XrmInitialize __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- initialize the Resource Manager, Resource Manager structures, and parse the command line
+.SH SYNTAX
+.HP
+void XrmInitialize\^(void\^);
+.HP
+void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList
+\fItable\fP\^, int \fItable_count\fP\^, char *\fIname\fP\^, int
+*\fIargc_in_out\fP\^, char **\fIargv_in_out\fP\^); 
+.SH ARGUMENTS
+.IP \fIargc_in_out\fP 1i
+Specifies the number of arguments and returns the number of remaining arguments.
+.IP \fIargv_in_out\fP 1i
+Specifies the command line arguments
+and returns the remaining arguments.
+.IP \fIdatabase\fP 1i
+Specifies the resource database.
+.IP \fIname\fP 1i
+Specifies the application name.
+.IP \fItable\fP 1i
+Specifies the table of command line arguments to be parsed.
+.IP \fItable_count\fP 1i
+Specifies the number of entries in the table.
+.SH DESCRIPTION
+The
+.ZN XrmInitialize
+function initialize the resource manager.
+It must be called before any other Xrm functions are used.
+.LP
+The
+.ZN XrmParseCommand
+function parses an (argc, argv) pair according to the specified option table,
+loads recognized options into the specified database with type ``String,''
+and modifies the (argc, argv) pair to remove all recognized options.
+If database contains NULL,
+.ZN XrmParseCommand
+creates a new database and returns a pointer to it.
+Otherwise, entries are added to the database specified.
+If a database is created, it is created in the current locale.
+.LP
+The specified table is used to parse the command line.
+Recognized options in the table are removed from argv,
+and entries are added to the specified resource database
+in the order they occur in argv.
+The table entries contain information on the option string,
+the option name, the style of option, 
+and a value to provide if the option kind is 
+.ZN XrmoptionNoArg .
+The option names are compared byte-for-byte to arguments in argv,
+independent of any locale.
+The resource values given in the table are stored in the resource database
+without modification.
+All resource database entries are created
+using a ``String'' representation type.
+The argc argument specifies the number of arguments in argv
+and is set on return to the remaining number of arguments that were not parsed.
+The name argument should be the name of your application
+for use in building the database entry.
+The name argument is prefixed to the resourceName in the option table
+before storing a database entry.
+The name argument is treated as a single component, even if it
+has embedded periods.
+No separating (binding) character is inserted,
+so the table must contain either a period (.) or an asterisk (*)
+as the first character in each resourceName entry.
+To specify a more completely qualified resource name,
+the resourceName entry can contain multiple components.
+If the name argument and the resourceNames are not in the
+Host Portable Character Encoding,
+the result is implementation-dependent.
+.SH STRUCTURES
+The
+.ZN XrmValue ,
+.ZN XrmOptionKind ,
+and
+.ZN XrmOptionDescRec
+structures contain:
+.LP
+.Ds 0
+typedef struct {
+        unsigned int size;
+        XPointer addr;
+} XrmValue, *XrmValuePtr;
+.De
+.LP
+.Ds 0
+typedef enum {
+        XrmoptionNoArg, /\&* Value is specified in XrmOptionDescRec.value */
+        XrmoptionIsArg, /\&* Value is the option string itself */
+        XrmoptionStickyArg,     /\&* Value is characters immediately following option */
+        XrmoptionSepArg,        /\&* Value is next argument in argv */
+        XrmoptionResArg,        /\&* Resource and value in next argument in argv */
+        XrmoptionSkipArg,       /\&* Ignore this option and the next argument in argv */
+        XrmoptionSkipLine,      /\&* Ignore this option and the rest of argv */
+        XrmoptionSkipNArgs      /\&* Ignore this option and the next
+                \ \ \ XrmOptionDescRec.value arguments in argv */
+} XrmOptionKind;
+.De
+.LP
+.Ds 0
+typedef struct {
+        char *option;   /\&* Option specification string in argv                    */
+        char *specifier;        /\&* Binding and resource name (sans application name)    */
+        XrmOptionKind argKind;  /\&* Which style of option it is            */
+        XPointer value; /\&* Value to provide if XrmoptionNoArg or 
+                \ \ \ XrmoptionSkipNArgs   */
+} XrmOptionDescRec, *XrmOptionDescList;
+.De
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmMergeDatabases.man b/libX11/man/XrmMergeDatabases.man
index 2139448e1..57a6578ec 100644
--- a/libX11/man/XrmMergeDatabases.man
+++ b/libX11/man/XrmMergeDatabases.man
@@ -1,215 +1,154 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XrmMergeDatabases __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases

-.SH SYNTAX

-.HP

-void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase

-*\fItarget_db\fP\^); 

-.HP

-void XrmCombineDatabase(\^XrmDatabase \fIsource_db\fP, XrmDatabase

-*\fItarget_db\fP, Bool \fIoverride\fP\^); 

-.HP

-Status XrmCombineFileDatabase(\^char *\fIfilename\fP, XrmDatabase

-*\fItarget_db\fP\^, Bool \fIoverride\fP); 

-.SH ARGUMENTS

-.IP \fIsource_db\fP 1i

-Specifies the resource database that is to be merged into the target database.

-.IP \fItarget_db\fP 1i

-Specifies the resource database into which the source 

-database is to be merged.

-.IP \fIfilename\fP 1i

-Specifies the resource database file name.

-.IP \fIoverride\fP 1i

-Specifies whether source entries override target ones.

-.SH DESCRIPTION

-Calling the

-.ZN XrmMergeDatabases

-function is equivalent to calling the

-.ZN XrmCombineDatabase

-function with an override argument of

-.ZN True .

-.LP

-The

-.ZN XrmCombineDatabase

-function merges the contents of one database into another.

-If the same specifier is used for an entry in both databases,

-the entry in the source_db will replace the entry in the target_db

-if override is

-.ZN True ;

-otherwise, the entry in source_db is discarded.

-If target_db contains NULL,

-.ZN XrmCombineDatabase

-simply stores source_db in it.

-Otherwise, source_db is destroyed by the merge, but the database pointed

-to by target_db is not destroyed.

-The database entries are merged without changing values or types,

-regardless of the locales of the databases.

-The locale of the target database is not modified.

-.LP

-The

-.ZN XrmCombineFileDatabase

-function merges the contents of a resource file into a database.

-If the same specifier is used for an entry in both the file and

-the database,

-the entry in the file will replace the entry in the database

-if override is

-.ZN True ;

-otherwise, the entry in the file is discarded.

-The file is parsed in the current locale.

-If the file cannot be read,

-a zero status is returned;

-otherwise, a nonzero status is returned.

-If target_db contains NULL,

-.ZN XrmCombineFileDatabase

-creates and returns a new database to it.

-Otherwise, the database pointed to by target_db is not destroyed by the merge.

-The database entries are merged without changing values or types,

-regardless of the locale of the database.

-The locale of the target database is not modified.

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmInitialize(__libmansuffix__),

-XrmPutResource(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XrmMergeDatabases __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases
+.SH SYNTAX
+.HP
+void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase
+*\fItarget_db\fP\^); 
+.HP
+void XrmCombineDatabase(\^XrmDatabase \fIsource_db\fP, XrmDatabase
+*\fItarget_db\fP, Bool \fIoverride\fP\^); 
+.HP
+Status XrmCombineFileDatabase(\^char *\fIfilename\fP, XrmDatabase
+*\fItarget_db\fP\^, Bool \fIoverride\fP); 
+.SH ARGUMENTS
+.IP \fIsource_db\fP 1i
+Specifies the resource database that is to be merged into the target database.
+.IP \fItarget_db\fP 1i
+Specifies the resource database into which the source 
+database is to be merged.
+.IP \fIfilename\fP 1i
+Specifies the resource database file name.
+.IP \fIoverride\fP 1i
+Specifies whether source entries override target ones.
+.SH DESCRIPTION
+Calling the
+.ZN XrmMergeDatabases
+function is equivalent to calling the
+.ZN XrmCombineDatabase
+function with an override argument of
+.ZN True .
+.LP
+The
+.ZN XrmCombineDatabase
+function merges the contents of one database into another.
+If the same specifier is used for an entry in both databases,
+the entry in the source_db will replace the entry in the target_db
+if override is
+.ZN True ;
+otherwise, the entry in source_db is discarded.
+If target_db contains NULL,
+.ZN XrmCombineDatabase
+simply stores source_db in it.
+Otherwise, source_db is destroyed by the merge, but the database pointed
+to by target_db is not destroyed.
+The database entries are merged without changing values or types,
+regardless of the locales of the databases.
+The locale of the target database is not modified.
+.LP
+The
+.ZN XrmCombineFileDatabase
+function merges the contents of a resource file into a database.
+If the same specifier is used for an entry in both the file and
+the database,
+the entry in the file will replace the entry in the database
+if override is
+.ZN True ;
+otherwise, the entry in the file is discarded.
+The file is parsed in the current locale.
+If the file cannot be read,
+a zero status is returned;
+otherwise, a nonzero status is returned.
+If target_db contains NULL,
+.ZN XrmCombineFileDatabase
+creates and returns a new database to it.
+Otherwise, the database pointed to by target_db is not destroyed by the merge.
+The database entries are merged without changing values or types,
+regardless of the locale of the database.
+The locale of the target database is not modified.
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmPutResource.man b/libX11/man/XrmPutResource.man
index 54cdf6b37..9f9d08884 100644
--- a/libX11/man/XrmPutResource.man
+++ b/libX11/man/XrmPutResource.man
@@ -1,252 +1,191 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XrmPutResource __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmPutResource, XrmQPutResource, XrmPutStringResource, XrmQPutStringResource, XrmPutLineResource \- store database resources

-.SH SYNTAX

-.HP

-void XrmPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, char

-*\fIspecifier\fP\^, char *\fItype\fP\^, XrmValue *\fIvalue\fP\^); 

-.HP

-void XrmQPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList

-\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, XrmRepresentation \fItype\fP\^,

-XrmValue *\fIvalue\fP\^); 

-.HP

-void XrmPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, char

-*\fIspecifier\fP\^, char *\fIvalue\fP\^); 

-.HP

-void XrmQPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList

-\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, char *\fIvalue\fP\^); 

-.HP

-void XrmPutLineResource\^(\^XrmDatabase *\fIdatabase\fP\^, char

-*\fIline\fP\^); 

-.SH ARGUMENTS

-.IP \fIbindings\fP 1i

-Specifies a list of bindings.

-.IP \fIdatabase\fP 1i

-Specifies the resource database.

-.IP \fIline\fP 1i

-Specifies the resource name and value pair as a single string.

-.IP \fIquarks\fP 1i

-Specifies the complete or partial name or the class list of the resource.

-.IP \fIspecifier\fP 1i

-Specifies a complete or partial specification of the resource.

-.IP \fItype\fP 1i

-Specifies the type of the resource.

-.IP \fIvalue\fP 1i

-Specifies the value of the resource, which is specified as a string.

-.SH DESCRIPTION

-If database contains NULL,

-.ZN XrmPutResource

-creates a new database and returns a pointer to it.

-.ZN XrmPutResource

-is a convenience function that calls

-.ZN XrmStringToBindingQuarkList

-followed by:

-.LP

-.Ds

-XrmQPutResource(database, bindings, quarks, XrmStringToQuark(type), value)

-.De

-.LP

-If the specifier and type are not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-The value is stored in the database without modification.

-.LP

-If database contains NULL,

-.ZN XrmQPutResource

-creates a new database and returns a pointer to it.

-If a resource entry with the identical bindings and quarks already

-exists in the database, the previous type and value are replaced by the new

-specified type and value.

-The value is stored in the database without modification.

-.LP

-If database contains NULL,

-.ZN XrmPutStringResource

-creates a new database and returns a pointer to it.

-.ZN XrmPutStringResource

-adds a resource with the specified value to the specified database.

-.ZN XrmPutStringResource

-is a convenience function that first calls

-.ZN XrmStringToBindingQuarkList

-on the specifier and then calls

-.ZN XrmQPutResource ,

-using a ``String'' representation type.

-If the specifier is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-The value is stored in the database without modification.

-.LP

-If database contains NULL,

-.ZN XrmQPutStringResource

-creates a new database and returns a pointer to it.

-.ZN XrmQPutStringResource

-is a convenience routine that constructs an

-.ZN XrmValue

-for the value string (by calling

-.ZN strlen

-to compute the size) and

-then calls

-.ZN XrmQPutResource ,

-using a ``String'' representation type.

-The value is stored in the database without modification.

-.LP

-If database contains NULL,

-.ZN XrmPutLineResource

-creates a new database and returns a pointer to it.

-.ZN XrmPutLineResource

-adds a single resource entry to the specified database.

-The line should be in valid ResourceLine format (see section 15.1)

-terminated by a newline or null character;

-the database that results from using a string

-with incorrect syntax is implementation-dependent.

-The string is parsed in the locale of the database.

-If the

-.ZN ResourceName

-is not in the Host Portable Character Encoding,

-the result is implementation-dependent.

-Note that comment lines are not stored.

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmInitialize(__libmansuffix__),

-XrmMergeDatabases(__libmansuffix__),

-XrmUniqueQuark(__libmansuffix__)

-.br

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XrmPutResource __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmPutResource, XrmQPutResource, XrmPutStringResource, XrmQPutStringResource, XrmPutLineResource \- store database resources
+.SH SYNTAX
+.HP
+void XrmPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIspecifier\fP\^, char *\fItype\fP\^, XrmValue *\fIvalue\fP\^); 
+.HP
+void XrmQPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList
+\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, XrmRepresentation \fItype\fP\^,
+XrmValue *\fIvalue\fP\^); 
+.HP
+void XrmPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIspecifier\fP\^, char *\fIvalue\fP\^); 
+.HP
+void XrmQPutStringResource\^(\^XrmDatabase *\fIdatabase\fP\^, XrmBindingList
+\fIbindings\fP\^, XrmQuarkList \fIquarks\fP\^, char *\fIvalue\fP\^); 
+.HP
+void XrmPutLineResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
+*\fIline\fP\^); 
+.SH ARGUMENTS
+.IP \fIbindings\fP 1i
+Specifies a list of bindings.
+.IP \fIdatabase\fP 1i
+Specifies the resource database.
+.IP \fIline\fP 1i
+Specifies the resource name and value pair as a single string.
+.IP \fIquarks\fP 1i
+Specifies the complete or partial name or the class list of the resource.
+.IP \fIspecifier\fP 1i
+Specifies a complete or partial specification of the resource.
+.IP \fItype\fP 1i
+Specifies the type of the resource.
+.IP \fIvalue\fP 1i
+Specifies the value of the resource, which is specified as a string.
+.SH DESCRIPTION
+If database contains NULL,
+.ZN XrmPutResource
+creates a new database and returns a pointer to it.
+.ZN XrmPutResource
+is a convenience function that calls
+.ZN XrmStringToBindingQuarkList
+followed by:
+.LP
+.Ds
+XrmQPutResource(database, bindings, quarks, XrmStringToQuark(type), value)
+.De
+.LP
+If the specifier and type are not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+The value is stored in the database without modification.
+.LP
+If database contains NULL,
+.ZN XrmQPutResource
+creates a new database and returns a pointer to it.
+If a resource entry with the identical bindings and quarks already
+exists in the database, the previous type and value are replaced by the new
+specified type and value.
+The value is stored in the database without modification.
+.LP
+If database contains NULL,
+.ZN XrmPutStringResource
+creates a new database and returns a pointer to it.
+.ZN XrmPutStringResource
+adds a resource with the specified value to the specified database.
+.ZN XrmPutStringResource
+is a convenience function that first calls
+.ZN XrmStringToBindingQuarkList
+on the specifier and then calls
+.ZN XrmQPutResource ,
+using a ``String'' representation type.
+If the specifier is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+The value is stored in the database without modification.
+.LP
+If database contains NULL,
+.ZN XrmQPutStringResource
+creates a new database and returns a pointer to it.
+.ZN XrmQPutStringResource
+is a convenience routine that constructs an
+.ZN XrmValue
+for the value string (by calling
+.ZN strlen
+to compute the size) and
+then calls
+.ZN XrmQPutResource ,
+using a ``String'' representation type.
+The value is stored in the database without modification.
+.LP
+If database contains NULL,
+.ZN XrmPutLineResource
+creates a new database and returns a pointer to it.
+.ZN XrmPutLineResource
+adds a single resource entry to the specified database.
+The line should be in valid ResourceLine format (see section 15.1)
+terminated by a newline or null character;
+the database that results from using a string
+with incorrect syntax is implementation-dependent.
+The string is parsed in the locale of the database.
+If the
+.ZN ResourceName
+is not in the Host Portable Character Encoding,
+the result is implementation-dependent.
+Note that comment lines are not stored.
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmUniqueQuark(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/man/XrmUniqueQuark.man b/libX11/man/XrmUniqueQuark.man
index 4377dad4b..383d26c50 100644
--- a/libX11/man/XrmUniqueQuark.man
+++ b/libX11/man/XrmUniqueQuark.man
@@ -1,303 +1,242 @@
-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium

-.\"

-.\" Permission is hereby granted, free of charge, to any person obtaining

-.\" a copy of this software and associated documentation files (the

-.\" "Software"), to deal in the Software without restriction, including

-.\" without limitation the rights to use, copy, modify, merge, publish,

-.\" distribute, sublicense, and/or sell copies of the Software, and to

-.\" permit persons to whom the Software is furnished to do so, subject to

-.\" the following conditions:

-.\"

-.\" The above copyright notice and this permission notice shall be included

-.\" in all copies or substantial portions of the Software.

-.\"

-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-.\" IN NO EVENT SHALL 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.

-.\"

-.\" 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.

-.\"

-.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by

-.\" Digital Equipment Corporation

-.\"

-.\" Portions Copyright \(co 1990, 1991 by

-.\" Tektronix, Inc.

-.\"

-.\" Permission to use, copy, modify and distribute this documentation for

-.\" any purpose and without fee is hereby granted, provided that the above

-.\" copyright notice appears in all copies and that both that copyright notice

-.\" and this permission notice appear in all copies, and that the names of

-.\" Digital and Tektronix not be used in in advertising or publicity pertaining

-.\" to this documentation without specific, written prior permission.

-.\" Digital and Tektronix makes no representations about the suitability

-.\" of this documentation for any purpose.

-.\" It is provided ``as is'' without express or implied warranty.

-.\" 

-.\"

-.ds xT X Toolkit Intrinsics \- C Language Interface

-.ds xW Athena X Widgets \- C Language X Toolkit Interface

-.ds xL Xlib \- C Language X Interface

-.ds xC Inter-Client Communication Conventions Manual

-.na

-.de Ds

-.nf

-.\\$1D \\$2 \\$1

-.ft 1

-.\".ps \\n(PS

-.\".if \\n(VS>=40 .vs \\n(VSu

-.\".if \\n(VS<=39 .vs \\n(VSp

-..

-.de De

-.ce 0

-.if \\n(BD .DF

-.nr BD 0

-.in \\n(OIu

-.if \\n(TM .ls 2

-.sp \\n(DDu

-.fi

-..

-.de FD

-.LP

-.KS

-.TA .5i 3i

-.ta .5i 3i

-.nf

-..

-.de FN

-.fi

-.KE

-.LP

-..

-.de IN		\" send an index entry to the stderr

-..

-.de C{

-.KS

-.nf

-.D

-.\"

-.\"	choose appropriate monospace font

-.\"	the imagen conditional, 480,

-.\"	may be changed to L if LB is too

-.\"	heavy for your eyes...

-.\"

-.ie "\\*(.T"480" .ft L

-.el .ie "\\*(.T"300" .ft L

-.el .ie "\\*(.T"202" .ft PO

-.el .ie "\\*(.T"aps" .ft CW

-.el .ft R

-.ps \\n(PS

-.ie \\n(VS>40 .vs \\n(VSu

-.el .vs \\n(VSp

-..

-.de C}

-.DE

-.R

-..

-.de Pn

-.ie t \\$1\fB\^\\$2\^\fR\\$3

-.el \\$1\fI\^\\$2\^\fP\\$3

-..

-.de ZN

-.ie t \fB\^\\$1\^\fR\\$2

-.el \fI\^\\$1\^\fP\\$2

-..

-.de hN

-.ie t <\fB\\$1\fR>\\$2

-.el <\fI\\$1\fP>\\$2

-..

-.de NT

-.ne 7

-.ds NO Note

-.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2

-.if \\n(.$ .if !'\\$1'C' .ds NO \\$1

-.ie n .sp

-.el .sp 10p

-.TB

-.ce

-\\*(NO

-.ie n .sp

-.el .sp 5p

-.if '\\$1'C' .ce 99

-.if '\\$2'C' .ce 99

-.in +5n

-.ll -5n

-.R

-..

-.		\" Note End -- doug kraft 3/85

-.de NE

-.ce 0

-.in -5n

-.ll +5n

-.ie n .sp

-.el .sp 10p

-..

-.ny0

-.TH XrmUniqueQuark __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"

-.SH NAME

-XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks

-.SH SYNOPSIS

-.HP

-XrmQuark XrmUniqueQuark\^(void); 

-.LP

-\&#define XrmStringToName(string) XrmStringToQuark(string)

-.br

-\&#define XrmStringToClass(string) XrmStringToQuark(string)

-.br

-\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)

-.HP

-int XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 

-.HP

-XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 

-.LP

-\&#define XrmStringToName(string) XrmStringToQuark(string)

-.br

-\&#define XrmStringToClass(string) XrmStringToQuark(string)

-.br

-\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)

-.HP

-XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 

-.HP

-XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 

-.LP

-\&#define XrmNameToString(name) XrmQuarkToString(name)

-.br

-\&#define XrmClassToString(class) XrmQuarkToString(class)

-.br

-\&#define XrmRepresentationToString(type) XrmQuarkToString(type)

-.HP

-char *XrmQuarkToString\^(\^XrmQuark \fIquark\fP\^); 

-.LP

-\&#define XrmStringToNameList(str, name)  XrmStringToQuarkList((str), (name))

-.br

-\&#define XrmStringToClassList(str,class) XrmStringToQuarkList((str), (class))

-.sp

-.HP

-void XrmStringToQuarkList\^(\^char *\fIstring\fP\^, XrmQuarkList

-\fIquarks_return\fP\^); 

-.HP

-XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList

-\fIbindings_return\fP\^, XrmQuarkList \fIquarks_return\fP\^); 

-.SH ARGUMENTS

-.IP \fIbindings_return\fP 1i

-Returns the binding list.

-.IP \fIquark\fP 1i

-Specifies the quark for which the equivalent string is desired.

-.IP \fIquarks_return\fP 1i

-Returns the list of quarks.

-.ds Ql \ or quark list

-.IP \fIstring\fP 1i

-Specifies the string for which a quark\*(Ql is to be allocated.

-.SH DESCRIPTION

-The

-.ZN XrmUniqueQuark

-function allocates a quark that is guaranteed not to represent any string that

-is known to the resource manager.

-.LP

-These functions can be used to convert from string to quark representation.

-If the string is not in the Host Portable Character Encoding,

-the conversion is implementation-dependent.

-The string argument to

-.ZN XrmStringToQuark

-need not be permanently allocated storage.

-.ZN XrmPermStringToQuark

-is just like

-.ZN XrmStringToQuark ,

-except that Xlib is permitted to assume the string argument is permanently

-allocated,

-and, hence, that it can be used as the value to be returned by

-.ZN XrmQuarkToString .

-.LP

-For any given quark, if

-.ZN XrmStringToQuark

-returns a non-NULL value,

-all future calls will return the same value (identical address).

-.LP

-These functions can be used to convert from quark representation to string.

-The string pointed to by the return value must not be modified or freed.

-The returned string is byte-for-byte equal to the original

-string passed to one of the string-to-quark routines.

-If no string exists for that quark,

-.ZN XrmQuarkToString

-returns NULL.

-For any given quark, if

-.ZN XrmQuarkToString

-returns a non-NULL value,

-all future calls will return the same value (identical address).

-.LP

-These functions can be used to convert from string to quark representation.

-If the string is not in the Host Portable Character Encoding,

-the conversion is implementation-dependent.

-The string argument to

-.ZN XrmStringToQuark

-need not be permanently allocated storage.

-.ZN XrmPermStringToQuark

-is just like

-.ZN XrmStringToQuark ,

-except that Xlib is permitted to assume the string argument is permanently

-allocated,

-and, hence, that it can be used as the value to be returned by

-.ZN XrmQuarkToString .

-.LP

-For any given quark, if

-.ZN XrmStringToQuark

-returns a non-NULL value,

-all future calls will return the same value (identical address).

-.LP

-The

-.ZN XrmStringToQuarkList

-function converts the null-terminated string (generally a fully qualified name)

-to a list of quarks.

-The caller must allocate sufficient space for the quarks list before calling 

-.ZN XrmStringToQuarkList .

-Note that the string must be in the valid ResourceName format 

-(see section 15.1).

-If the string is not in the Host Portable Character Encoding,

-the conversion is implementation-dependent.

-.LP

-A binding list is a list of type

-.ZN XrmBindingList

-and indicates if components of name or class lists are bound tightly or loosely

-(that is, if wildcarding of intermediate components is specified).

-.LP

-.EX

-typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;

-.EE

-.LP

-.ZN XrmBindTightly

-indicates that a period separates the components, and

-.ZN XrmBindLoosely

-indicates that an asterisk separates the components.

-.LP

-The

-.ZN XrmStringToBindingQuarkList

-function converts the specified string to a binding list and a quark list.

-The caller must allocate sufficient space for the quarks list and the

-binding list before calling 

-.ZN XrmStringToBindingQuarkList .

-If the string is not in the Host Portable Character Encoding

-the conversion is implementation-dependent.

-Component names in the list are separated by a period or

-an asterisk character.

-If the string does not start with period or asterisk,

-a period is assumed.

-For example, ``*a.b*c'' becomes:

-.LP

-.TS

-l l l.

-quarks	a	b	c

-bindings	loose	tight	loose

-.TE

-.SH "SEE ALSO"

-XrmGetResource(__libmansuffix__),

-XrmInitialize(__libmansuffix__),

-XrmMergeDatabases(__libmansuffix__),

-XrmPutResource(__libmansuffix__)

-.LP

-\fI\*(xL\fP

+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL 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.
+.\"
+.\" 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.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\" 
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft CW
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de IN		\" send an index entry to the stderr
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.ny0
+.TH XrmUniqueQuark __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
+.SH SYNOPSIS
+.HP
+XrmQuark XrmUniqueQuark\^(void); 
+.LP
+\&#define XrmStringToName(string) XrmStringToQuark(string)
+.br
+\&#define XrmStringToClass(string) XrmStringToQuark(string)
+.br
+\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
+.HP
+int XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 
+.HP
+XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 
+.LP
+\&#define XrmStringToName(string) XrmStringToQuark(string)
+.br
+\&#define XrmStringToClass(string) XrmStringToQuark(string)
+.br
+\&#define XrmStringToRepresentation(string) XrmStringToQuark(string)
+.HP
+XrmQuark XrmStringToQuark\^(\^char *\fIstring\fP\^); 
+.HP
+XrmQuark XrmPermStringToQuark\^(\^char *\fIstring\fP\^); 
+.LP
+\&#define XrmNameToString(name) XrmQuarkToString(name)
+.br
+\&#define XrmClassToString(class) XrmQuarkToString(class)
+.br
+\&#define XrmRepresentationToString(type) XrmQuarkToString(type)
+.HP
+char *XrmQuarkToString\^(\^XrmQuark \fIquark\fP\^); 
+.LP
+\&#define XrmStringToNameList(str, name)  XrmStringToQuarkList((str), (name))
+.br
+\&#define XrmStringToClassList(str,class) XrmStringToQuarkList((str), (class))
+.sp
+.HP
+void XrmStringToQuarkList\^(\^char *\fIstring\fP\^, XrmQuarkList
+\fIquarks_return\fP\^); 
+.HP
+XrmStringToBindingQuarkList\^(\^char *\fIstring\fP\^, XrmBindingList
+\fIbindings_return\fP\^, XrmQuarkList \fIquarks_return\fP\^); 
+.SH ARGUMENTS
+.IP \fIbindings_return\fP 1i
+Returns the binding list.
+.IP \fIquark\fP 1i
+Specifies the quark for which the equivalent string is desired.
+.IP \fIquarks_return\fP 1i
+Returns the list of quarks.
+.ds Ql \ or quark list
+.IP \fIstring\fP 1i
+Specifies the string for which a quark\*(Ql is to be allocated.
+.SH DESCRIPTION
+The
+.ZN XrmUniqueQuark
+function allocates a quark that is guaranteed not to represent any string that
+is known to the resource manager.
+.LP
+These functions can be used to convert from string to quark representation.
+If the string is not in the Host Portable Character Encoding,
+the conversion is implementation-dependent.
+The string argument to
+.ZN XrmStringToQuark
+need not be permanently allocated storage.
+.ZN XrmPermStringToQuark
+is just like
+.ZN XrmStringToQuark ,
+except that Xlib is permitted to assume the string argument is permanently
+allocated,
+and, hence, that it can be used as the value to be returned by
+.ZN XrmQuarkToString .
+.LP
+For any given quark, if
+.ZN XrmStringToQuark
+returns a non-NULL value,
+all future calls will return the same value (identical address).
+.LP
+These functions can be used to convert from quark representation to string.
+The string pointed to by the return value must not be modified or freed.
+The returned string is byte-for-byte equal to the original
+string passed to one of the string-to-quark routines.
+If no string exists for that quark,
+.ZN XrmQuarkToString
+returns NULL.
+For any given quark, if
+.ZN XrmQuarkToString
+returns a non-NULL value,
+all future calls will return the same value (identical address).
+.LP
+These functions can be used to convert from string to quark representation.
+If the string is not in the Host Portable Character Encoding,
+the conversion is implementation-dependent.
+The string argument to
+.ZN XrmStringToQuark
+need not be permanently allocated storage.
+.ZN XrmPermStringToQuark
+is just like
+.ZN XrmStringToQuark ,
+except that Xlib is permitted to assume the string argument is permanently
+allocated,
+and, hence, that it can be used as the value to be returned by
+.ZN XrmQuarkToString .
+.LP
+For any given quark, if
+.ZN XrmStringToQuark
+returns a non-NULL value,
+all future calls will return the same value (identical address).
+.LP
+The
+.ZN XrmStringToQuarkList
+function converts the null-terminated string (generally a fully qualified name)
+to a list of quarks.
+The caller must allocate sufficient space for the quarks list before calling 
+.ZN XrmStringToQuarkList .
+Note that the string must be in the valid ResourceName format 
+(see section 15.1).
+If the string is not in the Host Portable Character Encoding,
+the conversion is implementation-dependent.
+.LP
+A binding list is a list of type
+.ZN XrmBindingList
+and indicates if components of name or class lists are bound tightly or loosely
+(that is, if wildcarding of intermediate components is specified).
+.LP
+.EX
+typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
+.EE
+.LP
+.ZN XrmBindTightly
+indicates that a period separates the components, and
+.ZN XrmBindLoosely
+indicates that an asterisk separates the components.
+.LP
+The
+.ZN XrmStringToBindingQuarkList
+function converts the specified string to a binding list and a quark list.
+The caller must allocate sufficient space for the quarks list and the
+binding list before calling 
+.ZN XrmStringToBindingQuarkList .
+If the string is not in the Host Portable Character Encoding
+the conversion is implementation-dependent.
+Component names in the list are separated by a period or
+an asterisk character.
+If the string does not start with period or asterisk,
+a period is assumed.
+For example, ``*a.b*c'' becomes:
+.LP
+.TS
+l l l.
+quarks	a	b	c
+bindings	loose	tight	loose
+.TE
+.SH "SEE ALSO"
+XrmGetResource(__libmansuffix__),
+XrmInitialize(__libmansuffix__),
+XrmMergeDatabases(__libmansuffix__),
+XrmPutResource(__libmansuffix__)
+.LP
+\fI\*(xL\fP
diff --git a/libX11/man/xkb/XkbGetNamedGeometry.man b/libX11/man/xkb/XkbGetNamedGeometry.man
index 24e5b36c6..c7572a0d1 100644
--- a/libX11/man/xkb/XkbGetNamedGeometry.man
+++ b/libX11/man/xkb/XkbGetNamedGeometry.man
@@ -1,159 +1,157 @@
-'\" t

-.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.TH XkbGetNamedGeometry __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbGetNamedGeometry \- Loads a keyboard geometry description from this database 

-by name

-.SH SYNTAX

-.HP

-.B Status XkbGetNamedGeometry

-.BI "(\^Display *" "dpy" "\^,"

-.BI "XkbDescPtr " "xkb" "\^,"

-.BI "Atom " "name" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- dpy

-connection to the X server

-.TP

-.I \- xkb

-keyboard description into which the geometry should be loaded

-.TP

-.I \- name

-name of the geometry to be loaded

-.SH DESCRIPTION

-.LP

-It is also possible to load a keyboard geometry by name. The X server maintains 

-a database 

-of keyboard components (see below).

-

-.I XkbGetNamedGeometry 

-can return BadName if the name cannot be found.

-

-The X server maintains a database of keyboard components, identified by 

-component type. 

-The database contains all the information necessary to build a complete keyboard 

-description for a particular device, as well as to assemble partial 

-descriptions. Table 1 identifies the component types and the type of information 

-they contain.

-

-.TS

-c s s

-l l l

-l l l

-l lw(2i) lw(2i).

-Table 1 Server Database Keyboard Components

-_

-Component	Component Primary Contents	May also contain

-Type

-_

-Keymap	T{

-Complete keyboard description

-.br 

-Normally assembled using a complete component from each of the other types

-T}

-.sp

-Keycodes	T{

-Symbolic name for each key

-.br

-Minimum and maximum legal keycodes

-T}	T{

-Aliases for some keys

-.br

-Symbolic names for indicators

-.br

-Description of indicators physically present

-T}

-.sp

-Types	Key types	T{

-Real modifier bindings and symbolic names for some virtual modifiers

-T}

-.sp

-Compatibility	T{

-Rules used to assign actions to keysyms

-T}	T{

-Maps for some indicators

-.br

-Real modifier bindings and symbolic names for some virtual modifiers

-T}

-.sp

-Symbols	T{

-Symbol mapping for keyboard keys

-.br

-Modifier mapping

-.br

-Symbolic names for groups

-T}	T{

-Explicit actions and behaviors for some keys

-.br

-Real modifier bindings and symbolic names for some virtual modifiers

-T}

-.sp

-Geometry	Layout of the keyboard	T{

-Aliases for some keys; overrides keycodes component aliases

-.br

-Symbolic names for some indicators

-.br

-Description of indicators physically present

-T}

-.TE

-

-While a keymap is a database entry for a complete keyboard description, and 

-therefore 

-logically different from the individual component database entries, the rules 

-for 

-processing keymap entries are identical to those for the individual components. 

-In the 

-discussion that follows, the term component is used to refer to either 

-individual 

-components or a keymap.

-

-There may be multiple entries for each of the component types. An entry may be 

-either

-.I complete 

-or 

-.I partial. 

-Partial entries describe only a piece of the corresponding keyboard component 

-and are 

-designed to be combined with other entries of the same type to form a complete 

-entry.

-

-For example, a partial symbols map might describe the differences between a 

-common ASCII 

-keyboard and some national layout. Such a partial map is not useful on its own 

-because it 

-does not include those symbols that are the same on both the ASCII and national 

-layouts 

-(such as function keys). On the other hand, this partial map can be used to 

-configure 

-.I any 

-ASCII keyboard to use a national layout.

-

-When a keyboard description is built, the components are processed in the order 

-in which 

-they appear in Table 1; later definitions override earlier ones.

-.SH DIAGNOSTICS

-.TP 15

-.B BadName

-A font or color of the specified name does not exist.

+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.TH XkbGetNamedGeometry __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbGetNamedGeometry \- Loads a keyboard geometry description from this database 
+by name
+.SH SYNOPSIS
+.HP
+.B Status XkbGetNamedGeometry
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "Atom " "name" "\^);"
+.SH ARGUMENTS
+.TP
+.I \- dpy
+connection to the X server
+.TP
+.I \- xkb
+keyboard description into which the geometry should be loaded
+.TP
+.I \- name
+name of the geometry to be loaded
+.SH DESCRIPTION
+.LP
+It is also possible to load a keyboard geometry by name. The X server maintains 
+a database 
+of keyboard components (see below).
+
+.I XkbGetNamedGeometry 
+can return BadName if the name cannot be found.
+
+The X server maintains a database of keyboard components, identified by 
+component type. 
+The database contains all the information necessary to build a complete keyboard 
+description for a particular device, as well as to assemble partial 
+descriptions. Table 1 identifies the component types and the type of information 
+they contain.
+
+.TS
+c s s
+l l l
+l l l
+l lw(2i) lw(2i).
+Table 1 Server Database Keyboard Components
+_
+Component	Component Primary Contents	May also contain
+Type
+_
+Keymap	T{
+Complete keyboard description
+.br 
+Normally assembled using a complete component from each of the other types
+T}
+.sp
+Keycodes	T{
+Symbolic name for each key
+.br
+Minimum and maximum legal keycodes
+T}	T{
+Aliases for some keys
+.br
+Symbolic names for indicators
+.br
+Description of indicators physically present
+T}
+.sp
+Types	Key types	T{
+Real modifier bindings and symbolic names for some virtual modifiers
+T}
+.sp
+Compatibility	T{
+Rules used to assign actions to keysyms
+T}	T{
+Maps for some indicators
+.br
+Real modifier bindings and symbolic names for some virtual modifiers
+T}
+.sp
+Symbols	T{
+Symbol mapping for keyboard keys
+.br
+Modifier mapping
+.br
+Symbolic names for groups
+T}	T{
+Explicit actions and behaviors for some keys
+.br
+Real modifier bindings and symbolic names for some virtual modifiers
+T}
+.sp
+Geometry	Layout of the keyboard	T{
+Aliases for some keys; overrides keycodes component aliases
+.br
+Symbolic names for some indicators
+.br
+Description of indicators physically present
+T}
+.TE
+
+While a keymap is a database entry for a complete keyboard description, and 
+therefore 
+logically different from the individual component database entries, the rules 
+for 
+processing keymap entries are identical to those for the individual components. 
+In the 
+discussion that follows, the term component is used to refer to either 
+individual 
+components or a keymap.
+
+There may be multiple entries for each of the component types. An entry may be 
+either
+.I complete 
+or 
+.I partial. 
+Partial entries describe only a piece of the corresponding keyboard component 
+and are 
+designed to be combined with other entries of the same type to form a complete 
+entry.
+
+For example, a partial symbols map might describe the differences between a 
+common ASCII 
+keyboard and some national layout. Such a partial map is not useful on its own 
+because it 
+does not include those symbols that are the same on both the ASCII and national 
+layouts 
+(such as function keys). On the other hand, this partial map can be used to 
+configure 
+.I any 
+ASCII keyboard to use a national layout.
+
+When a keyboard description is built, the components are processed in the order 
+in which 
+they appear in Table 1; later definitions override earlier ones.
+.SH DIAGNOSTICS
+.TP 15
+.B BadName
+A font or color of the specified name does not exist.
diff --git a/libX11/man/xkb/XkbSAGroup.man b/libX11/man/xkb/XkbSAGroup.man
index 2c80bfe30..3de10bc69 100644
--- a/libX11/man/xkb/XkbSAGroup.man
+++ b/libX11/man/xkb/XkbSAGroup.man
@@ -1,60 +1,59 @@
-'\" t

-.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.TH XkbSAGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbSAGroup \- Returns the group_XXX field of act converted to a signed int

-.SH SYNOPSIS

-.HP

-.B int XkbSAGroup

-.BI "(\^XkbAction " "act" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- act

-action from which to extract group

-.SH DESCRIPTION

-.LP

-.I XkbSAGroup 

-returns the 

-.I group_XXX 

-field of 

-.I act 

-converted to a signed int. 

-.SH STRUCTURE

-.LP

-Actions associated with the XkbGroupAction structure change the current group 

-state when keys are 

-pressed and released:

-.nf

-

-    typedef struct _XkbGroupAction {

-        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */

-        unsigned char    flags;      /\(** with type, controls the effect on groups 

-*/

-        char             group_XXX;  /\(** represents a group index or delta */

-    } XkbGroupAction;

-   

-.SH WARNING

-.LP

-This manpage seems to be incomplete

+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.TH XkbSAGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSAGroup \- Returns the group_XXX field of act converted to a signed int
+.SH SYNOPSIS
+.HP
+.B int XkbSAGroup
+.BI "(\^XkbAction " "act" "\^);"
+.SH ARGUMENTS
+.TP
+.I \- act
+action from which to extract group
+.SH DESCRIPTION
+.LP
+.I XkbSAGroup 
+returns the 
+.I group_XXX 
+field of 
+.I act 
+converted to a signed int. 
+.SH STRUCTURE
+.LP
+Actions associated with the XkbGroupAction structure change the current group 
+state when keys are 
+pressed and released:
+.nf
+.ft CW
+    typedef struct _XkbGroupAction {
+        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */
+        unsigned char    flags;      /\(** with type, controls the effect on groups 
+*/
+        char             group_XXX;  /\(** represents a group index or delta */
+    } XkbGroupAction;
+.ft
+.fi
+.SH WARNING
+.LP
+This manpage seems to be incomplete
diff --git a/libX11/man/xkb/XkbSASetGroup.man b/libX11/man/xkb/XkbSASetGroup.man
index 867d23d98..7df74c888 100644
--- a/libX11/man/xkb/XkbSASetGroup.man
+++ b/libX11/man/xkb/XkbSASetGroup.man
@@ -1,63 +1,63 @@
-'\" t

-.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.TH XkbSASetGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbSASetGroup \- Sets the group_XXX field of act from the group index grp

-.SH SYNTAX

-.HP

-.B void XkbSASetGroup

-.BI "(\^XkbAction " "act" "\^,"

-.BI "int " "grp" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- act

-action from which to set group

-.TP

-.I \- grp

-group index to set in group_XXX

-.SH DESCRIPTION

-.LP

-.I XkbSASetGroup 

-sets the 

-.I group_XXX 

-field of 

-.I act 

-from the group index 

-.I grp. 

-.SH STRUCTURE

-.LP

-Actions associated with the XkbGroupAction structure change the current group state when keys are 

-pressed and released:

-.nf

-

-    typedef struct _XkbGroupAction {

-        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */

-        unsigned char    flags;      /\(** with type, controls the effect on groups */

-        char             group_XXX;  /\(** represents a group index or delta */

-    } XkbGroupAction;

-    

-.SH WARNING

-.LP

-This manpage seems to be incomplete

+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.TH XkbSASetGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSASetGroup \- Sets the group_XXX field of act from the group index grp
+.SH SYNOPSIS
+.HP
+.B void XkbSASetGroup
+.BI "(\^XkbAction " "act" "\^,"
+.BI "int " "grp" "\^);"
+.SH ARGUMENTS
+.TP
+.I \- act
+action from which to set group
+.TP
+.I \- grp
+group index to set in group_XXX
+.SH DESCRIPTION
+.LP
+.I XkbSASetGroup 
+sets the 
+.I group_XXX 
+field of 
+.I act 
+from the group index 
+.I grp. 
+.SH STRUCTURE
+.LP
+Actions associated with the XkbGroupAction structure change the
+current group state when keys are pressed and released:
+
+.nf
+.ft CW
+    typedef struct _XkbGroupAction {
+        unsigned char    type;       /\(** XkbSA_{Set|Latch|Lock}Group */
+        unsigned char    flags;      /\(** with type, controls the effect on groups */
+        char             group_XXX;  /\(** represents a group index or delta */
+    } XkbGroupAction;
+.ft
+.fi
+.SH WARNING
+.LP
+This manpage seems to be incomplete
diff --git a/libX11/man/xkb/XkbSetDetectableAutorepeat.man b/libX11/man/xkb/XkbSetDetectableAutorepeat.man
index f519f3224..c54b349be 100644
--- a/libX11/man/xkb/XkbSetDetectableAutorepeat.man
+++ b/libX11/man/xkb/XkbSetDetectableAutorepeat.man
@@ -1,105 +1,103 @@
-.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.TH XkbSetDetectableAutoRepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbSetDetectableAutoRepeat \- Sets DetectableAutoRepeat

-.SH SYNTAX

-.HP

-.B Bool XkbSetDetectableAutoRepeat

-.BI "(\^Display *" "display" "\^,"

-.BI "Bool " "detectable" "\^,"

-.BI "Bool *" "supported_rtrn" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- display

-connection to X server

-.TP

-.I \- detectable

-True => set DetectableAutoRepeat

-.TP

-.I \- supported_rtrn

-backfilled True if DetectableAutoRepeat supported

-.SH DESCRIPTION

-.LP

-Auto-repeat is the generation of multiple key events by a keyboard when the user

-presses a key and holds it down. Keyboard hardware and device-dependent X server

-software often implement auto-repeat by generating multiple KeyPress events with

-no intervening KeyRelease event. The standard behavior of the X server is to

-generate a KeyRelease event for every KeyPress event. If the keyboard hardware

-and device-dependent software of the X server implement auto-repeat by

-generating multiple KeyPress events, the device-independent part of the X server

-by default synthetically generates a KeyRelease event after each KeyPress event.

-This provides predictable behavior for X clients, but does not allow those

-clients to detect the fact that a key is auto-repeating.

-

-Xkb allows clients to request

-.I detectable auto-repeat.

-If a client requests and the server supports DetectableAutoRepeat, Xkb generates

-KeyRelease events only when the key is physically released. If

-DetectableAutoRepeat is not supported or has not been requested, the server

-synthesizes a KeyRelease event for each repeating KeyPress event it generates.

-

-DetectableAutoRepeat, unlike other controls, is not contained in the

-XkbControlsRec structure, nor can it be enabled or disabled via the

-EnabledControls control. Instead, query and set DetectableAutoRepeat using

-.I XkbGetDetectableAutoRepeat

-and

-.I XkbSetDetectableAutoRepeat.

-

-DetectableAutoRepeat is a condition that applies to all keyboard devices for a

-client's connection to a given X server; it cannot be selectively set for some

-devices and not for others. For this reason, none of the Xkb library functions

-involving DetectableAutoRepeat involve a device specifier.

-

-This request affects all keyboard activity for the requesting client only; other

-clients still see the expected nondetectable auto-repeat behavior, unless they

-have requested otherwise.

-

-.I XkbSetDetectableAutoRepeat

-sends a request to the server to set DetectableAutoRepeat on for the current

-client if

-.I detectable

-is True, and off if

-.I detectable

-is False; it then waits for a reply. If

-.I supported_rtrn

-is not NULL,

-.I XkbSetDetectableAutoRepeat

-backfills

-.I supported_rtrn

-with True if the server supports DetectableAutoRepeat, and False if it does not.

-.I XkbSetDetectableAutoRepeat

-returns the current state of DetectableAutoRepeat for the requesting client:

-True if DetectableAutoRepeat is set, and False otherwise.

-.SH "RETURN VALUES"

-.TP 15

-True

-The

-.I XkbSetDetectableAutoRepeat

-function returns True if DetectableAutoRepeat is set.

-.TP 15

-False

-The

-.I XkbSetDetectableAutoRepeat

-function returns False if DetectableAutoRepeat is not set.

+.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.TH XkbSetDetectableAutoRepeat __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetDetectableAutoRepeat \- Sets DetectableAutoRepeat
+.SH SYNOPSIS
+.HP
+.B Bool XkbSetDetectableAutoRepeat
+.BI "(\^Display *" "display" "\^,"
+.BI "Bool " "detectable" "\^,"
+.BI "Bool *" "supported_rtrn" "\^);"
+.SH ARGUMENTS
+.TP
+.I \- display
+connection to X server
+.TP
+.I \- detectable
+True => set DetectableAutoRepeat
+.TP
+.I \- supported_rtrn
+backfilled True if DetectableAutoRepeat supported
+.SH DESCRIPTION
+.LP
+Auto-repeat is the generation of multiple key events by a keyboard when the user
+presses a key and holds it down. Keyboard hardware and device-dependent X server
+software often implement auto-repeat by generating multiple KeyPress events with
+no intervening KeyRelease event. The standard behavior of the X server is to
+generate a KeyRelease event for every KeyPress event. If the keyboard hardware
+and device-dependent software of the X server implement auto-repeat by
+generating multiple KeyPress events, the device-independent part of the X server
+by default synthetically generates a KeyRelease event after each KeyPress event.
+This provides predictable behavior for X clients, but does not allow those
+clients to detect the fact that a key is auto-repeating.
+
+Xkb allows clients to request
+.I detectable auto-repeat.
+If a client requests and the server supports DetectableAutoRepeat, Xkb generates
+KeyRelease events only when the key is physically released. If
+DetectableAutoRepeat is not supported or has not been requested, the server
+synthesizes a KeyRelease event for each repeating KeyPress event it generates.
+
+DetectableAutoRepeat, unlike other controls, is not contained in the
+XkbControlsRec structure, nor can it be enabled or disabled via the
+EnabledControls control. Instead, query and set DetectableAutoRepeat using
+.I XkbGetDetectableAutoRepeat
+and
+.I XkbSetDetectableAutoRepeat.
+
+DetectableAutoRepeat is a condition that applies to all keyboard devices for a
+client's connection to a given X server; it cannot be selectively set for some
+devices and not for others. For this reason, none of the Xkb library functions
+involving DetectableAutoRepeat involve a device specifier.
+
+This request affects all keyboard activity for the requesting client only; other
+clients still see the expected nondetectable auto-repeat behavior, unless they
+have requested otherwise.
+
+.I XkbSetDetectableAutoRepeat
+sends a request to the server to set DetectableAutoRepeat on for the current
+client if
+.I detectable
+is True, and off if
+.I detectable
+is False; it then waits for a reply. If
+.I supported_rtrn
+is not NULL,
+.I XkbSetDetectableAutoRepeat
+backfills
+.I supported_rtrn
+with True if the server supports DetectableAutoRepeat, and False if it does not.
+.I XkbSetDetectableAutoRepeat
+returns the current state of DetectableAutoRepeat for the requesting client:
+True if DetectableAutoRepeat is set, and False otherwise.
+.SH "RETURN VALUES"
+.TP 15
+True
+The
+.I XkbSetDetectableAutoRepeat
+function returns True if DetectableAutoRepeat is set.
+.TP 15
+False
+The
+.I XkbSetDetectableAutoRepeat
+function returns False if DetectableAutoRepeat is not set.
diff --git a/libX11/man/xkb/XkbSetDeviceButtonActions.man b/libX11/man/xkb/XkbSetDeviceButtonActions.man
index d08812d2d..122fc45f2 100644
--- a/libX11/man/xkb/XkbSetDeviceButtonActions.man
+++ b/libX11/man/xkb/XkbSetDeviceButtonActions.man
@@ -1,90 +1,88 @@
-'\" t

-.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.

-.\"

-.TH XkbSetDeviceButtonActions __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"

-.SH NAME

-XkbSetDeviceButtonActions \- Change only the button actions for an input extension device

-.SH SYNTAX

-.HP

-.B Bool XkbSetDeviceButtonActions

-.BI "(\^Display *" "dpy" "\^,"

-.BI "XkbDeviceInfoPtr " "device" "\^,"

-.BI "unsigned int " "first_button" "\^,"

-.BI "unsigned int " "num_buttons" "\^);"

-.if n .ti +5n

-.if t .ti +.5i

-.SH ARGUMENTS

-.TP

-.I \- dpy

-connection to X server

-.TP

-.I \- device

-structure defining the device and modifications

-.TP

-.I \- first_button

-number of first button to update, 0 relative

-.TP

-.I \- num_buttons

-number of buttons to update

-.SH DESCRIPTION

-.LP

-.I XkbSetDeviceButtonActions 

-assigns actions to the buttons of the device specified in 

-.I device_info->device_spec. 

-Actions are assigned to 

-.I num_buttons 

-buttons beginning with 

-.I first_button 

-and are taken from the actions specified in 

-.I device_info->btn_acts.

-

-If the server does not support assignment of Xkb actions to extension device buttons,

-.I XkbSetDeviceButtonActions 

-has no effect and returns False. If the device has no buttons or if 

-.I first_button 

-or 

-.I num_buttons 

-specify buttons outside of the valid range as determined by 

-.I device_info->num_btns, 

-the function has no effect and returns False. Otherwise, 

-.I XkbSetDeviceButtonActions 

-sends a request to the server to change the actions for the specified buttons and returns 

-True.

-

-If the actual request sent to the server involved illegal button numbers, a BadValue protocol 

-error is generated. If an invalid device identifier is specified in 

-.I device_info->device_spec, 

-a BadKeyboard protocol error results. If the actual device specified in

-.I device_info->device_spec 

-does not contain buttons and a request affecting buttons is made, a BadMatch protocol error is 

-generated.

-.SH DIAGNOSTICS

-.TP 15

-.B BadKeyboard

-The device specified was not a valid core or input extension device

-.TP 15

-.B BadMatch

-A compatible version of Xkb was not available in the server or an argument has correct type 

-and range, but is otherwise invalid

-.TP 15

-.B BadValue

-An argument is out of range

+'\" t
+.\" Copyright 1999 Oracle and/or its affiliates. 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 (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 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.
+.\"
+.TH XkbSetDeviceButtonActions __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.SH NAME
+XkbSetDeviceButtonActions \- Change only the button actions for an input extension device
+.SH SYNOPSIS
+.HP
+.B Bool XkbSetDeviceButtonActions
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device" "\^,"
+.BI "unsigned int " "first_button" "\^,"
+.BI "unsigned int " "num_buttons" "\^);"
+.SH ARGUMENTS
+.TP
+.I \- dpy
+connection to X server
+.TP
+.I \- device
+structure defining the device and modifications
+.TP
+.I \- first_button
+number of first button to update, 0 relative
+.TP
+.I \- num_buttons
+number of buttons to update
+.SH DESCRIPTION
+.LP
+.I XkbSetDeviceButtonActions 
+assigns actions to the buttons of the device specified in 
+.I device_info->device_spec. 
+Actions are assigned to 
+.I num_buttons 
+buttons beginning with 
+.I first_button 
+and are taken from the actions specified in 
+.I device_info->btn_acts.
+
+If the server does not support assignment of Xkb actions to extension device buttons,
+.I XkbSetDeviceButtonActions 
+has no effect and returns False. If the device has no buttons or if 
+.I first_button 
+or 
+.I num_buttons 
+specify buttons outside of the valid range as determined by 
+.I device_info->num_btns, 
+the function has no effect and returns False. Otherwise, 
+.I XkbSetDeviceButtonActions 
+sends a request to the server to change the actions for the specified buttons and returns 
+True.
+
+If the actual request sent to the server involved illegal button numbers, a BadValue protocol 
+error is generated. If an invalid device identifier is specified in 
+.I device_info->device_spec, 
+a BadKeyboard protocol error results. If the actual device specified in
+.I device_info->device_spec 
+does not contain buttons and a request affecting buttons is made, a BadMatch protocol error is 
+generated.
+.SH DIAGNOSTICS
+.TP 15
+.B BadKeyboard
+The device specified was not a valid core or input extension device
+.TP 15
+.B BadMatch
+A compatible version of Xkb was not available in the server or an argument has correct type 
+and range, but is otherwise invalid
+.TP 15
+.B BadValue
+An argument is out of range
diff --git a/libXau/man/Xau.man b/libXau/man/Xau.man
index 46d4a195c..d1b660386 100644
--- a/libXau/man/Xau.man
+++ b/libXau/man/Xau.man
@@ -29,22 +29,21 @@ Xau library: XauFileName, XauReadAuth, XauLockAuth, XauUnlockAuth,
 XauWriteAuth, XauDisposeAuth,
 XauGetAuthByAddr, XauGetBestAuthByAddr \- X authority database routines
 .SH SYNOPSIS
-.B "#include <X11/Xauth.h>"
-.PP
+.ft CW
 .nf
-.ta .5i 2i
+#include <X11/Xauth.h>
+
 typedef struct xauth {
-	unsigned short	family;
-	unsigned short	address_length;
-	char	*address;
-	unsigned short	number_length;
-	char	*number;
-	unsigned short	name_length;
-	char	*name;
-	unsigned short	data_length;
-	char	*data;
+        unsigned short  family;
+        unsigned short  address_length;
+        char    *address;
+        unsigned short  number_length;
+        char    *number;
+        unsigned short  name_length;
+        char    *name;
+        unsigned short  data_length;
+        char    *data;
 } Xauth;
-
 .HP
 char *XauFileName (void);
 .HP
@@ -68,7 +67,8 @@ int XauLockAuth (const char *\fIfile_name\fP\^, int \fIretries\fP\^, int
 int XauUnlockAuth (const char *\fIfile_name\fP\^);
 .HP
 int XauDisposeAuth (Xauth *\fIauth\fP\^);
-.ft R
+.fi
+.ft
 .SH DESCRIPTION
 .PP
 \fBXauFileName\fP generates the default authorization file name by first
@@ -106,18 +106,16 @@ files to be removed.  \fIXauLockAuth\fP makes \fIretries\fP attempts to
 create and link the file names, pausing \fItimeout\fP seconds between each
 attempt.  \fIXauLockAuth\fP returns a collection of values depending on the
 results:
-.nf
-.ta .5i 2i
-
-	LOCK_ERROR	A system error occurred, either a file_name
-		which is too long, or an unexpected failure from
-		a system call.  errno may prove useful.
-
-	LOCK_TIMEOUT	\fIretries\fP attempts failed
-
-	LOCK_SUCCESS	The lock succeeded.
-
-.fi
+.TP
+LOCK_ERROR
+A system error occurred, either a file_name which is too long, or an
+unexpected failure from a system call.  errno may prove useful.
+.TP
+LOCK_TIMEOUT
+\fIretries\fP attempts failed
+.TP
+LOCK_SUCCESS
+The lock succeeded.
 .PP
 \fBXauUnlockAuth\fP undoes the work of \fIXauLockAuth\fP by unlinking both
 the ``-c'' and ``-l'' file names.
diff --git a/libXext/man/XShape.man b/libXext/man/XShape.man
index 44fedfe78..feff37ccb 100644
--- a/libXext/man/XShape.man
+++ b/libXext/man/XShape.man
@@ -123,8 +123,7 @@ XRectangle *XShapeGetRectangles (
 .fi
 .SH STRUCTURES
 .nf
-.LP
-.ta 3i
+.ft CW
 typedef struct {
     int type;	/\&* of event */
     unsigned long serial;	/\&* # of last request processed by server */
@@ -137,38 +136,39 @@ typedef struct {
     Time time;	/\&* server timestamp when region changed */
     Bool shaped;	/\&* true if the region exists */
 } XShapeEvent;
+.ft
 .fi
 .SH DESCRIPTION
 The \fIX11 Nonrectangular Window Shape Extension\fP adds nonrectangular
 windows to the X Window System.
 .SH PREDEFINED VALUES
 Operations:
-.in +.5i
+.RS
 .nf
 .ZN ShapeSet
 .ZN ShapeUnion
 .ZN ShapeIntersect
 .ZN ShapeSubtract
 .ZN ShapeInvert
-.in -.5i
 .fi
+.RE
 .sp
 Shape Kinds:
-.in +.5i
+.RS
 .nf
 .ZN ShapeBounding
 .ZN ShapeClip
-.in -.5i
 .fi
+.RE
 .sp
 Event defines:
-.in +.5i
+.RS
 .nf
 .ZN ShapeNotifyMask
 .ZN ShapeNotify
-.in -.5i
 .fi
+.RE
 .SH BUGS
-This manual pages needs a lot more work.
+This manual page needs a lot more work.
 .SH SEE ALSO
 \fIX11 Nonrectangular Window Shape Extension\fP
diff --git a/libXext/man/Xmbuf.man b/libXext/man/Xmbuf.man
index 08e85b7e0..9954d92a1 100644
--- a/libXext/man/Xmbuf.man
+++ b/libXext/man/Xmbuf.man
@@ -36,25 +36,32 @@
 .ie t \fB\^\\$1\^\fR\\$2
 .el \fI\^\\$1\^\fP\\$2
 ..
+.de EX
+.nf
+.ft CW
+..
+.de EE
+.ft
+.fi
+..
 .TH XMBUF __libmansuffix__ __xorgversion__ "X FUNCTIONS"
 .SH NAME
 XmbufQueryExtension, XmbufGetVersion, XmbufCreateBuffers, XmbufDestroyBuffers, XmbufDisplayBuffers, XmbufGetWindowAttributes, XmbufChangeWindowAttributes, XmbufGetBufferAttributes, XmbufChangeBufferAttributes, XmbufGetScreenInfo, XmbufCreateStereoWindow - X multibuffering functions
 .SH SYNTAX
-.nf
-.LP
+.EX
 \&#include <X11/extensions/multibuf.h>
-.LP
+
 Bool XmbufQueryExtension(
     Display *dpy,
     Display *dpy,
     int *event_base_return,
     int *error_base_return);
-.LP
+
 Status XmbufGetVersion(
     Display *dpy,
     int *major_version_return,
     int *minor_version_return);
-.LP
+
 int XmbufCreateBuffers(
     Display *dpy,
     Window window,
@@ -62,40 +69,40 @@ int XmbufCreateBuffers(
     int update_action,
     int update_hint,
     Multibuffer *buffers_update);
-.LP
+
 void XmbufDestroyBuffers(
     Display *dpy,
     Window window);
-.LP
+
 void XmbufDisplayBuffers(
     Display *dpy,
     int count,
     Multibuffer *buffers,
     int min_delay,
     int max_delay);
-.LP
+
 Status XmbufGetWindowAttributes(
     Display *dpy,
     Window window,
     XmbufWindowAttributes *attributes);
-.LP
+
 void XmbufChangeWindowAttributes(
     Display *dpy,
     Window window,
     unsigned long valuemask,
     XmbufSetWindowAttributes *attributes);
-.LP
+
 Status XmbufGetBufferAttributes(
     Display *dpy,
     Multibuffer buffer,
     XmbufBufferAttributes *attributes);
-.LP
+
 void XmbufChangeBufferAttributes(
     Display *dpy,
     Multibuffer buffer,
     unsigned long valuemask,
     XmbufSetBufferAttributes *attributes);
-.LP
+
 Status XmbufGetScreenInfo(
     Display *dpy,
     Drawable drawable,
@@ -103,7 +110,7 @@ Status XmbufGetScreenInfo(
     XmbufBufferInfo **mono_info_return,
     int *nstereo_return,
     XmbufBufferInfo **stereo_info_return);
-.LP
+
 Window XmbufCreateStereoWindow(
     Display *dpy,
     Window parent,
@@ -119,29 +126,31 @@ Window XmbufCreateStereoWindow(
     XSetWindowAttributes *attributes,
     Multibuffer *left_return,
     Multibuffer *right_return);
-.fi
+.EE
 .SH STRUCTURES
-.nf
-.ta 3i
 \fIEvents:\fP
+.EX
 typedef struct {
-    int type;	/\&* of event */
-    unsigned long serial;	/\&* # of last request processed by server */
-    int send_event;	/\&* true if this came from a SendEvent request */
-    Display *display;	/\&* Display the event was read from */
-    Multibuffer buffer;	/\&* buffer of event */
-    int state;	/\&* see Clobbered constants above */
+    int type;   /\&* of event */
+    unsigned long serial;       /\&* # of last request processed by server */
+    int send_event;     /\&* true if this came from a SendEvent request */
+    Display *display;   /\&* Display the event was read from */
+    Multibuffer buffer; /\&* buffer of event */
+    int state;  /\&* see Clobbered constants above */
 } XmbufClobberNotifyEvent;
-.LP
+
 typedef struct {
-    int type;	/\&* of event */
-    unsigned long serial;	/\&* # of last request processed by server */
-    int send_event;	/\&* true if this came from a SendEvent request */
-    Display *display;	/\&* Display the event was read from */
-    Multibuffer buffer;	/\&* buffer of event */
+    int type;   /\&* of event */
+    unsigned long serial;       /\&* # of last request processed by server */
+    int send_event;     /\&* true if this came from a SendEvent request */
+    Display *display;   /\&* Display the event was read from */
+    Multibuffer buffer; /\&* buffer of event */
 } XmbufUpdateNotifyEvent;
-.LP
+.EE
+
 \fIPer-window attributes that can be got:\fP
+
+.EX
 typedef struct {
     int displayed_index;	/\&* which buffer is being displayed */
     int update_action;	/\&* Undefined, Background, Untouched, Copied */
@@ -150,32 +159,44 @@ typedef struct {
     int nbuffers;	/\&* Number of buffers */
     Multibuffer *buffers;	/\&* Buffers */
 } XmbufWindowAttributes;
-.LP
+.EE
+
 \fIPer-window attributes that can be set:\fP
+
+.EX
 typedef struct {
     int update_hint;	/\&* Frequent, Intermittent, Static */
 } XmbufSetWindowAttributes;
-.LP
+.EE
+
 \fIPer-buffer attributes that can be got:\fP
+
+.EX
 typedef struct {
     Window window;	/\&* which window this belongs to */
     unsigned long event_mask;	/\&* events that have been selected */
     int buffer_index;	/\&* which buffer is this */
     int side;	/\&* Mono, Left, Right */
 } XmbufBufferAttributes;
-.LP
+.EE
+
 \fIPer-buffer attributes that can be set:\fP
+
+.EX
 typedef struct {
     unsigned long event_mask;	/\&* events that have been selected */
 } XmbufSetBufferAttributes;
-.LP
+.EE
+
 \fIPer-screen buffer info (there will be lists of them):\fP
+
+.EX
 typedef struct {
     VisualID visualid;	/\&* visual usable at this depth */
     int max_buffers;	/\&* most buffers for this visual */
     int depth;	/\&* depth of buffers to be created */
 } XmbufBufferInfo;
-.fi
+.EE
 .SH DESCRIPTION
 The application programming library for the
 \fIX11 Double-Buffering, Multi-Buffering, and Stereo Extension\fP
@@ -279,54 +300,54 @@ will be returned if the extension is not available on this display.
 .SH PREDEFINED VALUES
 .sp
 Update_action field:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferUpdateActionUndefined
 .ZN MultibufferUpdateActionBackground
 .ZN MultibufferUpdateActionUntouched
 .ZN MultibufferUpdateActionCopied
-.in -.5i
 .fi
+.RE
 .sp
 Update_hint field:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferUpdateHintFrequent
 .ZN MultibufferUpdateHintIntermittent
 .ZN MultibufferUpdateHintStatic
-.in -.5i
-.sp
 .fi
+.RE
+.sp
 Valuemask fields:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferWindowUpdateHint
 .ZN MultibufferBufferEventMask
-.in -.5i
 .fi
+.RE
 .sp
 Mono vs. stereo and left vs. right:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferModeMono
 .ZN MultibufferModeStereo
 .ZN MultibufferSideMono
 .ZN MultibufferSideLeft
 .ZN MultibufferSideRight
-.in -.5i
 .fi
+.RE
 .sp
 Clobber state:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferUnclobbered
 .ZN MultibufferPartiallyClobbered
 .ZN MultibufferFullyClobbered
-.in -.5i
 .fi
+.RE
 .sp
 Event stuff:
-.in +.5i
+.RS
 .nf
 .ZN MultibufferClobberNotifyMask
 .ZN MultibufferUpdateNotifyMask
@@ -335,8 +356,8 @@ Event stuff:
 .ZN MultibufferNumberEvents
 .ZN MultibufferBadBuffer
 .ZN MultibufferNumberErrors
-.in -.5i
 .fi
+.RE
 .SH BUGS
 This manual page needs more work.
 .SH SEE ALSO
diff --git a/libxcb/src/xcb.h b/libxcb/src/xcb.h
index 44f650ad7..179af845c 100644
--- a/libxcb/src/xcb.h
+++ b/libxcb/src/xcb.h
@@ -72,7 +72,7 @@ extern "C" {
 /** xcb connection errors because of socket, pipe and other stream errors. */
 #define XCB_CONN_ERROR 1
 
-/** xcb connection shutdown because of extension not sppported */
+/** xcb connection shutdown because of extension not supported */
 #define XCB_CONN_CLOSED_EXT_NOTSUPPORTED 2
 
 /** malloc(), calloc() and realloc() error upon failure, for eg ENOMEM */
diff --git a/mesalib/Android.common.mk b/mesalib/Android.common.mk
index e8b900697..1e9f040ac 100644
--- a/mesalib/Android.common.mk
+++ b/mesalib/Android.common.mk
@@ -47,7 +47,9 @@ LOCAL_CFLAGS += \
 ifeq ($(strip $(MESA_ENABLE_ASM)),true)
 ifeq ($(TARGET_ARCH),x86)
 LOCAL_CFLAGS += \
-	-DUSE_X86_ASM
+	-DUSE_X86_ASM \
+	-DHAVE_DLOPEN \
+
 endif
 endif
 
diff --git a/mesalib/configs/current.in b/mesalib/configs/current.in
index c49084210..1802271f9 100644
--- a/mesalib/configs/current.in
+++ b/mesalib/configs/current.in
@@ -105,7 +105,6 @@ GLAPI_LIB_GLOB = @GLAPI_LIB_GLOB@
 # Directories to build
 LIB_DIR = @LIB_DIR@
 SRC_DIRS = @SRC_DIRS@
-GLU_DIRS = @GLU_DIRS@
 DRIVER_DIRS = @DRIVER_DIRS@
 GALLIUM_DIRS = @GALLIUM_DIRS@
 GALLIUM_DRIVERS_DIRS = @GALLIUM_DRIVERS_DIRS@
diff --git a/mesalib/configs/default b/mesalib/configs/default
index ea026e632..1f167b58e 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -95,7 +95,6 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
 LIB_DIR = lib
 SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
 	gallium egl gallium/winsys gallium/targets glu
-GLU_DIRS = sgi
 DRIVER_DIRS = x11 osmesa
 
 # Gallium directories and
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 7dac091b0..c30bcf05c 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -29,7 +29,7 @@ LT_INIT([disable-static])
 dnl Versions for external dependencies
 LIBDRM_REQUIRED=2.4.24
 LIBDRM_RADEON_REQUIRED=2.4.38
-LIBDRM_INTEL_REQUIRED=2.4.37
+LIBDRM_INTEL_REQUIRED=2.4.38
 LIBDRM_NVVIEUX_REQUIRED=2.4.33
 LIBDRM_NOUVEAU_REQUIRED=2.4.33
 DRI2PROTO_REQUIRED=2.6
@@ -55,7 +55,7 @@ fi
 
 AC_PROG_YACC
 AC_PATH_PROG([YACC_INST], $YACC)
-if test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.y"; then
+if test ! -f "$srcdir/src/glsl/glcpp/glcpp-parse.c"; then
     if test -z "$YACC_INST"; then
         AC_MSG_ERROR([yacc not found - unable to compile glcpp-parse.y])
     fi
@@ -283,6 +283,8 @@ xnono )
     ;;
 esac
 
+AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
+
 dnl
 dnl mklib options
 dnl
@@ -497,8 +499,9 @@ MESA_PIC_FLAGS
 
 dnl Check to see if dlopen is in default libraries (like Solaris, which
 dnl has it in libc), or if libdl is needed to get it.
-AC_CHECK_FUNC([dlopen], [],
-    [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_CHECK_FUNC([dlopen], [DEFINES="$DEFINES -DHAVE_DLOPEN"],
+    [AC_CHECK_LIB([dl], [dlopen],
+       [DEFINES="$DEFINES -DHAVE_DLOPEN"; DLOPEN_LIBS="-ldl"])])
 AC_SUBST([DLOPEN_LIBS])
 
 dnl See if posix_memalign is available
@@ -543,19 +546,19 @@ AC_ARG_ENABLE([openvg],
 
 AC_ARG_ENABLE([dri],
     [AS_HELP_STRING([--enable-dri],
-        [enable DRI modules @<:@default=auto@:>@])],
+        [enable DRI modules @<:@default=enabled@:>@])],
     [enable_dri="$enableval"],
-    [enable_dri=auto])
+    [enable_dri=yes])
 AC_ARG_ENABLE([glx],
     [AS_HELP_STRING([--enable-glx],
-        [enable GLX library @<:@default=auto@:>@])],
+        [enable GLX library @<:@default=enabled@:>@])],
     [enable_glx="$enableval"],
-    [enable_glx=auto])
+    [enable_glx=yes])
 AC_ARG_ENABLE([osmesa],
     [AS_HELP_STRING([--enable-osmesa],
-        [enable OSMesa library @<:@default=auto@:>@])],
+        [enable OSMesa library @<:@default=disabled@:>@])],
     [enable_osmesa="$enableval"],
-    [enable_osmesa=auto])
+    [enable_osmesa=no])
 AC_ARG_ENABLE([egl],
     [AS_HELP_STRING([--disable-egl],
         [disable EGL library @<:@default=enabled@:>@])],
@@ -605,9 +608,9 @@ AC_ARG_ENABLE([opencl],
    [enable_opencl=no])
 AC_ARG_ENABLE([xlib_glx],
     [AS_HELP_STRING([--enable-xlib-glx],
-        [make GLX library Xlib-based instead of DRI-based @<:@default=disable@:>@])],
+        [make GLX library Xlib-based instead of DRI-based @<:@default=disabled@:>@])],
     [enable_xlib_glx="$enableval"],
-    [enable_xlib_glx=auto])
+    [enable_xlib_glx=no])
 AC_ARG_ENABLE([gallium_egl],
     [AS_HELP_STRING([--enable-gallium-egl],
         [enable optional EGL state tracker (not required
@@ -681,123 +684,61 @@ if test "x$enable_gles2" = xyes; then
 fi
 AC_SUBST([API_DEFINES])
 
+if test "x$enable_glx" = xno; then
+    AC_MSG_WARN([GLX disabled, disabling Xlib-GLX])
+    enable_xlib_glx=no
+fi
+
+if test "x$enable_dri$enable_xlib_glx" = xyesyes; then
+    AC_MSG_ERROR([DRI and Xlib-GLX cannot be built together])
+fi
+
+# Disable GLX if DRI and Xlib-GLX are not enabled
+if test "x$enable_glx" = xyes -a \
+        "x$enable_dri" = xno -a \
+        "x$enable_xlib_glx" = xno; then
+    AC_MSG_WARN([Neither DRI nor Xlib-GLX enabled, disabling GLX])
+    enable_glx=no
+fi
+
+AM_CONDITIONAL(HAVE_DRI, test "x$enable_dri" = xyes)
+AM_CONDITIONAL(NEED_LIBMESA, test "x$enable_xlib_glx" = xyes -o \
+                                  "x$enable_osmesa" = xyes)
+
 AC_ARG_ENABLE([shared-glapi],
     [AS_HELP_STRING([--enable-shared-glapi],
         [Enable shared glapi for OpenGL @<:@default=yes@:>@])],
     [enable_shared_glapi="$enableval"],
-    [enable_shared_glapi=yes])
+    [enable_shared_glapi="$enable_dri"])
+
+# Shared GLAPI is only useful for DRI
+if test "x$enable_dri" = xno; then
+    AC_MSG_NOTICE([Shared GLAPI is only useful for DRI, disabling])
+    enable_shared_glapi=no
+fi
 
+# TODO: Get rid of SHARED_GLAPI variable
 SHARED_GLAPI="0"
 if test "x$enable_shared_glapi" = xyes; then
     SHARED_GLAPI="1"
     # libGL will use libglapi for function lookups (IN_DRI_DRIVER means to use
     # the remap table)
     DEFINES="$DEFINES -DIN_DRI_DRIVER"
-    SRC_DIRS="$SRC_DIRS mapi/shared-glapi"
+    CORE_DIRS="mapi/shared-glapi"
 fi
 AC_SUBST([SHARED_GLAPI])
-AM_CONDITIONAL(HAVE_SHARED_GLAPI, test $SHARED_GLAPI = 1)
-
-dnl
-dnl Driver configuration. Options are xlib, dri and osmesa right now.
-dnl More later: fbdev, ...
-dnl
-default_driver="xlib"
-
-case "$host_os" in
-linux*)
-    default_driver="dri"
-    ;;
-*freebsd* | dragonfly* | *netbsd*)
-    case "$host_cpu" in
-    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-    esac
-    ;;
-esac
-
-if test "x$enable_opengl" = xno; then
-    default_driver="no"
-fi
-
-AC_ARG_WITH([driver],
-    [AS_HELP_STRING([--with-driver=DRIVER], [DEPRECATED])],
-    [mesa_driver="$withval"],
-    [mesa_driver=auto])
-dnl Check for valid option
-case "x$mesa_driver" in
-xxlib|xdri|xosmesa|xno)
-    if test "x$enable_dri" != xauto -o \
-            "x$enable_glx" != xauto -o \
-            "x$enable_osmesa" != xauto -o \
-            "x$enable_xlib_glx" != xauto; then
-        AC_MSG_ERROR([--with-driver=$mesa_driver is deprecated])
-    fi
-    ;;
-xauto)
-    mesa_driver="$default_driver"
-    ;;
-*)
-    AC_MSG_ERROR([Driver '$mesa_driver' is not a valid option])
-    ;;
-esac
-
-# map $mesa_driver to APIs
-if test "x$enable_dri" = xauto; then
-    case "x$mesa_driver" in
-    xdri) enable_dri=yes ;;
-    *)    enable_dri=no ;;
-    esac
-fi
-
-if test "x$enable_glx" = xauto; then
-    case "x$mesa_driver" in
-    xdri|xxlib) enable_glx=yes ;;
-    *)          enable_glx=no ;;
-    esac
-fi
-
-if test "x$enable_osmesa" = xauto; then
-    case "x$mesa_driver" in
-    xxlib|xosmesa) enable_osmesa=yes ;;
-    *)             enable_osmesa=no ;;
-    esac
-fi
-
-if test "x$enable_xlib_glx" = xauto; then
-    case "x$mesa_driver" in
-    xxlib) enable_xlib_glx=yes ;;
-    *)     enable_xlib_glx=no ;;
-    esac
-fi
-
-if test "x$enable_glx" = xno; then
-    enable_xlib_glx=no
-fi
-
-AM_CONDITIONAL(HAVE_DRI, test x"$enable_dri" = xyes)
+AM_CONDITIONAL(HAVE_SHARED_GLAPI, test "x$enable_shared_glapi" = xyes)
 
 dnl
 dnl Driver specific build directories
 dnl
-
-dnl this variable will be prepended to SRC_DIRS and is not exported
-CORE_DIRS=""
-
 SRC_DIRS="gtest"
-GLU_DIRS="sgi"
 GALLIUM_DIRS="auxiliary drivers state_trackers"
 GALLIUM_TARGET_DIRS=""
 GALLIUM_WINSYS_DIRS="sw"
 GALLIUM_DRIVERS_DIRS="galahad trace rbug noop identity"
 GALLIUM_STATE_TRACKERS_DIRS=""
 
-# build shared-glapi if enabled for OpenGL or if OpenGL ES is enabled
-case "x$enable_shared_glapi$enable_gles1$enable_gles2" in
-x*yes*)
-    CORE_DIRS="$CORE_DIRS mapi/shared-glapi"
-    ;;
-esac
-
 # build glapi if OpenGL is enabled
 if test "x$enable_opengl" = xyes; then
     CORE_DIRS="$CORE_DIRS mapi/glapi"
@@ -847,7 +788,6 @@ if test "x$enable_osmesa" = xyes; then
 fi
 
 AC_SUBST([SRC_DIRS])
-AC_SUBST([GLU_DIRS])
 AC_SUBST([DRIVER_DIRS])
 AC_SUBST([GALLIUM_DIRS])
 AC_SUBST([GALLIUM_TARGET_DIRS])
@@ -979,17 +919,8 @@ GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS"
 AC_SUBST([GLAPI_LIB_DEPS])
 
 
-dnl dri libraries are linking with mesa
-DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.la'
-GALLIUM_DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
-
-dnl ... or dricore?
-if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
-    DRI_LIB_DEPS="\$(TOP)/src/mesa/libdricore/libdricore${VERSION}.la"
-    GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so"
-    HAVE_DRICORE=yes
-fi
-AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
+DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
+GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so"
 
 AC_SUBST([HAVE_XF86VIDMODE])
 
@@ -1268,13 +1199,10 @@ if test "x$enable_osmesa" = xyes; then
     OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS"
 fi
 
-OSMESA_VERSION=`echo "$VERSION" | $SED 's/\./:/g'`
-
 AC_SUBST([OSMESA_LIB_DEPS])
 AC_SUBST([OSMESA_MESA_DEPS])
 AC_SUBST([OSMESA_PC_REQ])
 AC_SUBST([OSMESA_PC_LIB_PRIV])
-AC_SUBST([OSMESA_VERSION])
 
 dnl
 dnl gbm configuration
@@ -1295,9 +1223,11 @@ if test "x$enable_gbm" = xyes; then
 
     if test "x$enable_dri" = xyes; then
         GBM_BACKEND_DIRS="$GBM_BACKEND_DIRS dri"
-        if test "$SHARED_GLAPI" -eq 0; then
+        if test "x$enable_shared_glapi" = xno; then
             AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi])
         fi
+        PKG_CHECK_MODULES([LIBKMS], [libkms], [],
+                          AC_MSG_ERROR([gbm needs libkms]))
     fi
 fi
 GBM_PC_REQ_PRIV="libudev"
@@ -1439,6 +1369,8 @@ if test "x$enable_openvg" = xyes; then
     CORE_DIRS="$CORE_DIRS mapi/vgapi"
     GALLIUM_STATE_TRACKERS_DIRS="vega $GALLIUM_STATE_TRACKERS_DIRS"
     HAVE_ST_VEGA=yes
+    VG_PC_LIB_PRIV="-lm -lpthread $DLOPEN_LIBS"
+    AC_SUBST([VG_PC_LIB_PRIV])
 fi
 
 dnl
@@ -1593,6 +1525,7 @@ dnl
 if test "x$with_gallium_drivers" != x; then
     SRC_DIRS="$SRC_DIRS gallium gallium/winsys gallium/targets"
 fi
+AM_CONDITIONAL(HAVE_GALLIUM, test "x$with_gallium_drivers" != x)
 
 AC_SUBST([LLVM_BINDIR])
 AC_SUBST([LLVM_CFLAGS])
@@ -2048,12 +1981,15 @@ AM_CONDITIONAL(HAVE_GALLIUM_COMPUTE, test x$enable_opencl = xyes)
 AC_SUBST([GALLIUM_MAKE_DIRS])
 
 AM_CONDITIONAL(HAVE_X11_DRIVER, echo "$DRIVER_DIRS" | grep 'x11' >/dev/null 2>&1)
-AM_CONDITIONAL(HAVE_DRI_DRIVER, echo "$DRIVER_DIRS" | grep 'dri' >/dev/null 2>&1)
 
 AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
 AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1)
 AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1)
 
+# To pass as an argument to libtool's -version-number flag
+VERSION_NUMBER=`echo "$VERSION" | $SED 's/\./:/g'`
+AC_SUBST([VERSION_NUMBER])
+
 dnl prepend CORE_DIRS to SRC_DIRS
 SRC_DIRS="$CORE_DIRS $SRC_DIRS"
 
@@ -2068,56 +2004,62 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
 dnl Substitute the config
 AC_CONFIG_FILES([configs/current
 		Makefile
-		src/Makefile
-		src/gallium/Makefile
-		src/gallium/auxiliary/pipe-loader/Makefile
-		src/gallium/state_trackers/clover/Makefile
-		src/gallium/drivers/Makefile
-		src/gallium/drivers/r300/Makefile
-		src/gallium/drivers/r600/Makefile
-		src/gallium/targets/opencl/Makefile
-		src/gbm/Makefile
-		src/gbm/main/gbm.pc
+		src/egl/Makefile
 		src/egl/drivers/Makefile
 		src/egl/drivers/dri2/Makefile
 		src/egl/drivers/glx/Makefile
-		src/egl/Makefile
 		src/egl/main/Makefile
 		src/egl/main/egl.pc
 		src/egl/wayland/Makefile
+		src/egl/wayland/wayland-drm/Makefile
 		src/egl/wayland/wayland-egl/Makefile
 		src/egl/wayland/wayland-egl/wayland-egl.pc
-		src/egl/wayland/wayland-drm/Makefile
+		src/gallium/Makefile
+		src/gallium/auxiliary/pipe-loader/Makefile
+		src/gallium/drivers/Makefile
+		src/gallium/drivers/r300/Makefile
+		src/gallium/drivers/r600/Makefile
+		src/gallium/state_trackers/clover/Makefile
+		src/gallium/targets/opencl/Makefile
+		src/gbm/Makefile
+		src/gbm/main/gbm.pc
 		src/glsl/Makefile
 		src/glsl/glcpp/Makefile
 		src/glsl/tests/Makefile
 		src/glx/Makefile
 		src/glx/tests/Makefile
+		src/gtest/Makefile
+		src/Makefile
+		src/mapi/es1api/Makefile
+		src/mapi/es1api/glesv1_cm.pc
+		src/mapi/es2api/Makefile
+		src/mapi/es2api/glesv2.pc
 		src/mapi/glapi/Makefile
 		src/mapi/glapi/gen/Makefile
-		src/mapi/shared-glapi/Makefile
 		src/mapi/glapi/tests/Makefile
+		src/mapi/shared-glapi/Makefile
 		src/mapi/shared-glapi/tests/Makefile
-		src/gtest/Makefile
+		src/mapi/vgapi/Makefile
+		src/mapi/vgapi/vg.pc
 		src/mesa/Makefile
-		src/mesa/libdricore/Makefile
-		src/mesa/main/tests/Makefile
-		src/mesa/x86/Makefile
-		src/mesa/x86-64/Makefile
+		src/mesa/gl.pc
 		src/mesa/drivers/Makefile
 		src/mesa/drivers/dri/dri.pc
-		src/mesa/drivers/dri/Makefile
 		src/mesa/drivers/dri/common/Makefile
 		src/mesa/drivers/dri/i915/Makefile
 		src/mesa/drivers/dri/i965/Makefile
+		src/mesa/drivers/dri/Makefile
 		src/mesa/drivers/dri/nouveau/Makefile
 		src/mesa/drivers/dri/r200/Makefile
 		src/mesa/drivers/dri/radeon/Makefile
 		src/mesa/drivers/dri/swrast/Makefile
 		src/mesa/drivers/osmesa/Makefile
+		src/mesa/drivers/osmesa/osmesa.pc
 		src/mesa/drivers/x11/Makefile
-		src/mesa/gl.pc
-		src/mesa/drivers/osmesa/osmesa.pc])
+		src/mesa/libdricore/Makefile
+		src/mesa/main/tests/Makefile
+		src/mesa/x86-64/Makefile
+		src/mesa/x86/Makefile])
 
 dnl Sort the dirs alphabetically
 GALLIUM_TARGET_DIRS=`echo $GALLIUM_TARGET_DIRS|tr " " "\n"|sort -u|tr "\n" " "`
@@ -2224,6 +2166,7 @@ dnl Libraries
 echo ""
 echo "        Shared libs:     $enable_shared"
 echo "        Static libs:     $enable_static"
+echo "        Shared-glapi:    $enable_shared_glapi"
 
 dnl Compiler options
 # cleanup the CFLAGS/CXXFLAGS/DEFINES vars
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 246eb30a9..1d5528236 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -75,12 +75,12 @@ GL 3.3:
 GLSL 3.30                                             new features in this version pretty much done
 GL_ARB_blend_func_extended                            DONE (i965, r600, softpipe)
 GL_ARB_explicit_attrib_location                       DONE (i915, i965, r300, r600, swrast)
-GL_ARB_occlusion_query2                               DONE (r300, r600, swrast)
+GL_ARB_occlusion_query2                               DONE (i965, r300, r600, swrast)
 GL_ARB_sampler_objects                                DONE (i965, r300, r600)
 GL_ARB_shader_bit_encoding                            DONE
 GL_ARB_texture_rgb10_a2ui                             DONE (i965, r600)
 GL_ARB_texture_swizzle                                DONE (same as EXT version) (i965, r300, r600, swrast)
-GL_ARB_timer_query                                    DONE
+GL_ARB_timer_query                                    DONE (i965)
 GL_ARB_instanced_arrays                               DONE (i965, r300, r600)
 GL_ARB_vertex_type_2_10_10_10_rev                     DONE (r600)
 
diff --git a/mesalib/include/GL/internal/dri_interface.h b/mesalib/include/GL/internal/dri_interface.h
index 97e1a1a44..09f63ffdc 100644
--- a/mesalib/include/GL/internal/dri_interface.h
+++ b/mesalib/include/GL/internal/dri_interface.h
@@ -935,8 +935,7 @@ struct __DRIdri2ExtensionRec {
 
 #define __DRI_IMAGE_USE_SHARE		0x0001
 #define __DRI_IMAGE_USE_SCANOUT		0x0002
-#define __DRI_IMAGE_USE_CURSOR		0x0004
-#define __DRI_IMAGE_USE_WRITE		0x0008
+#define __DRI_IMAGE_USE_CURSOR		0x0004 /* Depricated */
 
 /**
  * queryImage attributes
@@ -946,7 +945,7 @@ struct __DRIdri2ExtensionRec {
 #define __DRI_IMAGE_ATTRIB_HANDLE	0x2001
 #define __DRI_IMAGE_ATTRIB_NAME		0x2002
 #define __DRI_IMAGE_ATTRIB_FORMAT	0x2003 /* available in versions 3+ */
-#define __DRI_IMAGE_ATTRIB_WIDTH	0x2004 /* available in versions 5+ */
+#define __DRI_IMAGE_ATTRIB_WIDTH	0x2004 /* available in versions 4+ */
 #define __DRI_IMAGE_ATTRIB_HEIGHT	0x2005
 
 typedef struct __DRIimageRec          __DRIimage;
@@ -985,13 +984,6 @@ struct __DRIimageExtensionRec {
    GLboolean (*validateUsage)(__DRIimage *image, unsigned int use);
 
    /**
-    * Write data into image.
-    *
-    * \since 4
-    */
-   int (*write)(__DRIimage *image, const void *buf, size_t count);
-
-   /**
     * Create an image out of a sub-region of a parent image.  This
     * entry point lets us create individual __DRIimages for different
     * planes in a planar buffer (typically yuv), for example.  While a
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk
index 66c8bec32..87a02f51b 100644
--- a/mesalib/src/glsl/Android.mk
+++ b/mesalib/src/glsl/Android.mk
@@ -25,9 +25,9 @@
 
 LOCAL_PATH := $(call my-dir)
 
-GLSL_SRCDIR = .
 include $(LOCAL_PATH)/Makefile.sources
 
+GLSL_SRCDIR = .
 # ---------------------------------------
 # Build libmesa_glsl
 # ---------------------------------------
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp
index 25dc1d7dc..eef9025cf 100644
--- a/mesalib/src/glsl/link_uniforms.cpp
+++ b/mesalib/src/glsl/link_uniforms.cpp
@@ -313,7 +313,7 @@ private:
 	 const gl_texture_index target = base_type->sampler_index();
 	 const unsigned shadow = base_type->sampler_shadow;
 	 for (unsigned i = this->uniforms[id].sampler
-		 ; i < this->next_sampler
+		 ; i < MIN2(this->next_sampler, MAX_SAMPLERS)
 		 ; i++) {
 	    this->targets[i] = target;
 	    this->shader_samplers_used |= 1U << i;
diff --git a/mesalib/src/glu/Makefile b/mesalib/src/glu/Makefile
index b26826597..472645ffb 100644
--- a/mesalib/src/glu/Makefile
+++ b/mesalib/src/glu/Makefile
@@ -5,7 +5,7 @@ TOP = ../..
 include $(TOP)/configs/current
 
 
-SUBDIRS = $(GLU_DIRS)
+SUBDIRS = sgi
 
 
 default: $(TOP)/configs/current
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 499ec09a8..40aaf51cd 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -38,10 +38,18 @@ MESA_GLAPI_OUTPUTS = \
 	$(MESA_GLAPI_DIR)/glapitable.h \
 	$(MESA_GLAPI_DIR)/glapi_gentable.c
 
-MESA_GLAPI_ASM_OUTPUTS = \
-	$(MESA_GLAPI_DIR)/glapi_x86.S \
-	$(MESA_GLAPI_DIR)/glapi_x86-64.S \
-	$(MESA_GLAPI_DIR)/glapi_sparc.S
+MESA_GLAPI_ASM_OUTPUTS =
+if HAVE_X86_ASM
+MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86.S
+endif
+
+if HAVE_X86_64_ASM
+MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_x86-64.S
+endif
+
+if HAVE_SPARC_ASM
+MESA_GLAPI_ASM_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_sparc.S
+endif
 
 MESA_OUTPUTS = \
 	$(MESA_GLAPI_OUTPUTS) \
diff --git a/mesalib/src/mapi/glapi/gen/glapi_gen.mk b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
index eab8eb40c..f65286fbd 100644
--- a/mesalib/src/mapi/glapi/gen/glapi_gen.mk
+++ b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
@@ -1,9 +1,5 @@
 # Helpers for glapi header generation
 
-ifndef top_srcdir
-$(error top_srcdir must be defined.)
-endif
-
 glapi_gen_common_deps := \
 	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
 	$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am
index f1cd6d67c..6964c8a68 100644
--- a/mesalib/src/mesa/Makefile.am
+++ b/mesalib/src/mesa/Makefile.am
@@ -39,6 +39,8 @@ main/git_sha1.h: main/git_sha1.h.tmp
 	@echo "updating main/git_sha1.h"
 	@if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
 		mv main/git_sha1.h.tmp main/git_sha1.h ;\
+	else \
+		rm main/git_sha1.h.tmp ;\
 	fi
 
 # include glapi_gen.mk for generating glapi headers for GLES
@@ -92,7 +94,15 @@ program/lex.yy.c: program/program_lexer.l
 	$(MKDIR_P) program
 	$(AM_V_GEN) $(LEX) --never-interactive --outfile=$@ $<
 
-noinst_LTLIBRARIES = libmesa.la libmesagallium.la
+noinst_LTLIBRARIES =
+if NEED_LIBMESA
+noinst_LTLIBRARIES += libmesa.la
+else
+check_LTLIBRARIES = libmesa.la
+endif
+if HAVE_GALLIUM
+noinst_LTLIBRARIES += libmesagallium.la
+endif
 
 SRCDIR = $(top_srcdir)/src/mesa/
 BUILDDIR = $(top_builddir)/src/mesa/
@@ -140,13 +150,14 @@ libmesagallium_la_SOURCES = \
 libmesagallium_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la
 libmesagallium_la_LDFLAGS =
 
+if HAVE_GALLIUM
 # Provide compatibility with scripts for the old Mesa build system for
 # a while by putting a link to the library in the current directory.
-all-local: libmesa.la libmesagallium.la
-	ln -f .libs/libmesa.a .
+all-local: $(noinst_LTLIBRARIES)
 	ln -f .libs/libmesagallium.a .
+endif
 
-CLEANFILES += libmesa.a libmesagallium.a
+CLEANFILES += libmesagallium.a
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gl.pc
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 1b98b04c1..e2064ce73 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -60,7 +60,6 @@ main_sources = [
     'main/debug.c',
     'main/depth.c',
     'main/dlist.c',
-    'main/dlopen.c',
     'main/drawpix.c',
     'main/drawtex.c',
     'main/enable.c',
@@ -116,6 +115,7 @@ main_sources = [
     'main/stencil.c',
     'main/syncobj.c',
     'main/texcompress.c',
+    'main/texcompress_cpal.c',
     'main/texcompress_rgtc.c',
     'main/texcompress_s3tc.c',
     'main/texcompress_fxt1.c',
@@ -126,7 +126,6 @@ main_sources = [
     'main/texgetimage.c',
     'main/teximage.c',
     'main/texobj.c',
-    'main/texpal.c',
     'main/texparam.c',
     'main/texstate.c',
     'main/texstorage.c',
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index db49d90ea..7d7113c56 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -3010,7 +3010,10 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
 
    _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
 
-   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
+   if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES)
+      _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
+   else
+      assert(!genMipmapSave);
 
    if (ctx->Extensions.EXT_framebuffer_sRGB) {
       _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB_EXT, GL_FALSE);
@@ -3149,7 +3152,8 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
    _mesa_meta_end(ctx);
 
    _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);
-   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
+   if (genMipmapSave)
+      _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
 
    _mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
 }
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
index 7773fd905..9aed2f6e6 100644
--- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c
+++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c
@@ -632,13 +632,14 @@ viewport(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
 }
 
 static gl_format swrastChooseTextureFormat(struct gl_context * ctx,
+                                           GLenum target,
 					   GLint internalFormat,
 					   GLenum format,
 					   GLenum type)
 {
     if (internalFormat == GL_RGB)
 	return MESA_FORMAT_XRGB8888;
-    return _mesa_choose_tex_format(ctx, internalFormat, format, type);
+    return _mesa_choose_tex_format(ctx, target, internalFormat, format, type);
 }
 
 static void
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
index c26caf6ad..3121226ca 100644
--- a/mesalib/src/mesa/main/APIspec.xml
+++ b/mesalib/src/mesa/main/APIspec.xml
@@ -226,47 +226,6 @@
 			<param name="param" type="GLtype"/>
 		</vector>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-		<value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_WRAP_S"/>
-		<value name="GL_TEXTURE_WRAP_T"/>
-		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
-
-		<desc name="param">
-			<value name="GL_CLAMP_TO_EDGE"/>
-			<value name="GL_REPEAT"/>
-			<value name="GL_MIRRORED_REPEAT" category="GLES2.0"/>
-			<value name="GL_MIRRORED_REPEAT_OES" category="OES_texture_mirrored_repeat"/>
-		</desc>
-	</desc>
-
-        <desc name="pname">
-               <value name="GL_TEXTURE_MIN_FILTER"/>
-               <value name="GL_TEXTURE_MAG_FILTER"/>
-		<value name="GL_TEXTURE_MAX_ANISOTROPY_EXT" category="EXT_texture_filter_anisotropic"/>
-        </desc>
-
-	<desc name="pname" category="GLES1.1">
-		<value name="GL_GENERATE_MIPMAP"/>
-
-		<desc name="param">
-			<value name="GL_TRUE"/>
-			<value name="GL_FALSE"/>
-		</desc>
-	</desc>
-
-	<desc name="pname" category="OES_draw_texture">
-		<value name="GL_TEXTURE_CROP_RECT_OES"/>
-		<desc name="params" vector_size="4"/>
-	</desc>
 </template>
 
 <template name="TexImage2D">
@@ -282,168 +241,6 @@
 		<param name="type" type="GLenum"/>
 		<param name="pixels" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_ALPHA"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_ALPHA"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_RGB"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_RGB"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_RGBA"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_RGBA"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_LUMINANCE"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_LUMINANCE_ALPHA"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat" category="OES_depth_texture">
-		<value name="GL_DEPTH_COMPONENT"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_DEPTH_COMPONENT"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat" category="OES_packed_depth_stencil">
-		<value name="GL_DEPTH_STENCIL_OES"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_DEPTH_STENCIL_OES"/>
-		</desc>
-	</desc>
-
-	<desc name="internalFormat" category="EXT_texture_format_BGRA8888">
-		<value name="GL_BGRA_EXT"/>
-
-		<desc name="format" error="GL_INVALID_VALUE">
-			<value name="GL_BGRA_EXT"/>
-		</desc>
-	</desc>
-
-	<desc name="border" error="GL_INVALID_VALUE">
-		<value name="0"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_depth_texture">
-		<value name="GL_DEPTH_COMPONENT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_SHORT"/>
-			<value name="GL_UNSIGNED_INT"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_packed_depth_stencil">
-		<value name="GL_DEPTH_STENCIL_OES"/>
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_INT_24_8_OES"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="EXT_texture_format_BGRA8888">
-		<value name="GL_BGRA_EXT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-		</desc>
-	</desc>
 </template>
 
 <template name="TexEnv">
@@ -1231,30 +1028,6 @@
 		<param name="pname" type="GLenum"/>
 		<vector name="params" type="GLtype *" size="dynamic"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-		<value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_TEXTURE_WRAP_S"/>
-		<value name="GL_TEXTURE_WRAP_T"/>
-		<value name="GL_TEXTURE_WRAP_R_OES" category="OES_texture_3D"/>
-		<value name="GL_TEXTURE_MIN_FILTER"/>
-		<value name="GL_TEXTURE_MAG_FILTER"/>
-		<value name="GL_GENERATE_MIPMAP" category="GLES1.1"/>
-
-		<desc name="params" vector_size="1" convert="false"/>
-	</desc>
-
-	<desc name="pname" category="OES_draw_texture">
-		<value name="GL_TEXTURE_CROP_RECT_OES"/>
-		<desc name="params" vector_size="4"/>
-	</desc>
 </template>
 
 <template name="IsEnabled" direction="get">
@@ -1445,17 +1218,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
 </template>
 
 <template name="DisableClientState">
@@ -1567,14 +1329,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
 </template>
 
 <template name="TexCoordPointer">
@@ -1585,20 +1339,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
 </template>
 
 <template name="VertexPointer">
@@ -1609,20 +1349,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type">
-		<value name="GL_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-	</desc>
 </template>
 
 <template name="PolygonOffset">
@@ -1645,34 +1371,6 @@
 		<param name="height" type="GLsizei"/>
 		<param name="border" type="GLint"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat" error="GL_INVALID_VALUE">
-		<value name="GL_ALPHA"/>
-		<value name="GL_RGB"/>
-		<value name="GL_RGBA"/>
-		<value name="GL_LUMINANCE"/>
-		<value name="GL_LUMINANCE_ALPHA"/>
-	</desc>
-
-	<desc name="border" error="GL_INVALID_VALUE">
-		<value name="0"/>
-	</desc>
 </template>
 
 <template name="CopyTexSubImage2D">
@@ -1687,22 +1385,6 @@
 		<param name="width" type="GLsizei"/>
 		<param name="height" type="GLsizei"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
 </template>
 
 <template name="TexSubImage2D">
@@ -1718,101 +1400,6 @@
 		<param name="type" type="GLenum"/>
 		<param name="pixels" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_depth_texture">
-		<value name="GL_DEPTH_COMPONENT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_SHORT"/>
-			<value name="GL_UNSIGNED_INT"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="OES_packed_depth_stencil">
-		<value name="GL_DEPTH_STENCIL_OES"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_INT_24_8_OES"/>
-		</desc>
-	</desc>
-
-	<desc name="format" category="EXT_texture_format_BGRA8888">
-		<value name="GL_BGRA_EXT"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-		</desc>
-	</desc>
 </template>
 
 <template name="BindTexture">
@@ -1821,14 +1408,6 @@
 		<param name="target" type="GLenum"/>
 		<param name="texture" type="GLuint"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_3D_OES" category="OES_texture_3D"/>
-		<value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/>
-	</desc>
 </template>
 
 <template name="DeleteTextures">
@@ -1894,71 +1473,6 @@
 		<param name="pixels" type="const GLvoid *"/>
 	</proto>
 
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_ALPHA"/>
-		<value name="GL_RGB"/>
-		<value name="GL_RGBA"/>
-		<value name="GL_LUMINANCE"/>
-		<value name="GL_LUMINANCE_ALPHA"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
 </template>
 
 <template name="TexSubImage3D">
@@ -1976,64 +1490,6 @@
 		<param name="type" type="GLenum"/>
 		<param name="pixels" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGB"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_5_6_5"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_RGBA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_UNSIGNED_SHORT_4_4_4_4"/>
-			<value name="GL_UNSIGNED_SHORT_5_5_5_1"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-			<value name="GL_UNSIGNED_INT_2_10_10_10_REV_EXT" category="EXT_texture_type_2_10_10_10_REV"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_LUMINANCE_ALPHA"/>
-
-		<desc name="type" error="GL_INVALID_OPERATION">
-			<value name="GL_UNSIGNED_BYTE"/>
-			<value name="GL_FLOAT" category="OES_texture_float"/>
-			<value name="GL_HALF_FLOAT_OES" category="OES_texture_half_float"/>
-		</desc>
-	</desc>
 </template>
 
 <template name="CopyTexSubImage3D">
@@ -2049,10 +1505,6 @@
 		<param name="width" type="GLsizei"/>
 		<param name="height" type="GLsizei"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
 </template>
 
 <template name="MultiTexCoord">
@@ -2081,10 +1533,6 @@
 		<param name="imagesize" type="GLsizei"/>
 		<param name="data" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
 </template>
 
 <template name="CompressedTexSubImage3D">
@@ -2102,10 +1550,6 @@
 		<param name="imagesize" type="GLsizei"/>
 		<param name="data" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_3D_OES"/>
-	</desc>
 </template>
 
 <template name="ActiveTexture">
@@ -2142,40 +1586,6 @@
 		<param name="imageSize" type="GLsizei"/>
 		<param name="data" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="internalFormat">
-		<value name="GL_ETC1_RGB8_OES" category="OES_compressed_ETC1_RGB8_texture"/>
-
-		<value name="GL_PALETTE4_RGB8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGBA8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGBA4_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE4_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGB8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGBA8_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_R5_G6_B5_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGBA4_OES" category="OES_compressed_paletted_texture"/>
-		<value name="GL_PALETTE8_RGB5_A1_OES" category="OES_compressed_paletted_texture"/>
-
-		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-	</desc>
 </template>
 
 <template name="CompressedTexSubImage2D">
@@ -2191,27 +1601,6 @@
 		<param name="imageSize" type="GLsizei"/>
 		<param name="data" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z" category="GLES2.0"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES" category="OES_texture_cube_map"/>
-		<value name="GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES" category="OES_texture_cube_map"/>
-	</desc>
-
-	<desc name="format">
-		<value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-		<value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/>
-	</desc>
 </template>
 
 <template name="BlendFuncSeparate">
@@ -2344,35 +1733,6 @@
 		<param name="stride" type="GLsizei"/>
 		<param name="pointer" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="size" error="GL_INVALID_VALUE">
-		<value name="1"/>
-		<value name="2"/>
-		<value name="3"/>
-		<value name="4"/>
-	</desc>
-
-	<desc name="type" error="GL_INVALID_VALUE">
-		<value name="GL_BYTE"/>
-		<value name="GL_UNSIGNED_BYTE"/>
-		<value name="GL_SHORT"/>
-		<value name="GL_UNSIGNED_SHORT"/>
-		<value name="GL_FLOAT"/>
-		<value name="GL_FIXED"/>
-		<value name="GL_HALF_FLOAT_OES" category="OES_vertex_half_float"/>
-		<value name="GL_UNSIGNED_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
-		<value name="GL_INT_10_10_10_2_OES" category="OES_vertex_type_10_10_10_2"/>
-	</desc>
-
-	<desc name="type" category="OES_vertex_type_10_10_10_2">
-		<value name="GL_UNSIGNED_INT_10_10_10_2_OES"/>
-		<value name="GL_INT_10_10_10_2_OES"/>
-
-		<desc name="size">
-			<value name="3"/>
-			<value name="4"/>
-		</desc>
-	</desc>
 </template>
 
 <template name="EnableVertexAttribArray">
@@ -2403,21 +1763,6 @@
 		<param name="pname" type="GLenum"/>
 		<vector name="params" type="GLtype *" size="dynamic"/>
 	</proto>
-
-	<desc name="pname">
-		<value name="GL_DELETE_STATUS"/>
-		<value name="GL_LINK_STATUS"/>
-		<value name="GL_VALIDATE_STATUS"/>
-		<value name="GL_INFO_LOG_LENGTH"/>
-		<value name="GL_ATTACHED_SHADERS"/>
-		<value name="GL_ACTIVE_ATTRIBUTES"/>
-		<value name="GL_ACTIVE_ATTRIBUTE_MAX_LENGTH"/>
-		<value name="GL_ACTIVE_UNIFORMS"/>
-		<value name="GL_ACTIVE_UNIFORM_MAX_LENGTH"/>
-		<value name="GL_PROGRAM_BINARY_LENGTH_OES" category="OES_get_program_binary"/>
-
-		<desc name="params" convert="false"/>
-	</desc>
 </template>
 
 <template name="GetVertexAttrib" direction="get">
@@ -2461,11 +1806,6 @@
 		<param name="pname" type="GLenum"/>
 		<vector name="params" type="GLvoid **" size="dynamic"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
 </template>
 
 <template name="MapBuffer" direction="get">
@@ -2474,15 +1814,6 @@
 		<param name="target" type="GLenum"/>
 		<param name="access" type="GLenum"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="access">
-		<value name="GL_WRITE_ONLY_OES"/>
-	</desc>
 </template>
 
 <template name="UnmapBuffer" direction="get">
@@ -2490,11 +1821,6 @@
 		<return type="GLboolean"/>
 		<param name="target" type="GLenum"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
 </template>
 
 <template name="BindBuffer">
@@ -2503,11 +1829,6 @@
 		<param name="target" type="GLenum"/>
 		<param name="buffer" type="GLuint"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
 </template>
 
 <template name="BufferData">
@@ -2518,17 +1839,6 @@
 		<param name="data" type="const GLvoid *"/>
 		<param name="usage" type="GLenum"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="usage">
-		<value name="GL_STATIC_DRAW"/>
-		<value name="GL_DYNAMIC_DRAW"/>
-		<value name="GL_STREAM_DRAW" category="GLES2.0"/>
-	</desc>
 </template>
 
 <template name="BufferSubData">
@@ -2539,11 +1849,6 @@
 		<param name="size" type="GLsizeiptr"/>
 		<param name="data" type="const GLvoid *"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
 </template>
 
 <template name="DeleteBuffers">
@@ -2569,18 +1874,6 @@
 		<param name="pname" type="GLenum"/>
 		<vector name="params" type="GLtype *" size="dynamic"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_ARRAY_BUFFER"/>
-		<value name="GL_ELEMENT_ARRAY_BUFFER"/>
-	</desc>
-
-	<desc name="pname">
-		<value name="GL_BUFFER_SIZE"/>
-		<value name="GL_BUFFER_USAGE"/>
-		<value name="GL_BUFFER_ACCESS_OES" category="OES_mapbuffer"/>
-		<value name="GL_BUFFER_MAPPED_OES" category="OES_mapbuffer"/>
-	</desc>
 </template>
 
 <template name="IsBuffer" direction="get">
@@ -2595,11 +1888,6 @@
 		<return type="GLuint"/>
 		<param name="type" type="GLenum"/>
 	</proto>
-
-	<desc name="type">
-		<value name="GL_VERTEX_SHADER"/>
-		<value name="GL_FRAGMENT_SHADER"/>
-	</desc>
 </template>
 
 <template name="ShaderSource">
@@ -3140,11 +2428,6 @@
 		<param name="target" type="GLenum"/>
 		<param name="image" type="GLeglImageOES"/>
 	</proto>
-
-	<desc name="target">
-		<value name="GL_TEXTURE_2D"/>
-		<value name="GL_TEXTURE_EXTERNAL_OES" category="OES_EGL_image_external"/>
-	</desc>
 </template>
 
 <template name="EGLImageTargetRenderbufferStorage">
diff --git a/mesalib/src/mesa/main/api_validate.c b/mesalib/src/mesa/main/api_validate.c
index eaf614bdc..b15dfba73 100644
--- a/mesalib/src/mesa/main/api_validate.c
+++ b/mesalib/src/mesa/main/api_validate.c
@@ -31,6 +31,7 @@
 #include "mtypes.h"
 #include "enums.h"
 #include "vbo/vbo.h"
+#include <stdbool.h>
 
 
 /**
@@ -262,6 +263,26 @@ _mesa_valid_prim_mode(struct gl_context *ctx, GLenum mode, const char *name)
    return GL_TRUE;
 }
 
+/**
+ * Verify that the element type is valid.
+ *
+ * Generates \c GL_INVALID_ENUM and returns \c false if it is not.
+ */
+static bool
+valid_elements_type(struct gl_context *ctx, GLenum type, const char *name)
+{
+   switch (type) {
+   case GL_UNSIGNED_BYTE:
+   case GL_UNSIGNED_SHORT:
+   case GL_UNSIGNED_INT:
+      return true;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s(type = %s)", name,
+                  _mesa_lookup_enum_by_nr(type));
+      return false;
+   }
+}
 
 /**
  * Error checking for glDrawElements().  Includes parameter checking
@@ -286,13 +307,8 @@ _mesa_validate_DrawElements(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT)
-   {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawElements(type)" );
+   if (!valid_elements_type(ctx, type, "glDrawElements"))
       return GL_FALSE;
-   }
 
    if (!check_valid_to_render(ctx, "glDrawElements"))
       return GL_FALSE;
@@ -348,13 +364,8 @@ _mesa_validate_MultiDrawElements(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT)
-   {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glMultiDrawElements(type)" );
+   if (!valid_elements_type(ctx, type, "glMultiDrawElements"))
       return GL_FALSE;
-   }
 
    if (!check_valid_to_render(ctx, "glMultiDrawElements"))
       return GL_FALSE;
@@ -419,12 +430,8 @@ _mesa_validate_DrawRangeElements(struct gl_context *ctx, GLenum mode,
       return GL_FALSE;
    }
 
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glDrawRangeElements(type)" );
+   if (!valid_elements_type(ctx, type, "glDrawRangeElements"))
       return GL_FALSE;
-   }
 
    if (!check_valid_to_render(ctx, "glDrawRangeElements"))
       return GL_FALSE;
@@ -548,13 +555,8 @@ _mesa_validate_DrawElementsInstanced(struct gl_context *ctx,
       return GL_FALSE;
    }
 
-   if (type != GL_UNSIGNED_INT &&
-       type != GL_UNSIGNED_BYTE &&
-       type != GL_UNSIGNED_SHORT) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glDrawElementsInstanced(type=0x%x)", type);
+   if (!valid_elements_type(ctx, type, "glDrawElementsInstanced"))
       return GL_FALSE;
-   }
 
    if (numInstances <= 0) {
       if (numInstances < 0)
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index df559821c..f8938a510 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -30,7 +30,7 @@
  * \author Brian Paul, Ian Romanick
  */
 
-
+#include <stdbool.h>
 #include "glheader.h"
 #include "enums.h"
 #include "hash.h"
@@ -68,6 +68,12 @@ static struct gl_buffer_object DummyBufferObject;
 static inline struct gl_buffer_object **
 get_buffer_target(struct gl_context *ctx, GLenum target)
 {
+   /* Other targets are only supported in desktop OpenGL and OpenGL ES 3.0.
+    */
+   if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx)
+       && target != GL_ARRAY_BUFFER && target != GL_ELEMENT_ARRAY_BUFFER)
+      return NULL;
+
    switch (target) {
    case GL_ARRAY_BUFFER_ARB:
       return &ctx->Array.ArrayBufferObj;
@@ -89,7 +95,8 @@ get_buffer_target(struct gl_context *ctx, GLenum target)
       break;
 #endif
    case GL_TEXTURE_BUFFER:
-      if (ctx->Extensions.ARB_texture_buffer_object) {
+      if (_mesa_is_desktop_gl(ctx)
+          && ctx->Extensions.ARB_texture_buffer_object) {
          return &ctx->Texture.BufferObject;
       }
       break;
@@ -1002,6 +1009,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 {
    GET_CURRENT_CONTEXT(ctx);
    struct gl_buffer_object *bufObj;
+   bool valid_usage;
    ASSERT_OUTSIDE_BEGIN_END(ctx);
 
    if (MESA_VERBOSE & VERBOSE_API)
@@ -1017,18 +1025,30 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
 
    switch (usage) {
    case GL_STREAM_DRAW_ARB:
+      valid_usage = (ctx->API != API_OPENGLES);
+      break;
+
+   case GL_STATIC_DRAW_ARB:
+   case GL_DYNAMIC_DRAW_ARB:
+      valid_usage = true;
+      break;
+
    case GL_STREAM_READ_ARB:
    case GL_STREAM_COPY_ARB:
-   case GL_STATIC_DRAW_ARB:
    case GL_STATIC_READ_ARB:
    case GL_STATIC_COPY_ARB:
-   case GL_DYNAMIC_DRAW_ARB:
    case GL_DYNAMIC_READ_ARB:
    case GL_DYNAMIC_COPY_ARB:
-      /* OK */
+      valid_usage = _mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx);
       break;
+
    default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
+      valid_usage = false;
+      break;
+   }
+
+   if (!valid_usage) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferData(usage)");
       return;
    }
 
@@ -1115,20 +1135,29 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    struct gl_buffer_object * bufObj;
    GLbitfield accessFlags;
    void *map;
+   bool valid_access;
 
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, NULL);
 
    switch (access) {
    case GL_READ_ONLY_ARB:
       accessFlags = GL_MAP_READ_BIT;
+      valid_access = _mesa_is_desktop_gl(ctx);
       break;
    case GL_WRITE_ONLY_ARB:
       accessFlags = GL_MAP_WRITE_BIT;
+      valid_access = true;
       break;
    case GL_READ_WRITE_ARB:
       accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+      valid_access = _mesa_is_desktop_gl(ctx);
       break;
    default:
+      valid_access = false;
+      break;
+   }
+
+   if (!valid_access) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
       return NULL;
    }
@@ -1282,17 +1311,20 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
       *params = _mesa_bufferobj_mapped(bufObj);
       return;
    case GL_BUFFER_ACCESS_FLAGS:
-      if (!ctx->Extensions.ARB_map_buffer_range)
+      if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_map_buffer_range)
+          && !_mesa_is_gles3(ctx))
          goto invalid_pname;
       *params = bufObj->AccessFlags;
       return;
    case GL_BUFFER_MAP_OFFSET:
-      if (!ctx->Extensions.ARB_map_buffer_range)
+      if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_map_buffer_range)
+          && !_mesa_is_gles3(ctx))
          goto invalid_pname;
       *params = (GLint) bufObj->Offset;
       return;
    case GL_BUFFER_MAP_LENGTH:
-      if (!ctx->Extensions.ARB_map_buffer_range)
+      if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_map_buffer_range)
+          && !_mesa_is_gles3(ctx))
          goto invalid_pname;
       *params = (GLint) bufObj->Length;
       return;
diff --git a/mesalib/src/mesa/main/dd.h b/mesalib/src/mesa/main/dd.h
index 226897b19..e6a1e68cb 100644
--- a/mesalib/src/mesa/main/dd.h
+++ b/mesalib/src/mesa/main/dd.h
@@ -189,12 +189,15 @@ struct dd_function_table {
    /*@{*/
 
    /**
-    * Choose actual hardware texture format given the user-provided source
-    * image format and type and the desired internal format.  In some
-    * cases, srcFormat and srcType can be GL_NONE.
+    * Choose actual hardware texture format given the texture target, the
+    * user-provided source image format and type and the desired internal
+    * format.  In some cases, srcFormat and srcType can be GL_NONE.
+    * Note:  target may be GL_TEXTURE_CUBE_MAP, but never
+    * GL_TEXTURE_CUBE_MAP_[POSITIVE/NEGATIVE]_[XYZ].
     * Called by glTexImage(), etc.
     */
-   gl_format (*ChooseTextureFormat)( struct gl_context *ctx, GLint internalFormat,
+   gl_format (*ChooseTextureFormat)( struct gl_context *ctx,
+                                     GLenum target, GLint internalFormat,
                                      GLenum srcFormat, GLenum srcType );
 
    /**
@@ -396,6 +399,13 @@ struct dd_function_table {
    GLboolean (*ProgramStringNotify)(struct gl_context *ctx, GLenum target, 
                                     struct gl_program *prog);
 
+   /**
+    * Notify driver that the sampler uniforms for the current program have
+    * changed.  On some drivers, this may require shader recompiles.
+    */
+   void (*SamplerUniformChange)(struct gl_context *ctx, GLenum target,
+                                struct gl_program *prog);
+
    /** Query if program can be loaded onto hardware */
    GLboolean (*IsProgramNative)(struct gl_context *ctx, GLenum target, 
 				struct gl_program *prog);
diff --git a/mesalib/src/mesa/main/dlopen.c b/mesalib/src/mesa/main/dlopen.c
deleted file mode 100644
index 57a33292e..000000000
--- a/mesalib/src/mesa/main/dlopen.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 1999-2008  Brian Paul   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 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
- * BRIAN PAUL 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.
- */
-
-
-/**
- * Wrapper functions for dlopen(), dlsym(), dlclose().
- * Note that the #ifdef tests for various environments should be expanded.
- */
-
-
-#include "compiler.h"
-#include "dlopen.h"
-
-#if defined(_GNU_SOURCE) && !defined(__MINGW32__) && !defined(__blrts)
-#include <dlfcn.h>
-#endif
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
-
-/**
- * Wrapper for dlopen().
- * Note that 'flags' isn't used at this time.
- */
-void *
-_mesa_dlopen(const char *libname, int flags)
-{
-#if defined(__blrts)
-   return NULL;
-#elif defined(_GNU_SOURCE)
-   flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
-   return dlopen(libname, flags);
-#elif defined(__MINGW32__)
-   return LoadLibraryA(libname);
-#else
-   return NULL;
-#endif
-}
-
-
-/**
- * Wrapper for dlsym() that does a cast to a generic function type,
- * rather than a void *.  This reduces the number of warnings that are
- * generated.
- */
-GenericFunc
-_mesa_dlsym(void *handle, const char *fname)
-{
-   union {
-      void *v;
-      GenericFunc f;
-   } u;
-#if defined(__blrts)
-   u.v = NULL;
-#elif defined(__DJGPP__)
-   /* need '_' prefix on symbol names */
-   char fname2[1000];
-   fname2[0] = '_';
-   strncpy(fname2 + 1, fname, 998);
-   fname2[999] = 0;
-   u.v = dlsym(handle, fname2);
-#elif defined(_GNU_SOURCE)
-   u.v = dlsym(handle, fname);
-#elif defined(__MINGW32__)
-   u.v = (void *) GetProcAddress(handle, fname);
-#else
-   u.v = NULL;
-#endif
-   return u.f;
-}
-
-
-/**
- * Wrapper for dlclose().
- */
-void
-_mesa_dlclose(void *handle)
-{
-#if defined(__blrts)
-   (void) handle;
-#elif defined(_GNU_SOURCE)
-   dlclose(handle);
-#elif defined(__MINGW32__)
-   FreeLibrary(handle);
-#else
-   (void) handle;
-#endif
-}
-
-
-
diff --git a/mesalib/src/mesa/main/dlopen.h b/mesalib/src/mesa/main/dlopen.h
index 9895a2254..a5366a14e 100644
--- a/mesalib/src/mesa/main/dlopen.h
+++ b/mesalib/src/mesa/main/dlopen.h
@@ -25,18 +25,85 @@
 #ifndef DLOPEN_H
 #define DLOPEN_H
 
+/**
+ * Wrapper functions for dlopen(), dlsym(), dlclose().
+ * Note that the #ifdef tests for various environments should be expanded.
+ */
 
-typedef void (*GenericFunc)(void);
-
+#if defined(HAVE_DLOPEN)
+#include <dlfcn.h>
+#endif
+#if defined(_WIN32)
+#include <windows.h>
+#endif
 
-extern void *
-_mesa_dlopen(const char *libname, int flags);
+typedef void (*GenericFunc)(void);
 
-extern GenericFunc
-_mesa_dlsym(void *handle, const char *fname);
+/**
+ * Wrapper for dlopen().
+ * Note that 'flags' isn't used at this time.
+ */
+static inline void *
+_mesa_dlopen(const char *libname, int flags)
+{
+#if defined(__blrts)
+   return NULL;
+#elif defined(HAVE_DLOPEN)
+   flags = RTLD_LAZY | RTLD_GLOBAL; /* Overriding flags at this time */
+   return dlopen(libname, flags);
+#elif defined(__MINGW32__)
+   return LoadLibraryA(libname);
+#else
+   return NULL;
+#endif
+}
 
-extern void
-_mesa_dlclose(void *handle);
+/**
+ * Wrapper for dlsym() that does a cast to a generic function type,
+ * rather than a void *.  This reduces the number of warnings that are
+ * generated.
+ */
+static inline GenericFunc
+_mesa_dlsym(void *handle, const char *fname)
+{
+   union {
+      void *v;
+      GenericFunc f;
+   } u;
+#if defined(__blrts)
+   u.v = NULL;
+#elif defined(__DJGPP__)
+   /* need '_' prefix on symbol names */
+   char fname2[1000];
+   fname2[0] = '_';
+   strncpy(fname2 + 1, fname, 998);
+   fname2[999] = 0;
+   u.v = dlsym(handle, fname2);
+#elif defined(HAVE_DLOPEN)
+   u.v = dlsym(handle, fname);
+#elif defined(__MINGW32__)
+   u.v = (void *) GetProcAddress(handle, fname);
+#else
+   u.v = NULL;
+#endif
+   return u.f;
+}
 
+/**
+ * Wrapper for dlclose().
+ */
+static inline void
+_mesa_dlclose(void *handle)
+{
+#if defined(__blrts)
+   (void) handle;
+#elif defined(HAVE_DLOPEN)
+   dlclose(handle);
+#elif defined(__MINGW32__)
+   FreeLibrary(handle);
+#else
+   (void) handle;
+#endif
+}
 
 #endif
diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c
index ebd1e889f..75cdfc887 100644
--- a/mesalib/src/mesa/main/es1_conversion.c
+++ b/mesalib/src/mesa/main/es1_conversion.c
@@ -1237,56 +1237,11 @@ _check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
 void GL_APIENTRY
 _es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
 {
-   GLfloat converted_param;
-   bool convert_param_value = true;
-
-   switch(target) {
-   case GL_TEXTURE_2D:
-   case GL_TEXTURE_CUBE_MAP:
-   case GL_TEXTURE_EXTERNAL_OES:
-      break;
-   default:
-      _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                  "glTexParameterx(target=0x%x)", target);
-      return;
-   }
-   switch(pname) {
-   case GL_TEXTURE_WRAP_S:
-   case GL_TEXTURE_WRAP_T:
-      if (param != GL_CLAMP_TO_EDGE && param != GL_REPEAT && param != GL_MIRRORED_REPEAT) {
-         _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                     "glTexParameterx(pname=0x%x)", pname);
-         return;
-      }
-      convert_param_value = false;
-      break;
-   case GL_TEXTURE_MIN_FILTER:
-   case GL_TEXTURE_MAG_FILTER:
-      convert_param_value = false;
-      break;
-   case GL_GENERATE_MIPMAP:
-      if (param != GL_TRUE && param != GL_FALSE) {
-         _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                     "glTexParameterx(pname=0x%x)", pname);
-         return;
-      }
-      convert_param_value = false;
-      break;
-   case GL_TEXTURE_MAX_ANISOTROPY_EXT:
-      break;
-   default:
-      _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                  "glTexParameterx(pname=0x%x)", pname);
-      return;
-   }
-
-   if (convert_param_value) {
-      converted_param = (GLfloat) (param / 65536.0f);
+   if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
+      _mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
    } else {
-      converted_param = (GLfloat) param;
+      _mesa_TexParameterf(target, pname, (GLfloat) param);
    }
-
-   _mesa_TexParameterf(target, pname, converted_param);
 }
 
 void GL_APIENTRY
@@ -1310,25 +1265,12 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
    switch(pname) {
    case GL_TEXTURE_WRAP_S:
    case GL_TEXTURE_WRAP_T:
-      if (params[0] != GL_CLAMP_TO_EDGE && params[0] != GL_REPEAT && params[0] != GL_MIRRORED_REPEAT) {
-         _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                     "glTexParameterxv(pname=0x%x)", pname);
-         return;
-      }
       convert_params_value = false;
       n_params = 1;
       break;
    case GL_TEXTURE_MIN_FILTER:
    case GL_TEXTURE_MAG_FILTER:
-      convert_params_value = false;
-      n_params = 1;
-      break;
    case GL_GENERATE_MIPMAP:
-      if (params[0] != GL_TRUE && params[0] != GL_FALSE) {
-         _mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
-                     "glTexParameterxv(pname=0x%x)", pname);
-         return;
-      }
       convert_params_value = false;
       n_params = 1;
       break;
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 9e357cd09..ab33ac565 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -275,6 +275,7 @@ static const struct extension extension_table[] = {
    { "GL_AMD_shader_stencil_export",               o(ARB_shader_stencil_export),               GL,             2009 },
    { "GL_APPLE_object_purgeable",                  o(APPLE_object_purgeable),                  GL,             2006 },
    { "GL_APPLE_packed_pixels",                     o(APPLE_packed_pixels),                     GLL,            2002 },
+   { "GL_APPLE_texture_max_level",                 o(dummy_true),                                   ES1 | ES2, 2009 },
    { "GL_APPLE_vertex_array_object",               o(APPLE_vertex_array_object),               GLL,            2002 },
    { "GL_ATI_blend_equation_separate",             o(EXT_blend_equation_separate),             GL,             2003 },
    { "GL_ATI_draw_buffers",                        o(dummy_true),                              GLL,            2002 },
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index f743ce109..e850d47dd 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -1363,7 +1363,8 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
    _mesa_associate_uniform_storage(ctx, p.shader_program, fp->Parameters);
 
    _mesa_update_shader_textures_used(p.shader_program, fp);
-   (void) ctx->Driver.ProgramStringNotify(ctx, fp->Target, fp);
+   if (ctx->Driver.SamplerUniformChange)
+      ctx->Driver.SamplerUniformChange(ctx, fp->Target, fp);
 
    if (!p.shader_program->LinkStatus)
       _mesa_problem(ctx, "Failed to link fixed function fragment shader: %s\n",
diff --git a/mesalib/src/mesa/main/glformats.c b/mesalib/src/mesa/main/glformats.c
index daf1b7667..2d06cb715 100644
--- a/mesalib/src/mesa/main/glformats.c
+++ b/mesalib/src/mesa/main/glformats.c
@@ -790,37 +790,45 @@ _mesa_is_compressed_format(struct gl_context *ctx, GLenum format)
    switch (format) {
    case GL_COMPRESSED_RGB_S3TC_DXT1_EXT:
    case GL_COMPRESSED_RGBA_S3TC_DXT1_EXT:
+      return ctx->Extensions.EXT_texture_compression_s3tc;
    case GL_COMPRESSED_RGBA_S3TC_DXT3_EXT:
    case GL_COMPRESSED_RGBA_S3TC_DXT5_EXT:
-      return ctx->Extensions.EXT_texture_compression_s3tc;
+      return _mesa_is_desktop_gl(ctx)
+         && ctx->Extensions.EXT_texture_compression_s3tc;
    case GL_RGB_S3TC:
    case GL_RGB4_S3TC:
    case GL_RGBA_S3TC:
    case GL_RGBA4_S3TC:
-      return ctx->Extensions.S3_s3tc;
+      return _mesa_is_desktop_gl(ctx) && ctx->Extensions.S3_s3tc;
    case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT:
    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT:
    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT:
    case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT:
-      return ctx->Extensions.EXT_texture_sRGB
+      return _mesa_is_desktop_gl(ctx)
+         && ctx->Extensions.EXT_texture_sRGB
          && ctx->Extensions.EXT_texture_compression_s3tc;
    case GL_COMPRESSED_RGB_FXT1_3DFX:
    case GL_COMPRESSED_RGBA_FXT1_3DFX:
-      return ctx->Extensions.TDFX_texture_compression_FXT1;
+      return _mesa_is_desktop_gl(ctx)
+         && ctx->Extensions.TDFX_texture_compression_FXT1;
    case GL_COMPRESSED_RED_RGTC1:
    case GL_COMPRESSED_SIGNED_RED_RGTC1:
    case GL_COMPRESSED_RG_RGTC2:
    case GL_COMPRESSED_SIGNED_RG_RGTC2:
-      return ctx->Extensions.ARB_texture_compression_rgtc;
+      return _mesa_is_desktop_gl(ctx)
+         && ctx->Extensions.ARB_texture_compression_rgtc;
    case GL_COMPRESSED_LUMINANCE_LATC1_EXT:
    case GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT:
    case GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT:
    case GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT:
-      return ctx->Extensions.EXT_texture_compression_latc;
+      return ctx->API == API_OPENGL
+         && ctx->Extensions.EXT_texture_compression_latc;
    case GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI:
-      return ctx->Extensions.ATI_texture_compression_3dc;
+      return ctx->API == API_OPENGL
+         && ctx->Extensions.ATI_texture_compression_3dc;
    case GL_ETC1_RGB8_OES:
-      return ctx->Extensions.OES_compressed_ETC1_RGB8_texture;
+      return _mesa_is_gles(ctx)
+         && ctx->Extensions.OES_compressed_ETC1_RGB8_texture;
 #if FEATURE_ES
    case GL_PALETTE4_RGB8_OES:
    case GL_PALETTE4_RGBA8_OES:
@@ -963,6 +971,45 @@ _mesa_base_format_has_channel(GLenum base_format, GLenum pname)
 
 
 /**
+ * If format is a generic compressed format, return the corresponding
+ * non-compressed format.  For other formats, return the format as-is.
+ */
+GLenum
+_mesa_generic_compressed_format_to_uncompressed_format(GLenum format)
+{
+   switch (format) {
+   case GL_COMPRESSED_RED:
+      return GL_RED;
+   case GL_COMPRESSED_RG:
+      return GL_RG;
+   case GL_COMPRESSED_RGB:
+      return GL_RGB;
+   case GL_COMPRESSED_RGBA:
+      return GL_RGBA;
+   case GL_COMPRESSED_ALPHA:
+      return GL_ALPHA;
+   case GL_COMPRESSED_LUMINANCE:
+      return GL_LUMINANCE;
+   case GL_COMPRESSED_LUMINANCE_ALPHA:
+      return GL_LUMINANCE_ALPHA;
+   case GL_COMPRESSED_INTENSITY:
+      return GL_INTENSITY;
+   /* sRGB formats */
+   case GL_COMPRESSED_SRGB:
+      return GL_SRGB;
+   case GL_COMPRESSED_SRGB_ALPHA:
+      return GL_SRGB_ALPHA;
+   case GL_COMPRESSED_SLUMINANCE:
+      return GL_SLUMINANCE;
+   case GL_COMPRESSED_SLUMINANCE_ALPHA:
+      return GL_SLUMINANCE_ALPHA;
+   default:
+      return format;
+   }
+}
+
+
+/**
  * Do error checking of format/type combinations for glReadPixels,
  * glDrawPixels and glTex[Sub]Image.  Note that depending on the format
  * and type values, we may either generate GL_INVALID_OPERATION or
diff --git a/mesalib/src/mesa/main/glformats.h b/mesalib/src/mesa/main/glformats.h
index d553eae0a..24fbda991 100644
--- a/mesalib/src/mesa/main/glformats.h
+++ b/mesalib/src/mesa/main/glformats.h
@@ -92,6 +92,9 @@ extern GLboolean
 _mesa_base_format_has_channel(GLenum base_format, GLenum pname);
 
 extern GLenum
+_mesa_generic_compressed_format_to_uncompressed_format(GLenum format);
+
+extern GLenum
 _mesa_error_check_format_and_type(const struct gl_context *ctx,
                                   GLenum format, GLenum type);
 
diff --git a/mesalib/src/mesa/main/mipmap.c b/mesalib/src/mesa/main/mipmap.c
index 00d3e8f9e..15373ba69 100644
--- a/mesalib/src/mesa/main/mipmap.c
+++ b/mesalib/src/mesa/main/mipmap.c
@@ -33,6 +33,7 @@
 #include "mipmap.h"
 #include "mtypes.h"
 #include "teximage.h"
+#include "texobj.h"
 #include "texstore.h"
 #include "image.h"
 #include "macros.h"
@@ -1817,7 +1818,7 @@ _mesa_prepare_mipmap_level(struct gl_context *ctx,
                            GLsizei width, GLsizei height, GLsizei depth,
                            GLsizei border, GLenum intFormat, gl_format format)
 {
-   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   const GLuint numFaces = _mesa_num_tex_faces(texObj->Target);
    GLuint face;
 
    if (texObj->Immutable) {
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 552c1cf69..58111a737 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -2820,6 +2820,14 @@ struct gl_constants
    GLuint MaxProgramMatrices;
    GLuint MaxProgramMatrixStackDepth;
 
+   struct {
+      GLuint SamplesPassed;
+      GLuint TimeElapsed;
+      GLuint Timestamp;
+      GLuint PrimitivesGenerated;
+      GLuint PrimitivesWritten;
+   } QueryCounterBits;
+
    /** vertex array / buffer object bounds checking */
    GLboolean CheckArrayBounds;
 
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 4492a172b..407a761e6 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -482,7 +482,36 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
 
    switch (pname) {
       case GL_QUERY_COUNTER_BITS_ARB:
-         *params = 8 * sizeof(q->Result);
+         switch (target) {
+         case GL_SAMPLES_PASSED:
+            *params = ctx->Const.QueryCounterBits.SamplesPassed;
+            break;
+         case GL_ANY_SAMPLES_PASSED:
+            /* The minimum value of this is 1 if it's nonzero, and the value
+             * is only ever GL_TRUE or GL_FALSE, so no sense in reporting more
+             * bits.
+             */
+            *params = 1;
+            break;
+         case GL_TIME_ELAPSED:
+            *params = ctx->Const.QueryCounterBits.TimeElapsed;
+            break;
+         case GL_TIMESTAMP:
+            *params = ctx->Const.QueryCounterBits.Timestamp;
+            break;
+         case GL_PRIMITIVES_GENERATED:
+            *params = ctx->Const.QueryCounterBits.PrimitivesGenerated;
+            break;
+         case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:
+            *params = ctx->Const.QueryCounterBits.PrimitivesWritten;
+            break;
+         default:
+            _mesa_problem(ctx,
+                          "Unknown target in glGetQueryIndexediv(target = %s)",
+                          _mesa_lookup_enum_by_nr(target));
+            *params = 0;
+            break;
+         }
          break;
       case GL_CURRENT_QUERY_ARB:
          *params = q ? q->Id : 0;
@@ -716,6 +745,12 @@ _mesa_init_queryobj(struct gl_context *ctx)
 {
    ctx->Query.QueryObjects = _mesa_NewHashTable();
    ctx->Query.CurrentOcclusionObject = NULL;
+
+   ctx->Const.QueryCounterBits.SamplesPassed = 64;
+   ctx->Const.QueryCounterBits.TimeElapsed = 64;
+   ctx->Const.QueryCounterBits.Timestamp = 64;
+   ctx->Const.QueryCounterBits.PrimitivesGenerated = 64;
+   ctx->Const.QueryCounterBits.PrimitivesWritten = 64;
 }
 
 
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index caeb9657e..d6acade3d 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -177,7 +177,7 @@ validate_shader_target(const struct gl_context *ctx, GLenum type)
 #endif
 #if FEATURE_ARB_geometry_shader4
    case GL_GEOMETRY_SHADER_ARB:
-      return ctx->Extensions.ARB_geometry_shader4;
+      return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_geometry_shader4;
 #endif
    default:
       return false;
@@ -473,6 +473,29 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
    struct gl_shader_program *shProg
       = _mesa_lookup_shader_program(ctx, program);
 
+#if FEATURE_EXT_transform_feedback
+   /* Is transform feedback available in this context?
+    */
+   const bool has_xfb =
+      (ctx->API == API_OPENGL && ctx->Extensions.EXT_transform_feedback)
+      || ctx->API == API_OPENGL_CORE
+      || _mesa_is_gles3(ctx);
+#endif
+
+#if FEATURE_ARB_geometry_shader4
+   /* Are geometry shaders available in this context?
+    */
+   const bool has_gs =
+      _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_geometry_shader4;
+#endif
+
+   /* Are uniform buffer objects available in this context?
+    */
+   const bool has_ubo =
+      (ctx->API == API_OPENGL && ctx->Extensions.ARB_uniform_buffer_object)
+      || ctx->API == API_OPENGL_CORE
+      || _mesa_is_gles3(ctx);
+
    if (!shProg) {
       _mesa_error(ctx, GL_INVALID_VALUE, "glGetProgramiv(program)");
       return;
@@ -481,28 +504,28 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
    switch (pname) {
    case GL_DELETE_STATUS:
       *params = shProg->DeletePending;
-      break; 
+      return;
    case GL_LINK_STATUS:
       *params = shProg->LinkStatus;
-      break;
+      return;
    case GL_VALIDATE_STATUS:
       *params = shProg->Validated;
-      break;
+      return;
    case GL_INFO_LOG_LENGTH:
       *params = shProg->InfoLog ? strlen(shProg->InfoLog) + 1 : 0;
-      break;
+      return;
    case GL_ATTACHED_SHADERS:
       *params = shProg->NumShaders;
-      break;
+      return;
    case GL_ACTIVE_ATTRIBUTES:
       *params = _mesa_count_active_attribs(shProg);
-      break;
+      return;
    case GL_ACTIVE_ATTRIBUTE_MAX_LENGTH:
       *params = _mesa_longest_attribute_name_length(shProg);
-      break;
+      return;
    case GL_ACTIVE_UNIFORMS:
       *params = shProg->NumUserUniformStorage;
-      break;
+      return;
    case GL_ACTIVE_UNIFORM_MAX_LENGTH: {
       unsigned i;
       GLint max_len = 0;
@@ -517,41 +540,48 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
       }
 
       *params = max_len;
-      break;
+      return;
    }
-   case GL_PROGRAM_BINARY_LENGTH_OES:
-      *params = 0;
-      break;
 #if FEATURE_EXT_transform_feedback
    case GL_TRANSFORM_FEEDBACK_VARYINGS:
+      if (!has_xfb)
+         break;
       *params = shProg->TransformFeedback.NumVarying;
-      break;
+      return;
    case GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH:
+      if (!has_xfb)
+         break;
       *params = longest_feedback_varying_name(shProg) + 1;
-      break;
+      return;
    case GL_TRANSFORM_FEEDBACK_BUFFER_MODE:
+      if (!has_xfb)
+         break;
       *params = shProg->TransformFeedback.BufferMode;
-      break;
+      return;
 #endif
 #if FEATURE_ARB_geometry_shader4
    case GL_GEOMETRY_VERTICES_OUT_ARB:
+      if (!has_gs)
+         break;
       *params = shProg->Geom.VerticesOut;
-      break;
+      return;
    case GL_GEOMETRY_INPUT_TYPE_ARB:
+      if (!has_gs)
+         break;
       *params = shProg->Geom.InputType;
-      break;
+      return;
    case GL_GEOMETRY_OUTPUT_TYPE_ARB:
+      if (!has_gs)
+         break;
       *params = shProg->Geom.OutputType;
-      break;
+      return;
 #endif
    case GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH: {
       unsigned i;
       GLint max_len = 0;
 
-      if (!ctx->Extensions.ARB_uniform_buffer_object) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
-         return;
-      }
+      if (!has_ubo)
+         break;
 
       for (i = 0; i < shProg->NumUniformBlocks; i++) {
 	 /* Add one for the terminating NUL character.
@@ -563,20 +593,20 @@ get_programiv(struct gl_context *ctx, GLuint program, GLenum pname, GLint *param
       }
 
       *params = max_len;
-      break;
+      return;
    }
    case GL_ACTIVE_UNIFORM_BLOCKS:
-      if (!ctx->Extensions.ARB_uniform_buffer_object) {
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
-         return;
-      }
+      if (!has_ubo)
+         break;
 
       *params = shProg->NumUniformBlocks;
-      break;
-   default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname)");
       return;
+   default:
+      break;
    }
+
+   _mesa_error(ctx, GL_INVALID_ENUM, "glGetProgramiv(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
 }
 
 
diff --git a/mesalib/src/mesa/main/texcompress.c b/mesalib/src/mesa/main/texcompress.c
index c376b970e..846d4bb63 100644
--- a/mesalib/src/mesa/main/texcompress.c
+++ b/mesalib/src/mesa/main/texcompress.c
@@ -372,7 +372,7 @@ _mesa_glenum_to_compressed_format(GLenum format)
  * internal format unchanged.
  */
 GLenum
-_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat)
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat)
 {
    switch (mesaFormat) {
 #if FEATURE_texture_fxt1
@@ -494,16 +494,16 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
    switch (format) {
    /* DXT formats */
    case MESA_FORMAT_RGB_DXT1:
-      fetch = _mesa_fetch_texel_2d_f_rgb_dxt1;
+      fetch = _mesa_fetch_texel_rgb_dxt1;
       break;
    case MESA_FORMAT_RGBA_DXT1:
-      fetch = _mesa_fetch_texel_2d_f_rgba_dxt1;
+      fetch = _mesa_fetch_texel_rgba_dxt1;
       break;
    case MESA_FORMAT_RGBA_DXT3:
-      fetch = _mesa_fetch_texel_2d_f_rgba_dxt3;
+      fetch = _mesa_fetch_texel_rgba_dxt3;
       break;
    case MESA_FORMAT_RGBA_DXT5:
-      fetch = _mesa_fetch_texel_2d_f_rgba_dxt5;
+      fetch = _mesa_fetch_texel_rgba_dxt5;
       break;
 
    /* FXT1 formats */
@@ -516,30 +516,30 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height,
 
    /* Red/RG formats */
    case MESA_FORMAT_RED_RGTC1:
-      fetch = _mesa_fetch_texel_2d_f_red_rgtc1;
+      fetch = _mesa_fetch_texel_red_rgtc1;
       break;
    case MESA_FORMAT_SIGNED_RED_RGTC1:
-      fetch = _mesa_fetch_texel_2d_f_signed_red_rgtc1;
+      fetch = _mesa_fetch_texel_signed_red_rgtc1;
       break;
    case MESA_FORMAT_RG_RGTC2:
-      fetch = _mesa_fetch_texel_2d_f_rg_rgtc2;
+      fetch = _mesa_fetch_texel_rg_rgtc2;
       break;
    case MESA_FORMAT_SIGNED_RG_RGTC2:
-      fetch = _mesa_fetch_texel_2d_f_signed_rg_rgtc2;
+      fetch = _mesa_fetch_texel_signed_rg_rgtc2;
       break;
 
    /* L/LA formats */
    case MESA_FORMAT_L_LATC1:
-      fetch = _mesa_fetch_texel_2d_f_l_latc1;
+      fetch = _mesa_fetch_texel_l_latc1;
       break;
    case MESA_FORMAT_SIGNED_L_LATC1:
-      fetch = _mesa_fetch_texel_2d_f_signed_l_latc1;
+      fetch = _mesa_fetch_texel_signed_l_latc1;
       break;
    case MESA_FORMAT_LA_LATC2:
-      fetch = _mesa_fetch_texel_2d_f_la_latc2;
+      fetch = _mesa_fetch_texel_la_latc2;
       break;
    case MESA_FORMAT_SIGNED_LA_LATC2:
-      fetch = _mesa_fetch_texel_2d_f_signed_la_latc2;
+      fetch = _mesa_fetch_texel_signed_la_latc2;
       break;
 
    /* ETC1 formats */
diff --git a/mesalib/src/mesa/main/texcompress.h b/mesalib/src/mesa/main/texcompress.h
index 2c357068c..34f4fae7a 100644
--- a/mesalib/src/mesa/main/texcompress.h
+++ b/mesalib/src/mesa/main/texcompress.h
@@ -43,7 +43,7 @@ extern gl_format
 _mesa_glenum_to_compressed_format(GLenum format);
 
 extern GLenum
-_mesa_compressed_format_to_glenum(struct gl_context *ctx, GLuint mesaFormat);
+_mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat);
 
 extern GLubyte *
 _mesa_compressed_image_address(GLint col, GLint row, GLint img,
diff --git a/mesalib/src/mesa/main/texpal.c b/mesalib/src/mesa/main/texcompress_cpal.c
index ed2261b01..2398ded69 100644
--- a/mesalib/src/mesa/main/texpal.c
+++ b/mesalib/src/mesa/main/texcompress_cpal.c
@@ -1,10 +1,25 @@
-/**************************************************************************
+/*
+ * Mesa 3-D graphics library
  *
  * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
- * 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 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 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.
+ */
 
 /**
  * Code to convert compressed/paletted texture images to ordinary images.
@@ -22,8 +37,8 @@
 #include "mtypes.h"
 #include "imports.h"
 #include "pixelstore.h"
+#include "texcompress_cpal.h"
 #include "teximage.h"
-#include "texpal.h"
 
 #if FEATURE_ES
 
diff --git a/mesalib/src/mesa/main/texpal.h b/mesalib/src/mesa/main/texcompress_cpal.h
index acfaa313e..7507d5c1b 100644
--- a/mesalib/src/mesa/main/texpal.h
+++ b/mesalib/src/mesa/main/texcompress_cpal.h
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef TEXPAL_H
-#define TEXPAL_H
+#ifndef TEXCOMPRESS_CPAL_H
+#define TEXCOMPRESS_CPAL_H
 
 
 #include "main/glheader.h"
@@ -42,4 +42,4 @@ extern void
 _mesa_cpal_compressed_format_type(GLenum internalFormat, GLenum *format,
 				  GLenum *type);
 
-#endif /* TEXPAL_H */
+#endif /* TEXCOMPRESS_CPAL_H */
diff --git a/mesalib/src/mesa/main/texcompress_rgtc.c b/mesalib/src/mesa/main/texcompress_rgtc.c
index f707a0994..84d8fc7fc 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.c
+++ b/mesalib/src/mesa/main/texcompress_rgtc.c
@@ -292,12 +292,14 @@ _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS)
 }
 
 void
-_mesa_fetch_texel_2d_f_red_rgtc1(const struct swrast_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_red_rgtc1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLubyte red;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map,
-		       i, j, &red, 1);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset,
+                             i, j, &red, 1);
    texel[RCOMP] = UBYTE_TO_FLOAT(red);
    texel[GCOMP] = 0.0;
    texel[BCOMP] = 0.0;
@@ -305,12 +307,14 @@ _mesa_fetch_texel_2d_f_red_rgtc1(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct swrast_texture_image *texImage,
-					GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_signed_red_rgtc1(const struct swrast_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map),
-		       i, j, &red, 1);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset,
+                           i, j, &red, 1);
    texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
    texel[GCOMP] = 0.0;
    texel[BCOMP] = 0.0;
@@ -318,14 +322,17 @@ _mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct swrast_texture_image *texIm
 }
 
 void
-_mesa_fetch_texel_2d_f_rg_rgtc2(const struct swrast_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_rg_rgtc2(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLubyte red, green;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map,
-		     i, j, &red, 2);
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map + 8,
-		     i, j, &green, 2);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset,
+                             i, j, &red, 2);
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset + 8,
+                             i, j, &green, 2);
    texel[RCOMP] = UBYTE_TO_FLOAT(red);
    texel[GCOMP] = UBYTE_TO_FLOAT(green);
    texel[BCOMP] = 0.0;
@@ -333,14 +340,17 @@ _mesa_fetch_texel_2d_f_rg_rgtc2(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct swrast_texture_image *texImage,
-				       GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_signed_rg_rgtc2(const struct swrast_texture_image *texImage,
+                                  GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red, green;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map),
-		     i, j, &red, 2);
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map) + 8,
-		     i, j, &green, 2);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset,
+                           i, j, &red, 2);
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset + 8,
+                           i, j, &green, 2);
    texel[RCOMP] = BYTE_TO_FLOAT_TEX(red);
    texel[GCOMP] = BYTE_TO_FLOAT_TEX(green);
    texel[BCOMP] = 0.0;
@@ -348,12 +358,14 @@ _mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct swrast_texture_image *texIma
 }
 
 void
-_mesa_fetch_texel_2d_f_l_latc1(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_l_latc1(const struct swrast_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLubyte red;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map,
-                       i, j, &red, 1);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset,
+                             i, j, &red, 1);
    texel[RCOMP] =
    texel[GCOMP] =
    texel[BCOMP] = UBYTE_TO_FLOAT(red);
@@ -361,12 +373,14 @@ _mesa_fetch_texel_2d_f_l_latc1(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_signed_l_latc1(const struct swrast_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_signed_l_latc1(const struct swrast_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map),
-                       i, j, &red, 1);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset,
+                           i, j, &red, 1);
    texel[RCOMP] =
    texel[GCOMP] =
    texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);
@@ -374,14 +388,17 @@ _mesa_fetch_texel_2d_f_signed_l_latc1(const struct swrast_texture_image *texImag
 }
 
 void
-_mesa_fetch_texel_2d_f_la_latc2(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_la_latc2(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLubyte red, green;
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map,
-                     i, j, &red, 2);
-   unsigned_fetch_texel_rgtc(texImage->RowStride, texImage->Map + 8,
-                     i, j, &green, 2);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset,
+                             i, j, &red, 2);
+   unsigned_fetch_texel_rgtc(texImage->RowStride,
+                             texImage->Map + sliceOffset + 8,
+                             i, j, &green, 2);
    texel[RCOMP] =
    texel[GCOMP] =
    texel[BCOMP] = UBYTE_TO_FLOAT(red);
@@ -389,14 +406,17 @@ _mesa_fetch_texel_2d_f_la_latc2(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_signed_la_latc2(const struct swrast_texture_image *texImage,
-                                       GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_signed_la_latc2(const struct swrast_texture_image *texImage,
+                                  GLint i, GLint j, GLint k, GLfloat *texel)
 {
    GLbyte red, green;
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map),
-                     i, j, &red, 2);
-   signed_fetch_texel_rgtc(texImage->RowStride, (GLbyte *)(texImage->Map) + 8,
-                     i, j, &green, 2);
+   GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset,
+                           i, j, &red, 2);
+   signed_fetch_texel_rgtc(texImage->RowStride,
+                           (GLbyte *)(texImage->Map) + sliceOffset + 8,
+                           i, j, &green, 2);
    texel[RCOMP] =
    texel[GCOMP] =
    texel[BCOMP] = BYTE_TO_FLOAT_TEX(red);
diff --git a/mesalib/src/mesa/main/texcompress_rgtc.h b/mesalib/src/mesa/main/texcompress_rgtc.h
index 6be6ad9be..91fda882d 100644
--- a/mesalib/src/mesa/main/texcompress_rgtc.h
+++ b/mesalib/src/mesa/main/texcompress_rgtc.h
@@ -43,35 +43,35 @@ extern GLboolean
 _mesa_texstore_signed_rg_rgtc2(TEXSTORE_PARAMS);
 
 extern void
-_mesa_fetch_texel_2d_f_red_rgtc1(const struct swrast_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_red_rgtc1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_signed_red_rgtc1(const struct swrast_texture_image *texImage,
-					GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_signed_red_rgtc1(const struct swrast_texture_image *texImage,
+                                   GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_rg_rgtc2(const struct swrast_texture_image *texImage,
-				 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_rg_rgtc2(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_signed_rg_rgtc2(const struct swrast_texture_image *texImage,
-				       GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_signed_rg_rgtc2(const struct swrast_texture_image *texImage,
+                                  GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_l_latc1(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_l_latc1(const struct swrast_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_signed_l_latc1(const struct swrast_texture_image *texImage,
-                                        GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_signed_l_latc1(const struct swrast_texture_image *texImage,
+                                 GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_la_latc2(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_la_latc2(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_signed_la_latc2(const struct swrast_texture_image *texImage,
-                                       GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_signed_la_latc2(const struct swrast_texture_image *texImage,
+                                  GLint i, GLint j, GLint k, GLfloat *texel);
 
 #endif
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.c b/mesalib/src/mesa/main/texcompress_s3tc.c
index e30890c8b..230242c56 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.c
+++ b/mesalib/src/mesa/main/texcompress_s3tc.c
@@ -368,13 +368,14 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
 
 
 static void
-fetch_texel_2d_rgb_dxt1( const struct swrast_texture_image *texImage,
-                         GLint i, GLint j, GLint k, GLubyte *texel )
+fetch_texel_2d_rgb_dxt1(const struct swrast_texture_image *texImage,
+                        GLint i, GLint j, GLint k, GLubyte *texel)
 {
    (void) k;
    if (fetch_ext_rgb_dxt1) {
+      GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
       fetch_ext_rgb_dxt1(texImage->RowStride,
-                         texImage->Map, i, j, texel);
+                         texImage->Map + sliceOffset, i, j, texel);
    }
    else
       _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgb_dxt1");
@@ -382,8 +383,8 @@ fetch_texel_2d_rgb_dxt1( const struct swrast_texture_image *texImage,
 
 
 void
-_mesa_fetch_texel_2d_f_rgb_dxt1(const struct swrast_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_rgb_dxt1(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -396,13 +397,14 @@ _mesa_fetch_texel_2d_f_rgb_dxt1(const struct swrast_texture_image *texImage,
 
 
 static void
-fetch_texel_2d_rgba_dxt1( const struct swrast_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLubyte *texel )
+fetch_texel_2d_rgba_dxt1(const struct swrast_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLubyte *texel)
 {
    (void) k;
    if (fetch_ext_rgba_dxt1) {
+      GLint sliceOffset = k ? texImage->ImageOffsets[k] / 2 : 0;
       fetch_ext_rgba_dxt1(texImage->RowStride,
-                          texImage->Map, i, j, texel);
+                          texImage->Map + sliceOffset, i, j, texel);
    }
    else
       _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt1\n");
@@ -410,8 +412,8 @@ fetch_texel_2d_rgba_dxt1( const struct swrast_texture_image *texImage,
 
 
 void
-_mesa_fetch_texel_2d_f_rgba_dxt1(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_rgba_dxt1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -424,13 +426,14 @@ _mesa_fetch_texel_2d_f_rgba_dxt1(const struct swrast_texture_image *texImage,
 
 
 static void
-fetch_texel_2d_rgba_dxt3( const struct swrast_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLubyte *texel )
+fetch_texel_2d_rgba_dxt3(const struct swrast_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLubyte *texel)
 {
    (void) k;
    if (fetch_ext_rgba_dxt3) {
+      GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
       fetch_ext_rgba_dxt3(texImage->RowStride,
-                          texImage->Map, i, j, texel);
+                          texImage->Map + sliceOffset, i, j, texel);
    }
    else
       _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt3\n");
@@ -438,8 +441,8 @@ fetch_texel_2d_rgba_dxt3( const struct swrast_texture_image *texImage,
 
 
 void
-_mesa_fetch_texel_2d_f_rgba_dxt3(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_rgba_dxt3(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -452,13 +455,14 @@ _mesa_fetch_texel_2d_f_rgba_dxt3(const struct swrast_texture_image *texImage,
 
 
 static void
-fetch_texel_2d_rgba_dxt5( const struct swrast_texture_image *texImage,
-                          GLint i, GLint j, GLint k, GLubyte *texel )
+fetch_texel_2d_rgba_dxt5(const struct swrast_texture_image *texImage,
+                         GLint i, GLint j, GLint k, GLubyte *texel)
 {
    (void) k;
    if (fetch_ext_rgba_dxt5) {
+      GLint sliceOffset = k ? texImage->ImageOffsets[k] : 0;
       fetch_ext_rgba_dxt5(texImage->RowStride,
-                          texImage->Map, i, j, texel);
+                          texImage->Map + sliceOffset, i, j, texel);
    }
    else
       _mesa_debug(NULL, "attempted to decode s3tc texture without library available: fetch_texel_2d_rgba_dxt5\n");
@@ -466,8 +470,8 @@ fetch_texel_2d_rgba_dxt5( const struct swrast_texture_image *texImage,
 
 
 void
-_mesa_fetch_texel_2d_f_rgba_dxt5(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_rgba_dxt5(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -480,8 +484,8 @@ _mesa_fetch_texel_2d_f_rgba_dxt5(const struct swrast_texture_image *texImage,
 
 #if FEATURE_EXT_texture_sRGB
 void
-_mesa_fetch_texel_2d_f_srgb_dxt1( const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel )
+_mesa_fetch_texel_srgb_dxt1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -493,8 +497,8 @@ _mesa_fetch_texel_2d_f_srgb_dxt1( const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_srgba_dxt1(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_srgba_dxt1(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -506,8 +510,8 @@ _mesa_fetch_texel_2d_f_srgba_dxt1(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_srgba_dxt3(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_srgba_dxt3(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
@@ -519,8 +523,8 @@ _mesa_fetch_texel_2d_f_srgba_dxt3(const struct swrast_texture_image *texImage,
 }
 
 void
-_mesa_fetch_texel_2d_f_srgba_dxt5(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel)
+_mesa_fetch_texel_srgba_dxt5(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel)
 {
    /* just sample as GLubyte and convert to float here */
    GLubyte rgba[4];
diff --git a/mesalib/src/mesa/main/texcompress_s3tc.h b/mesalib/src/mesa/main/texcompress_s3tc.h
index 23793d167..2c06e50ce 100644
--- a/mesalib/src/mesa/main/texcompress_s3tc.h
+++ b/mesalib/src/mesa/main/texcompress_s3tc.h
@@ -48,36 +48,36 @@ extern GLboolean
 _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS);
 
 extern void
-_mesa_fetch_texel_2d_f_rgb_dxt1(const struct swrast_texture_image *texImage,
-                                GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_rgb_dxt1(const struct swrast_texture_image *texImage,
+                           GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_rgba_dxt1(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_rgba_dxt1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_rgba_dxt3(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_rgba_dxt3(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_rgba_dxt5(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_rgba_dxt5(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_srgb_dxt1(const struct swrast_texture_image *texImage,
-                                 GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_srgb_dxt1(const struct swrast_texture_image *texImage,
+                            GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_srgba_dxt1(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_srgba_dxt1(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_srgba_dxt3(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_srgba_dxt3(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
-_mesa_fetch_texel_2d_f_srgba_dxt5(const struct swrast_texture_image *texImage,
-                                  GLint i, GLint j, GLint k, GLfloat *texel);
+_mesa_fetch_texel_srgba_dxt5(const struct swrast_texture_image *texImage,
+                             GLint i, GLint j, GLint k, GLfloat *texel);
 
 extern void
 _mesa_init_texture_s3tc(struct gl_context *ctx);
diff --git a/mesalib/src/mesa/main/texformat.c b/mesalib/src/mesa/main/texformat.c
index 275e69e31..1a318abe4 100644
--- a/mesalib/src/mesa/main/texformat.c
+++ b/mesalib/src/mesa/main/texformat.c
@@ -61,8 +61,8 @@
  * will typically override this function with a specialized version.
  */
 gl_format
-_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
-                         GLenum format, GLenum type )
+_mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
+                        GLint internalFormat, GLenum format, GLenum type)
 {
    (void) format;
    (void) type;
@@ -236,21 +236,33 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_I8);
 	 break;
       case GL_COMPRESSED_RGB_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
+         /* We don't use texture compression for 1D and 1D array textures.
+          * For 1D textures, compressions doesn't buy us much.
+          * For 1D ARRAY textures, there's complicated issues with updating
+          * sub-regions on non-block boundaries with glCopyTexSubImage, among
+          * other issues.  FWIW, the GL_EXT_texture_array extension prohibits
+          * 1D ARRAY textures in S3TC format.
+          */
+         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
+            if (ctx->Extensions.EXT_texture_compression_s3tc ||
+                ctx->Extensions.S3_s3tc)
+               RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_DXT1);
+            if (ctx->Extensions.TDFX_texture_compression_FXT1)
+               RETURN_IF_SUPPORTED(MESA_FORMAT_RGB_FXT1);
+         }
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGB888);
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_XRGB8888);
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
 	 break;
       case GL_COMPRESSED_RGBA_ARB:
-         if (ctx->Extensions.EXT_texture_compression_s3tc ||
-             ctx->Extensions.S3_s3tc)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
-         if (ctx->Extensions.TDFX_texture_compression_FXT1)
-	    RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
+         /* We don't use texture compression for 1D and 1D array textures. */
+         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY) {
+            if (ctx->Extensions.EXT_texture_compression_s3tc ||
+                ctx->Extensions.S3_s3tc)
+               RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_DXT3); /* Not rgba_dxt1, see spec */
+            if (ctx->Extensions.TDFX_texture_compression_FXT1)
+               RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA_FXT1);
+         }
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_RGBA8888);
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_ARGB8888);
 	 break;
@@ -775,7 +787,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 	 break;
 
       case GL_COMPRESSED_RED:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
+         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
+            RETURN_IF_SUPPORTED(MESA_FORMAT_RED_RGTC1);
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_R8);
 	 break;
 
@@ -789,7 +802,8 @@ _mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
 	 break;
 
       case GL_COMPRESSED_RG:
-	 RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
+         if (target != GL_TEXTURE_1D && target != GL_TEXTURE_1D_ARRAY)
+            RETURN_IF_SUPPORTED(MESA_FORMAT_RG_RGTC2);
 	 RETURN_IF_SUPPORTED(MESA_FORMAT_GR88);
 	 break;
 
diff --git a/mesalib/src/mesa/main/texformat.h b/mesalib/src/mesa/main/texformat.h
index 3cf09213a..71af9ca22 100644
--- a/mesalib/src/mesa/main/texformat.h
+++ b/mesalib/src/mesa/main/texformat.h
@@ -32,8 +32,8 @@
 struct gl_context;
 
 extern gl_format
-_mesa_choose_tex_format( struct gl_context *ctx, GLint internalFormat,
-                         GLenum format, GLenum type );
+_mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
+                        GLint internalFormat, GLenum format, GLenum type);
 
 
 #endif
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 27294ba80..59b38dee4 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -28,7 +28,7 @@
  * Texture image-related functions.
  */
 
-
+#include <stdbool.h>
 #include "glheader.h"
 #include "bufferobj.h"
 #include "context.h"
@@ -42,14 +42,20 @@
 #include "mfeatures.h"
 #include "state.h"
 #include "texcompress.h"
+#include "texcompress_cpal.h"
 #include "teximage.h"
 #include "texobj.h"
 #include "texstate.h"
-#include "texpal.h"
 #include "mtypes.h"
 #include "glformats.h"
 
 
+/* Inexplicably, GL_HALF_FLOAT_OES has a different value than GL_HALF_FLOAT.
+ */
+#ifndef GL_HALF_FLOAT_OES
+#define GL_HALF_FLOAT_OES 0x8D61
+#endif
+
 /**
  * State changes which we care about for glCopyTex[Sub]Image() calls.
  * In particular, we care about pixel transfer state and buffer state
@@ -833,8 +839,8 @@ _mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,
  * \return pointer to texture image or NULL if invalid target, invalid
  *         level, or out of memory.
  */
-struct gl_texture_image *
-_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level)
+static struct gl_texture_image *
+get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level)
 {
    struct gl_texture_image *texImage;
    GLuint texIndex;
@@ -1375,6 +1381,16 @@ compressedteximage_only_format(const struct gl_context *ctx, GLenum format)
 {
    switch (format) {
    case GL_ETC1_RGB8_OES:
+   case GL_PALETTE4_RGB8_OES:
+   case GL_PALETTE4_RGBA8_OES:
+   case GL_PALETTE4_R5_G6_B5_OES:
+   case GL_PALETTE4_RGBA4_OES:
+   case GL_PALETTE4_RGB5_A1_OES:
+   case GL_PALETTE8_RGB8_OES:
+   case GL_PALETTE8_RGBA8_OES:
+   case GL_PALETTE8_R5_G6_B5_OES:
+   case GL_PALETTE8_RGBA4_OES:
+   case GL_PALETTE8_RGB5_A1_OES:
       return GL_TRUE;
    default:
       return GL_FALSE;
@@ -1426,16 +1442,19 @@ legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
       switch (target) {
       case GL_TEXTURE_1D:
       case GL_PROXY_TEXTURE_1D:
-         return GL_TRUE;
+         return _mesa_is_desktop_gl(ctx);
       default:
          return GL_FALSE;
       }
    case 2:
       switch (target) {
       case GL_TEXTURE_2D:
-      case GL_PROXY_TEXTURE_2D:
          return GL_TRUE;
+      case GL_PROXY_TEXTURE_2D:
+         return _mesa_is_desktop_gl(ctx);
       case GL_PROXY_TEXTURE_CUBE_MAP:
+         return _mesa_is_desktop_gl(ctx)
+            && ctx->Extensions.ARB_texture_cube_map;
       case GL_TEXTURE_CUBE_MAP_POSITIVE_X:
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:
       case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:
@@ -1445,23 +1464,31 @@ legal_teximage_target(struct gl_context *ctx, GLuint dims, GLenum target)
          return ctx->Extensions.ARB_texture_cube_map;
       case GL_TEXTURE_RECTANGLE_NV:
       case GL_PROXY_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle;
+         return _mesa_is_desktop_gl(ctx)
+            && ctx->Extensions.NV_texture_rectangle;
       case GL_TEXTURE_1D_ARRAY_EXT:
       case GL_PROXY_TEXTURE_1D_ARRAY_EXT:
-         return (ctx->Extensions.MESA_texture_array ||
-                 ctx->Extensions.EXT_texture_array);
+         return _mesa_is_desktop_gl(ctx)
+            && (ctx->Extensions.MESA_texture_array ||
+                ctx->Extensions.EXT_texture_array);
       default:
          return GL_FALSE;
       }
    case 3:
       switch (target) {
       case GL_TEXTURE_3D:
-      case GL_PROXY_TEXTURE_3D:
          return GL_TRUE;
+      case GL_PROXY_TEXTURE_3D:
+         return _mesa_is_desktop_gl(ctx);
       case GL_TEXTURE_2D_ARRAY_EXT:
+         return (_mesa_is_desktop_gl(ctx)
+                 && (ctx->Extensions.MESA_texture_array ||
+                     ctx->Extensions.EXT_texture_array))
+            || _mesa_is_gles3(ctx);
       case GL_PROXY_TEXTURE_2D_ARRAY_EXT:
-         return (ctx->Extensions.MESA_texture_array ||
-                 ctx->Extensions.EXT_texture_array);
+         return _mesa_is_desktop_gl(ctx)
+            && (ctx->Extensions.MESA_texture_array ||
+                ctx->Extensions.EXT_texture_array);
       default:
          return GL_FALSE;
       }
@@ -1483,7 +1510,7 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
 {
    switch (dims) {
    case 1:
-      return target == GL_TEXTURE_1D;
+      return _mesa_is_desktop_gl(ctx) && target == GL_TEXTURE_1D;
    case 2:
       switch (target) {
       case GL_TEXTURE_2D:
@@ -1496,10 +1523,12 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
       case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:
          return ctx->Extensions.ARB_texture_cube_map;
       case GL_TEXTURE_RECTANGLE_NV:
-         return ctx->Extensions.NV_texture_rectangle;
+         return _mesa_is_desktop_gl(ctx)
+            && ctx->Extensions.NV_texture_rectangle;
       case GL_TEXTURE_1D_ARRAY_EXT:
-         return (ctx->Extensions.MESA_texture_array ||
-                 ctx->Extensions.EXT_texture_array);
+         return _mesa_is_desktop_gl(ctx)
+            && (ctx->Extensions.MESA_texture_array ||
+                ctx->Extensions.EXT_texture_array);
       default:
          return GL_FALSE;
       }
@@ -1508,8 +1537,10 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
       case GL_TEXTURE_3D:
          return GL_TRUE;
       case GL_TEXTURE_2D_ARRAY_EXT:
-         return (ctx->Extensions.MESA_texture_array ||
-                 ctx->Extensions.EXT_texture_array);
+         return (_mesa_is_desktop_gl(ctx)
+                 && (ctx->Extensions.MESA_texture_array ||
+                     ctx->Extensions.EXT_texture_array))
+            || _mesa_is_gles3(ctx);
       default:
          return GL_FALSE;
       }
@@ -1537,6 +1568,101 @@ mutable_tex_object(struct gl_context *ctx, GLenum target)
 }
 
 
+GLenum
+_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
+                                     unsigned dimensions)
+{
+   bool type_valid = true;
+
+   switch (format) {
+   case GL_ALPHA:
+   case GL_LUMINANCE:
+   case GL_LUMINANCE_ALPHA:
+      type_valid = (type == GL_UNSIGNED_BYTE
+                    || type == GL_FLOAT
+                    || type == GL_HALF_FLOAT_OES);
+      break;
+
+   case GL_RGB:
+      type_valid = (type == GL_UNSIGNED_BYTE
+                    || type == GL_UNSIGNED_SHORT_5_6_5
+                    || type == GL_FLOAT
+                    || type == GL_HALF_FLOAT_OES);
+      break;
+
+   case GL_RGBA:
+      type_valid = (type == GL_UNSIGNED_BYTE
+                    || type == GL_UNSIGNED_SHORT_4_4_4_4
+                    || type == GL_UNSIGNED_SHORT_5_5_5_1
+                    || type == GL_FLOAT
+                    || type == GL_HALF_FLOAT_OES
+                    || type == GL_UNSIGNED_INT_2_10_10_10_REV);
+      break;
+
+   case GL_DEPTH_COMPONENT:
+      /* This format is filtered against invalid dimensionalities elsewhere.
+       */
+      type_valid = (type == GL_UNSIGNED_SHORT
+                    || type == GL_UNSIGNED_INT);
+      break;
+
+   case GL_DEPTH_STENCIL:
+      /* This format is filtered against invalid dimensionalities elsewhere.
+       */
+      type_valid = (type == GL_UNSIGNED_INT_24_8);
+      break;
+
+   case GL_BGRA_EXT:
+      type_valid = (type == GL_UNSIGNED_BYTE);
+
+      /* This feels like a bug in the EXT_texture_format_BGRA8888 spec, but
+       * the format does not appear to be allowed for 3D textures in OpenGL
+       * ES.
+       */
+      if (dimensions != 2)
+         return GL_INVALID_VALUE;
+
+      break;
+
+   default:
+      return GL_INVALID_VALUE;
+   }
+
+   return type_valid ? GL_NO_ERROR : GL_INVALID_OPERATION;
+}
+
+
+
+/**
+ * Return expected size of a compressed texture.
+ */
+static GLuint
+compressed_tex_size(GLsizei width, GLsizei height, GLsizei depth,
+                    GLenum glformat)
+{
+   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
+   return _mesa_format_image_size(mesaFormat, width, height, depth);
+}
+
+
+/*
+ * Return compressed texture block size, in pixels.
+ */
+static void
+get_compressed_block_size(GLenum glformat, GLuint *bw, GLuint *bh)
+{
+   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
+   _mesa_get_format_block_size(mesaFormat, bw, bh);
+}
+
+
+/**
+ * Special value returned by error some texture error checking functions when
+ * an error is detected and the proxy texture image's width/height/depth/format
+ * fields should be zeroed-out.
+ */
+#define PROXY_ERROR 2
+
 
 /**
  * Test the glTexImage[123]D() parameters for errors.
@@ -1553,13 +1679,14 @@ mutable_tex_object(struct gl_context *ctx, GLenum target)
  * \param depth image depth given by the user.
  * \param border image border given by the user.
  * 
- * \return GL_TRUE if an error was detected, or GL_FALSE if no errors.
+ * \return PROXY_ERROR if there's an error that should zero-out the proxy image,
+ *         GL_TRUE if a regular GL error is found, or GL_FALSE if no error, 
  *
  * Verifies each of the parameters against the constants specified in
  * __struct gl_contextRec::Const and the supported extensions, and according
  * to the OpenGL specification.
  */
-static GLboolean
+static GLenum
 texture_error_check( struct gl_context *ctx,
                      GLuint dimensions, GLenum target,
                      GLint level, GLint internalFormat,
@@ -1579,34 +1706,62 @@ texture_error_check( struct gl_context *ctx,
     */
    const GLboolean indexFormat = (format == GL_COLOR_INDEX);
 
+   /* Note: for proxy textures, some error conditions immediately generate
+    * a GL error in the usual way.  But others do not generate a GL error.
+    * Instead, they cause the width, height, depth, format fields of the
+    * texture image to be zeroed-out.  The GL spec seems to indicate that the
+    * zero-out behaviour is only used in cases related to memory allocation.
+    */
+
    /* Basic level check (more checking in ctx->Driver.TestProxyTexImage) */
    if (level < 0 || level >= MAX_TEXTURE_LEVELS) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(level=%d)", dimensions, level);
-      }
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexImage%dD(level=%d)", dimensions, level);
       return GL_TRUE;
    }
 
    /* Check border */
    if (border < 0 || border > 1 ||
-       ((target == GL_TEXTURE_RECTANGLE_NV ||
+       ((ctx->API != API_OPENGL ||
+         target == GL_TEXTURE_RECTANGLE_NV ||
          target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(border=%d)", dimensions, border);
-      }
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexImage%dD(border=%d)", dimensions, border);
       return GL_TRUE;
    }
 
    if (width < 0 || height < 0 || depth < 0) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(width, height or depth < 0)", dimensions);
-      }
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexImage%dD(width, height or depth < 0)", dimensions);
       return GL_TRUE;
    }
 
+   /* OpenGL ES 1.x and OpenGL ES 2.0 impose additional restrictions on the
+    * combinations of format, internalFormat, and type that can be used.
+    * Formats and types that require additional extensions (e.g., GL_FLOAT
+    * requires GL_OES_texture_float) are filtered elsewhere.
+    */
+   if (_mesa_is_gles(ctx) && !_mesa_is_gles3(ctx)) {
+      if (format != internalFormat) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexImage%dD(format = %s, internalFormat = %s)",
+                     dimensions,
+                     _mesa_lookup_enum_by_nr(format),
+                     _mesa_lookup_enum_by_nr(internalFormat));
+         return GL_TRUE;
+      }
+
+      err = _mesa_es_error_check_format_and_type(format, type, dimensions);
+      if (err != GL_NO_ERROR) {
+         _mesa_error(ctx, err,
+                     "glTexImage%dD(format = %s, type = %s)",
+                     dimensions,
+                     _mesa_lookup_enum_by_nr(format),
+                     _mesa_lookup_enum_by_nr(type));
+         return GL_TRUE;
+      }
+   }
+
    /* Do this simple check before calling the TestProxyTexImage() function */
    if (proxyTarget == GL_PROXY_TEXTURE_CUBE_MAP_ARB) {
       sizeOK = (width == height);
@@ -1621,32 +1776,32 @@ texture_error_check( struct gl_context *ctx,
                                                     type, width, height,
                                                     depth, border);
    if (!sizeOK) {
-      if (!isProxy) {
+      if (isProxy) {
+         /* No GL error is recorded, but we need to zero-out the image dims */
+         return PROXY_ERROR;
+      }
+      else {
          _mesa_error(ctx, GL_INVALID_VALUE,
                      "glTexImage%dD(level=%d, width=%d, height=%d, depth=%d)",
                      dimensions, level, width, height, depth);
+         return GL_TRUE;
       }
-      return GL_TRUE;
    }
 
    /* Check internalFormat */
    if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_VALUE,
-                     "glTexImage%dD(internalFormat=%s)",
-                     dimensions, _mesa_lookup_enum_by_nr(internalFormat));
-      }
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glTexImage%dD(internalFormat=%s)",
+                  dimensions, _mesa_lookup_enum_by_nr(internalFormat));
       return GL_TRUE;
    }
 
    /* Check incoming image format and type */
    err = _mesa_error_check_format_and_type(ctx, format, type);
    if (err != GL_NO_ERROR) {
-      if (!isProxy) {
-         _mesa_error(ctx, err,
-                     "glTexImage%dD(incompatible format 0x%x, type 0x%x)",
-                     dimensions, format, type);
-      }
+      _mesa_error(ctx, err,
+                  "glTexImage%dD(incompatible format 0x%x, type 0x%x)",
+                  dimensions, format, type);
       return GL_TRUE;
    }
 
@@ -1657,10 +1812,9 @@ texture_error_check( struct gl_context *ctx,
        (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||
        (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||
        (_mesa_is_dudv_format(internalFormat) != _mesa_is_dudv_format(format))) {
-      if (!isProxy)
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",
-                     dimensions, internalFormat, format);
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glTexImage%dD(incompatible internalFormat 0x%x, format 0x%x)",
+                  dimensions, internalFormat, format);
       return GL_TRUE;
    }
 
@@ -1671,7 +1825,8 @@ texture_error_check( struct gl_context *ctx,
           type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {
          char message[100];
          _mesa_snprintf(message, sizeof(message),
-                        "glTexImage%dD(format/type YCBCR mismatch", dimensions);
+                        "glTexImage%dD(format/type YCBCR mismatch)",
+                        dimensions);
          _mesa_error(ctx, GL_INVALID_ENUM, "%s", message);
          return GL_TRUE; /* error */
       }
@@ -1679,18 +1834,17 @@ texture_error_check( struct gl_context *ctx,
           target != GL_PROXY_TEXTURE_2D &&
           target != GL_TEXTURE_RECTANGLE_NV &&
           target != GL_PROXY_TEXTURE_RECTANGLE_NV) {
-         if (!isProxy)
-            _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage(target)");
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexImage%dD(bad target for YCbCr texture)",
+                     dimensions);
          return GL_TRUE;
       }
       if (border != 0) {
-         if (!isProxy) {
-            char message[100];
-            _mesa_snprintf(message, sizeof(message),
-                           "glTexImage%dD(format=GL_YCBCR_MESA and border=%d)",
-                           dimensions, border);
-            _mesa_error(ctx, GL_INVALID_VALUE, "%s", message);
-         }
+         char message[100];
+         _mesa_snprintf(message, sizeof(message),
+                        "glTexImage%dD(format=GL_YCBCR_MESA and border=%d)",
+                        dimensions, border);
+         _mesa_error(ctx, GL_INVALID_VALUE, "%s", message);
          return GL_TRUE;
       }
    }
@@ -1711,9 +1865,9 @@ texture_error_check( struct gl_context *ctx,
           target != GL_PROXY_TEXTURE_RECTANGLE_ARB &&
          !((_mesa_is_cube_face(target) || target == GL_PROXY_TEXTURE_CUBE_MAP) &&
            (ctx->Version >= 30 || ctx->Extensions.EXT_gpu_shader4))) {
-         if (!isProxy)
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexImage(target/internalFormat)");
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexImage%dD(bad target for depth texture)",
+                     dimensions);
          return GL_TRUE;
       }
    }
@@ -1721,21 +1875,18 @@ texture_error_check( struct gl_context *ctx,
    /* additional checks for compressed textures */
    if (_mesa_is_compressed_format(ctx, internalFormat)) {
       if (!target_can_be_compressed(ctx, target, internalFormat)) {
-         if (!isProxy)
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexImage%dD(target)", dimensions);
+         _mesa_error(ctx, GL_INVALID_ENUM,
+                     "glTexImage%dD(target can't be compressed)", dimensions);
          return GL_TRUE;
       }
       if (compressedteximage_only_format(ctx, internalFormat)) {
          _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glTexImage%dD(no compression for format)", dimensions);
+                     "glTexImage%dD(no compression for format)", dimensions);
          return GL_TRUE;
       }
       if (border != 0) {
-         if (!isProxy) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                        "glTexImage%dD(border!=0)", dimensions);
-         }
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glTexImage%dD(border!=0)", dimensions);
          return GL_TRUE;
       }
    }
@@ -1744,11 +1895,9 @@ texture_error_check( struct gl_context *ctx,
    if ((ctx->Version >= 30 || ctx->Extensions.EXT_texture_integer) &&
        (_mesa_is_enum_format_integer(format) !=
         _mesa_is_enum_format_integer(internalFormat))) {
-      if (!isProxy) {
-         _mesa_error(ctx, GL_INVALID_OPERATION,
-                     "glTexImage%dD(integer/non-integer format mismatch)",
-                     dimensions);
-      }
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glTexImage%dD(integer/non-integer format mismatch)",
+                  dimensions);
       return GL_TRUE;
    }
 
@@ -1764,6 +1913,187 @@ texture_error_check( struct gl_context *ctx,
 
 
 /**
+ * Error checking for glCompressedTexImage[123]D().
+ * \param reason  returns reason for error, if any
+ * \return error code or GL_NO_ERROR or PROXY_ERROR.
+ */
+static GLenum
+compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
+                               GLenum target, GLint level,
+                               GLenum internalFormat, GLsizei width,
+                               GLsizei height, GLsizei depth, GLint border,
+                               GLsizei imageSize)
+{
+   const GLenum proxyTarget = get_proxy_target(target);
+   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
+   GLint expectedSize;
+   GLenum choose_format;
+   GLenum choose_type;
+   GLenum proxy_format;
+   GLenum error = GL_NO_ERROR;
+   char *reason = ""; /* no error */
+
+   if (!target_can_be_compressed(ctx, target, internalFormat)) {
+      reason = "target";
+      error = GL_INVALID_ENUM;
+      goto error;
+   }
+
+   /* This will detect any invalid internalFormat value */
+   if (!_mesa_is_compressed_format(ctx, internalFormat)) {
+      reason = "internalFormat";
+      error = GL_INVALID_ENUM;
+      goto error;
+   }
+
+   switch (internalFormat) {
+#if FEATURE_ES
+   case GL_PALETTE4_RGB8_OES:
+   case GL_PALETTE4_RGBA8_OES:
+   case GL_PALETTE4_R5_G6_B5_OES:
+   case GL_PALETTE4_RGBA4_OES:
+   case GL_PALETTE4_RGB5_A1_OES:
+   case GL_PALETTE8_RGB8_OES:
+   case GL_PALETTE8_RGBA8_OES:
+   case GL_PALETTE8_R5_G6_B5_OES:
+   case GL_PALETTE8_RGBA4_OES:
+   case GL_PALETTE8_RGB5_A1_OES:
+      _mesa_cpal_compressed_format_type(internalFormat, &choose_format,
+					&choose_type);
+      proxy_format = choose_format;
+
+      /* check level (note that level should be zero or less!) */
+      if (level > 0 || level < -maxLevels) {
+	 reason = "level";
+	 error = GL_INVALID_VALUE;
+         goto error;
+      }
+
+      if (dimensions != 2) {
+	 reason = "compressed paletted textures must be 2D";
+	 error = GL_INVALID_OPERATION;
+         goto error;
+      }
+
+      /* Figure out the expected texture size (in bytes).  This will be
+       * checked against the actual size later.
+       */
+      expectedSize = _mesa_cpal_compressed_size(level, internalFormat,
+						width, height);
+
+      /* This is for the benefit of the TestProxyTexImage below.  It expects
+       * level to be non-negative.  OES_compressed_paletted_texture uses a
+       * weird mechanism where the level specified to glCompressedTexImage2D
+       * is -(n-1) number of levels in the texture, and the data specifies the
+       * complete mipmap stack.  This is done to ensure the palette is the
+       * same for all levels.
+       */
+      level = -level;
+      break;
+#endif
+
+   default:
+      choose_format = GL_NONE;
+      choose_type = GL_NONE;
+      proxy_format = internalFormat;
+
+      /* check level */
+      if (level < 0 || level >= maxLevels) {
+	 reason = "level";
+	 error = GL_INVALID_VALUE;
+         goto error;
+      }
+
+      /* Figure out the expected texture size (in bytes).  This will be
+       * checked against the actual size later.
+       */
+      expectedSize = compressed_tex_size(width, height, depth, internalFormat);
+      break;
+   }
+
+   /* This should really never fail */
+   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
+      reason = "internalFormat";
+      error = GL_INVALID_ENUM;
+      goto error;
+   }
+
+   /* No compressed formats support borders at this time */
+   if (border != 0) {
+      reason = "border != 0";
+      error = GL_INVALID_VALUE;
+      goto error;
+   }
+
+   /* For cube map, width must equal height */
+   if (_mesa_is_cube_face(target) && width != height) {
+      reason = "width != height";
+      error = GL_INVALID_VALUE;
+      goto error;
+   }
+
+   /* check image size against compression block size */
+   {
+      gl_format texFormat =
+         ctx->Driver.ChooseTextureFormat(ctx, target, proxy_format,
+					 choose_format, choose_type);
+      GLuint bw, bh;
+
+      _mesa_get_format_block_size(texFormat, &bw, &bh);
+      if ((width > bw && width % bw > 0) ||
+          (height > bh && height % bh > 0)) {
+         /*
+          * Per GL_ARB_texture_compression:  GL_INVALID_OPERATION is
+          * generated [...] if any parameter combinations are not
+          * supported by the specific compressed internal format. 
+          */
+         reason = "invalid width or height for compression format";
+         error = GL_INVALID_OPERATION;
+         goto error;
+      }
+   }
+
+   /* check image sizes */
+   if (!ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,
+				      proxy_format, choose_format,
+				      choose_type,
+				      width, height, depth, border)) {
+      /* See error comment above */
+      if (target == proxyTarget) {
+         return PROXY_ERROR;
+      }
+      reason = "invalid width, height or format";
+      error = GL_INVALID_OPERATION;
+      goto error;
+   }
+
+   /* check image size in bytes */
+   if (expectedSize != imageSize) {
+      /* Per GL_ARB_texture_compression:  GL_INVALID_VALUE is generated [...]
+       * if <imageSize> is not consistent with the format, dimensions, and
+       * contents of the specified image.
+       */
+      reason = "imageSize inconsistant with width/height/format";
+      error = GL_INVALID_VALUE;
+      goto error;
+   }
+
+   if (!mutable_tex_object(ctx, target)) {
+      reason = "immutable texture";
+      error = GL_INVALID_OPERATION;
+      goto error;
+   }
+
+   return GL_NO_ERROR;
+
+error:
+   _mesa_error(ctx, error, "glCompressedTexImage%dD(%s)", dimensions, reason);
+   return error;
+}
+
+
+
+/**
  * Test glTexSubImage[123]D() parameters for errors.
  * 
  * \param ctx GL context.
@@ -1817,6 +2147,23 @@ subtexture_error_check( struct gl_context *ctx, GLuint dimensions,
       return GL_TRUE;
    }
 
+   /* OpenGL ES 1.x and OpenGL ES 2.0 impose additional restrictions on the
+    * combinations of format and type that can be used.  Formats and types
+    * that require additional extensions (e.g., GL_FLOAT requires
+    * GL_OES_texture_float) are filtered elsewhere.
+    */
+   if (_mesa_is_gles(ctx) && !_mesa_is_gles3(ctx)) {
+      err = _mesa_es_error_check_format_and_type(format, type, dimensions);
+      if (err != GL_NO_ERROR) {
+         _mesa_error(ctx, err,
+                     "glTexSubImage%dD(format = %s, type = %s)",
+                     dimensions,
+                     _mesa_lookup_enum_by_nr(format),
+                     _mesa_lookup_enum_by_nr(type));
+         return GL_TRUE;
+      }
+   }
+
    err = _mesa_error_check_format_and_type(ctx, format, type);
    if (err != GL_NO_ERROR) {
       _mesa_error(ctx, err,
@@ -1992,11 +2339,32 @@ copytexture_error_check( struct gl_context *ctx, GLuint dimensions,
 
    /* Check border */
    if (border < 0 || border > 1 ||
-       ((target == GL_TEXTURE_RECTANGLE_NV ||
+       ((ctx->API != API_OPENGL ||
+         target == GL_TEXTURE_RECTANGLE_NV ||
          target == GL_PROXY_TEXTURE_RECTANGLE_NV) && border != 0)) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glCopyTexImage%dD(border=%d)", dimensions, border);
       return GL_TRUE;
    }
 
+   /* OpenGL ES 1.x and OpenGL ES 2.0 impose additional restrictions on the
+    * internalFormat.
+    */
+   if (_mesa_is_gles(ctx) && !_mesa_is_gles3(ctx)) {
+      switch (internalFormat) {
+      case GL_ALPHA:
+      case GL_RGB:
+      case GL_RGBA:
+      case GL_LUMINANCE:
+      case GL_LUMINANCE_ALPHA:
+         break;
+      default:
+         _mesa_error(ctx, GL_INVALID_VALUE,
+                     "glCopyTexImage%dD(internalFormat)", dimensions);
+         return GL_TRUE;
+      }
+   }
+
    baseFormat = _mesa_base_tex_format(ctx, internalFormat);
    if (baseFormat < 0) {
       _mesa_error(ctx, GL_INVALID_VALUE,
@@ -2429,7 +2797,8 @@ _mesa_choose_texture_format(struct gl_context *ctx,
    }
 
    /* choose format from scratch */
-   f = ctx->Driver.ChooseTextureFormat(ctx, internalFormat, format, type);
+   f = ctx->Driver.ChooseTextureFormat(ctx, texObj->Target, internalFormat,
+                                       format, type);
    ASSERT(f != MESA_FORMAT_NONE);
    return f;
 }
@@ -2477,71 +2846,125 @@ strip_texture_border(GLenum target,
    }
 }
 
+
 /**
- * Common code to implement all the glTexImage1D/2D/3D functions.
+ * Common code to implement all the glTexImage1D/2D/3D functions
+ * as well as glCompressedTexImage1D/2D/3D.
+ * \param compressed  only GL_TRUE for glCompressedTexImage1D/2D/3D calls.
+ * \param format  the user's image format (only used if !compressed)
+ * \param type  the user's image type (only used if !compressed)
+ * \param imageSize  only used for glCompressedTexImage1D/2D/3D calls.
  */
 static void
-teximage(struct gl_context *ctx, GLuint dims,
+teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
          GLenum target, GLint level, GLint internalFormat,
          GLsizei width, GLsizei height, GLsizei depth,
          GLint border, GLenum format, GLenum type,
-         const GLvoid *pixels)
+         GLsizei imageSize, const GLvoid *pixels)
 {
-   GLboolean error;
+   const char *func = compressed ? "glCompressedTexImage" : "glTexImage";
+   GLenum error;
    struct gl_pixelstore_attrib unpack_no_border;
    const struct gl_pixelstore_attrib *unpack = &ctx->Unpack;
 
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx, "glTexImage%uD %s %d %s %d %d %d %d %s %s %p\n",
-                  dims,
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  width, height, depth, border,
-                  _mesa_lookup_enum_by_nr(format),
-                  _mesa_lookup_enum_by_nr(type), pixels);
+   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE)) {
+      if (compressed)
+         _mesa_debug(ctx,
+                     "glCompressedTexImage%uD %s %d %s %d %d %d %d %p\n",
+                     dims,
+                     _mesa_lookup_enum_by_nr(target), level,
+                     _mesa_lookup_enum_by_nr(internalFormat),
+                     width, height, depth, border, pixels);
+      else
+         _mesa_debug(ctx,
+                     "glTexImage%uD %s %d %s %d %d %d %d %s %s %p\n",
+                     dims,
+                     _mesa_lookup_enum_by_nr(target), level,
+                     _mesa_lookup_enum_by_nr(internalFormat),
+                     width, height, depth, border,
+                     _mesa_lookup_enum_by_nr(format),
+                     _mesa_lookup_enum_by_nr(type), pixels);
+   }
 
    internalFormat = override_internal_format(internalFormat, width, height);
 
    /* target error checking */
    if (!legal_teximage_target(ctx, dims, target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexImage%uD(target=%s)",
-                  dims, _mesa_lookup_enum_by_nr(target));
+      _mesa_error(ctx, GL_INVALID_ENUM, "%s%uD(target=%s)",
+                  func, dims, _mesa_lookup_enum_by_nr(target));
       return;
    }
 
    /* general error checking */
-   error = texture_error_check(ctx, dims, target, level, internalFormat,
-                               format, type, width, height, depth, border);
+   if (compressed) {
+      error = compressed_texture_error_check(ctx, dims, target, level,
+                                             internalFormat,
+                                             width, height, depth,
+                                             border, imageSize);
+   }
+   else {
+      error = texture_error_check(ctx, dims, target, level, internalFormat,
+                                  format, type, width, height, depth, border);
+   }
+
+#if FEATURE_ES
+   /* Here we convert a cpal compressed image into a regular glTexImage2D
+    * call by decompressing the texture.  If we really want to support cpal
+    * textures in any driver this would have to be changed.
+    */
+   if (compressed && !error && dims == 2) {
+      switch (internalFormat) {
+      case GL_PALETTE4_RGB8_OES:
+      case GL_PALETTE4_RGBA8_OES:
+      case GL_PALETTE4_R5_G6_B5_OES:
+      case GL_PALETTE4_RGBA4_OES:
+      case GL_PALETTE4_RGB5_A1_OES:
+      case GL_PALETTE8_RGB8_OES:
+      case GL_PALETTE8_RGBA8_OES:
+      case GL_PALETTE8_R5_G6_B5_OES:
+      case GL_PALETTE8_RGBA4_OES:
+      case GL_PALETTE8_RGB5_A1_OES:
+         _mesa_cpal_compressed_teximage2d(target, level, internalFormat,
+                                          width, height, imageSize, pixels);
+         return;
+      }
+   }
+#endif
 
    if (_mesa_is_proxy_texture(target)) {
       /* Proxy texture: just clear or set state depending on error checking */
       struct gl_texture_image *texImage =
-         _mesa_get_proxy_tex_image(ctx, target, level);
+         get_proxy_tex_image(ctx, target, level);
+      gl_format texFormat = MESA_FORMAT_NONE;
 
-      if (error) {
-         /* when error, clear all proxy texture image parameters */
-         if (texImage)
-            clear_teximage_fields(texImage);
-      }
-      else {
-         /* no error, set the tex image parameters */
+      if (!error) {
+         /* No parameter errors.  Choose a texture format and see if we
+          * can really allocate the texture.
+          */
          struct gl_texture_object *texObj =
             _mesa_get_current_tex_object(ctx, target);
-         gl_format texFormat = _mesa_choose_texture_format(ctx, texObj,
-                                                           target, level,
-                                                           internalFormat,
-                                                           format, type);
-
-         if (legal_texture_size(ctx, texFormat, width, height, depth)) {
-            _mesa_init_teximage_fields(ctx, texImage, width, height,
-                                       depth, border, internalFormat,
-                                       texFormat);
+         texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,
+                                                 internalFormat, format, type);
+         if (!legal_texture_size(ctx, texFormat, width, height, depth)) {
+            error = PROXY_ERROR;
          }
-         else if (texImage) {
+      }
+
+      if (error == PROXY_ERROR) {
+         /* image too large, etc.  Clear all proxy texture image parameters. */
+         if (texImage)
             clear_teximage_fields(texImage);
-         }
+      }
+      else if (error == GL_FALSE) {
+         /* no error: store the teximage parameters */
+         if (texImage)
+            _mesa_init_teximage_fields(ctx, texImage, width, height, depth,
+                                       border, internalFormat, texFormat);
+      }
+      else {
+         /* other, regular error (was already recorded) */
       }
    }
    else {
@@ -2575,7 +2998,7 @@ teximage(struct gl_context *ctx, GLuint dims,
 	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
 
 	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims);
+	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s%uD", func, dims);
 	 }
          else {
             gl_format texFormat;
@@ -2592,8 +3015,14 @@ teximage(struct gl_context *ctx, GLuint dims,
                                           border, internalFormat, texFormat);
 
                /* Give the texture to the driver.  <pixels> may be null. */
-               ctx->Driver.TexImage(ctx, dims, texImage, format,
-                                    type, pixels, unpack);
+               if (compressed) {
+                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+                                                 imageSize, pixels);
+               }
+               else {
+                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+                                       type, pixels, unpack);
+               }
 
                check_gen_mipmap(ctx, target, texObj, level);
 
@@ -2602,7 +3031,7 @@ teximage(struct gl_context *ctx, GLuint dims,
                _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
             }
             else {
-               _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage%uD", dims);
+               _mesa_error(ctx, GL_OUT_OF_MEMORY, "%s%uD", func, dims);
             }
          }
       }
@@ -2620,8 +3049,8 @@ _mesa_TexImage1D( GLenum target, GLint level, GLint internalFormat,
                   GLenum type, const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   teximage(ctx, 1, target, level, internalFormat, width, 1, 1,
-            border, format, type, pixels);
+   teximage(ctx, GL_FALSE, 1, target, level, internalFormat, width, 1, 1,
+            border, format, type, 0, pixels);
 }
 
 
@@ -2632,8 +3061,8 @@ _mesa_TexImage2D( GLenum target, GLint level, GLint internalFormat,
                   const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   teximage(ctx, 2, target, level, internalFormat, width, height, 1,
-            border, format, type, pixels);
+   teximage(ctx, GL_FALSE, 2, target, level, internalFormat, width, height, 1,
+            border, format, type, 0, pixels);
 }
 
 
@@ -2648,8 +3077,9 @@ _mesa_TexImage3D( GLenum target, GLint level, GLint internalFormat,
                   const GLvoid *pixels )
 {
    GET_CURRENT_CONTEXT(ctx);
-   teximage(ctx, 3, target, level, internalFormat, width, height, depth,
-            border, format, type, pixels);
+   teximage(ctx, GL_FALSE, 3, target, level, internalFormat,
+            width, height, depth,
+            border, format, type, 0, pixels);
 }
 
 
@@ -2670,13 +3100,23 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
 {
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
+   bool valid_target;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if ((target == GL_TEXTURE_2D &&
-        !ctx->Extensions.OES_EGL_image) ||
-       (target == GL_TEXTURE_EXTERNAL_OES &&
-        !ctx->Extensions.OES_EGL_image_external)) {
+   switch (target) {
+   case GL_TEXTURE_2D:
+      valid_target = ctx->Extensions.OES_EGL_image;
+      break;
+   case GL_TEXTURE_EXTERNAL_OES:
+      valid_target = ctx->Extensions.OES_EGL_image_external;
+      break;
+   default:
+      valid_target = false;
+      break;
+   }
+
+   if (!valid_target) {
       _mesa_error(ctx, GL_INVALID_ENUM,
 		  "glEGLImageTargetTexture2D(target=%d)", target);
       return;
@@ -3084,190 +3524,6 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
 
 
 /**
- * Return expected size of a compressed texture.
- */
-static GLuint
-compressed_tex_size(GLsizei width, GLsizei height, GLsizei depth,
-                    GLenum glformat)
-{
-   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
-   return _mesa_format_image_size(mesaFormat, width, height, depth);
-}
-
-
-/*
- * Return compressed texture block size, in pixels.
- */
-static void
-get_compressed_block_size(GLenum glformat, GLuint *bw, GLuint *bh)
-{
-   gl_format mesaFormat = _mesa_glenum_to_compressed_format(glformat);
-   _mesa_get_format_block_size(mesaFormat, bw, bh);
-}
-
-
-/**
- * Error checking for glCompressedTexImage[123]D().
- * \param reason  returns reason for error, if any
- * \return error code or GL_NO_ERROR.
- */
-static GLenum
-compressed_texture_error_check(struct gl_context *ctx, GLint dimensions,
-                               GLenum target, GLint level,
-                               GLenum internalFormat, GLsizei width,
-                               GLsizei height, GLsizei depth, GLint border,
-                               GLsizei imageSize, char **reason)
-{
-   const GLenum proxyTarget = get_proxy_target(target);
-   const GLint maxLevels = _mesa_max_texture_levels(ctx, target);
-   GLint expectedSize;
-   GLenum choose_format;
-   GLenum choose_type;
-   GLenum proxy_format;
-
-   *reason = ""; /* no error */
-
-   if (!target_can_be_compressed(ctx, target, internalFormat)) {
-      *reason = "target";
-      return GL_INVALID_ENUM;
-   }
-
-   /* This will detect any invalid internalFormat value */
-   if (!_mesa_is_compressed_format(ctx, internalFormat)) {
-      *reason = "internalFormat";
-      return GL_INVALID_ENUM;
-   }
-
-   switch (internalFormat) {
-#if FEATURE_ES
-   case GL_PALETTE4_RGB8_OES:
-   case GL_PALETTE4_RGBA8_OES:
-   case GL_PALETTE4_R5_G6_B5_OES:
-   case GL_PALETTE4_RGBA4_OES:
-   case GL_PALETTE4_RGB5_A1_OES:
-   case GL_PALETTE8_RGB8_OES:
-   case GL_PALETTE8_RGBA8_OES:
-   case GL_PALETTE8_R5_G6_B5_OES:
-   case GL_PALETTE8_RGBA4_OES:
-   case GL_PALETTE8_RGB5_A1_OES:
-      _mesa_cpal_compressed_format_type(internalFormat, &choose_format,
-					&choose_type);
-      proxy_format = choose_format;
-
-      /* check level */
-      if (level > 0 || level < -maxLevels) {
-	 *reason = "level";
-	 return GL_INVALID_VALUE;
-      }
-
-      if (dimensions != 2) {
-	 *reason = "compressed paletted textures must be 2D";
-	 return GL_INVALID_OPERATION;
-      }
-
-      /* Figure out the expected texture size (in bytes).  This will be
-       * checked against the actual size later.
-       */
-      expectedSize = _mesa_cpal_compressed_size(level, internalFormat,
-						width, height);
-
-      /* This is for the benefit of the TestProxyTexImage below.  It expects
-       * level to be non-negative.  OES_compressed_paletted_texture uses a
-       * weird mechanism where the level specified to glCompressedTexImage2D
-       * is -(n-1) number of levels in the texture, and the data specifies the
-       * complete mipmap stack.  This is done to ensure the palette is the
-       * same for all levels.
-       */
-      level = -level;
-      break;
-#endif
-
-   default:
-      choose_format = GL_NONE;
-      choose_type = GL_NONE;
-      proxy_format = internalFormat;
-
-      /* check level */
-      if (level < 0 || level >= maxLevels) {
-	 *reason = "level";
-	 return GL_INVALID_VALUE;
-      }
-
-      /* Figure out the expected texture size (in bytes).  This will be
-       * checked against the actual size later.
-       */
-      expectedSize = compressed_tex_size(width, height, depth, internalFormat);
-      break;
-   }
-
-   /* This should really never fail */
-   if (_mesa_base_tex_format(ctx, internalFormat) < 0) {
-      *reason = "internalFormat";
-      return GL_INVALID_ENUM;
-   }
-
-   /* No compressed formats support borders at this time */
-   if (border != 0) {
-      *reason = "border != 0";
-      return GL_INVALID_VALUE;
-   }
-
-   /* For cube map, width must equal height */
-   if (_mesa_is_cube_face(target) && width != height) {
-      *reason = "width != height";
-      return GL_INVALID_VALUE;
-   }
-
-   /* check image size against compression block size */
-   {
-      gl_format texFormat =
-         ctx->Driver.ChooseTextureFormat(ctx, proxy_format,
-					 choose_format, choose_type);
-      GLuint bw, bh;
-
-      _mesa_get_format_block_size(texFormat, &bw, &bh);
-      if ((width > bw && width % bw > 0) ||
-          (height > bh && height % bh > 0)) {
-         /*
-          * Per GL_ARB_texture_compression:  GL_INVALID_OPERATION is
-          * generated [...] if any parameter combinations are not
-          * supported by the specific compressed internal format. 
-          */
-         *reason = "invalid width or height for compression format";
-         return GL_INVALID_OPERATION;
-      }
-   }
-
-   /* check image sizes */
-   if (!ctx->Driver.TestProxyTexImage(ctx, proxyTarget, level,
-				      proxy_format, choose_format,
-				      choose_type,
-				      width, height, depth, border)) {
-      /* See error comment above */
-      *reason = "invalid width, height or format";
-      return GL_INVALID_OPERATION;
-   }
-
-   /* check image size in bytes */
-   if (expectedSize != imageSize) {
-      /* Per GL_ARB_texture_compression:  GL_INVALID_VALUE is generated [...]
-       * if <imageSize> is not consistent with the format, dimensions, and
-       * contents of the specified image.
-       */
-      *reason = "imageSize inconsistant with width/height/format";
-      return GL_INVALID_VALUE;
-   }
-
-   if (!mutable_tex_object(ctx, target)) {
-      *reason = "immutable texture";
-      return GL_INVALID_OPERATION;
-   }
-
-   return GL_NO_ERROR;
-}
-
-
-/**
  * Error checking for glCompressedTexSubImage[123]D().
  * \warning  There are some bad assumptions here about the size of compressed
  *           texture tiles (multiple of 4) used to test the validity of the
@@ -3409,141 +3665,6 @@ compressed_subtexture_error_check2(struct gl_context *ctx, GLuint dims,
 }
 
 
-/**
- * Implementation of the glCompressedTexImage1/2/3D() functions.
- */
-static void
-compressedteximage(struct gl_context *ctx, GLuint dims,
-                   GLenum target, GLint level,
-                   GLenum internalFormat, GLsizei width,
-                   GLsizei height, GLsizei depth, GLint border,
-                   GLsizei imageSize, const GLvoid *data)
-{
-   GLenum error;
-   char *reason = "";
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   if (MESA_VERBOSE & (VERBOSE_API|VERBOSE_TEXTURE))
-      _mesa_debug(ctx,
-                  "glCompressedTexImage%uDARB %s %d %s %d %d %d %d %d %p\n",
-                  dims,
-                  _mesa_lookup_enum_by_nr(target), level,
-                  _mesa_lookup_enum_by_nr(internalFormat),
-                  width, height, depth, border, imageSize, data);
-
-   /* check target */
-   if (!legal_teximage_target(ctx, dims, target)) {
-      _mesa_error(ctx, GL_INVALID_ENUM, "glCompressedTexImage%uD(target=%s)",
-                  dims, _mesa_lookup_enum_by_nr(target));
-      return;
-   }
-
-   error = compressed_texture_error_check(ctx, dims, target, level,
-                                          internalFormat, width, height, depth,
-                                          border, imageSize, &reason);
-
-#if FEATURE_ES
-   /* XXX this is kind of a hack */
-   if (!error && dims == 2) {
-      switch (internalFormat) {
-      case GL_PALETTE4_RGB8_OES:
-      case GL_PALETTE4_RGBA8_OES:
-      case GL_PALETTE4_R5_G6_B5_OES:
-      case GL_PALETTE4_RGBA4_OES:
-      case GL_PALETTE4_RGB5_A1_OES:
-      case GL_PALETTE8_RGB8_OES:
-      case GL_PALETTE8_RGBA8_OES:
-      case GL_PALETTE8_R5_G6_B5_OES:
-      case GL_PALETTE8_RGBA4_OES:
-      case GL_PALETTE8_RGB5_A1_OES:
-         _mesa_cpal_compressed_teximage2d(target, level, internalFormat,
-                                          width, height, imageSize, data);
-         return;
-      }
-   }
-#endif
-
-   if (_mesa_is_proxy_texture(target)) {
-      /* Proxy texture: just check for errors and update proxy state */
-      struct gl_texture_image *texImage;
-
-      if (!error) {
-         struct gl_texture_object *texObj =
-            _mesa_get_current_tex_object(ctx, target);
-         gl_format texFormat =
-            _mesa_choose_texture_format(ctx, texObj, target, level,
-                                        internalFormat, GL_NONE, GL_NONE);
-         if (!legal_texture_size(ctx, texFormat, width, height, depth)) {
-            error = GL_OUT_OF_MEMORY;
-         }
-      }
-
-      texImage = _mesa_get_proxy_tex_image(ctx, target, level);
-      if (texImage) {
-         if (error) {
-            /* if error, clear all proxy texture image parameters */
-            clear_teximage_fields(texImage);
-         }
-         else {
-            /* no error: store the teximage parameters */
-            _mesa_init_teximage_fields(ctx, texImage, width, height,
-                                       depth, border, internalFormat,
-                                       MESA_FORMAT_NONE);
-         }
-      }
-   }
-   else {
-      /* non-proxy target */
-      struct gl_texture_object *texObj;
-      struct gl_texture_image *texImage;
-
-      if (error) {
-         _mesa_error(ctx, error, "glCompressedTexImage%uD(%s)", dims, reason);
-         return;
-      }
-
-      texObj = _mesa_get_current_tex_object(ctx, target);
-
-      _mesa_lock_texture(ctx, texObj);
-      {
-	 texImage = _mesa_get_tex_image(ctx, texObj, target, level);
-	 if (!texImage) {
-	    _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                        "glCompressedTexImage%uD", dims);
-	 }
-         else {
-            gl_format texFormat;
-
-            ctx->Driver.FreeTextureImageBuffer(ctx, texImage);
-
-            texFormat = _mesa_choose_texture_format(ctx, texObj, target, level,
-                                                    internalFormat, GL_NONE,
-                                                    GL_NONE);
-
-            if (legal_texture_size(ctx, texFormat, width, height, depth)) {
-               _mesa_init_teximage_fields(ctx, texImage,
-                                          width, height, depth,
-                                          border, internalFormat, texFormat);
-
-               ctx->Driver.CompressedTexImage(ctx, dims, texImage, imageSize,
-                                              data);
-
-               check_gen_mipmap(ctx, target, texObj, level);
-
-               _mesa_dirty_texobj(ctx, texObj, GL_TRUE);
-            }
-            else {
-               _mesa_error(ctx, GL_OUT_OF_MEMORY,
-                           "glCompressedTexImage%uD", dims);
-            }
-         }
-      }
-      _mesa_unlock_texture(ctx, texObj);
-   }
-}
-
-
 void GLAPIENTRY
 _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
                               GLenum internalFormat, GLsizei width,
@@ -3551,8 +3672,8 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
                               const GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
-   compressedteximage(ctx, 1, target, level, internalFormat,
-                      width, 1, 1, border, imageSize, data);
+   teximage(ctx, GL_TRUE, 1, target, level, internalFormat,
+            width, 1, 1, border, GL_NONE, GL_NONE, imageSize, data);
 }
 
 
@@ -3563,8 +3684,8 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
                               const GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
-   compressedteximage(ctx, 2, target, level, internalFormat,
-                      width, height, 1, border, imageSize, data);
+   teximage(ctx, GL_TRUE, 2, target, level, internalFormat,
+            width, height, 1, border, GL_NONE, GL_NONE, imageSize, data);
 }
 
 
@@ -3575,8 +3696,8 @@ _mesa_CompressedTexImage3DARB(GLenum target, GLint level,
                               GLsizei imageSize, const GLvoid *data)
 {
    GET_CURRENT_CONTEXT(ctx);
-   compressedteximage(ctx, 3, target, level, internalFormat,
-                      width, height, depth, border, imageSize, data);
+   teximage(ctx, GL_TRUE, 3, target, level, internalFormat,
+            width, height, depth, border, GL_NONE, GL_NONE, imageSize, data);
 }
 
 
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h
index 66a0c8895..feaaf0cba 100644
--- a/mesalib/src/mesa/main/teximage.h
+++ b/mesalib/src/mesa/main/teximage.h
@@ -120,10 +120,6 @@ _mesa_get_tex_image(struct gl_context *ctx, struct gl_texture_object *texObj,
                     GLenum target, GLint level);
 
 
-extern struct gl_texture_image *
-_mesa_get_proxy_tex_image(struct gl_context *ctx, GLenum target, GLint level);
-
-
 extern GLint
 _mesa_max_texture_levels(struct gl_context *ctx, GLenum target);
 
@@ -140,6 +136,10 @@ _mesa_tex_target_to_face(GLenum target);
 extern GLint
 _mesa_get_texture_dimensions(GLenum target);
 
+extern GLenum
+_mesa_es_error_check_format_and_type(GLenum format, GLenum type,
+                                     unsigned dimensions);
+
 /**
  * Lock a texture for updating.  See also _mesa_lock_context_textures().
  */
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 1d905b608..638e418da 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -577,7 +577,7 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
       GLint i;
       const GLint minLevel = baseLevel;
       const GLint maxLevel = t->_MaxLevel;
-      const GLuint numFaces = t->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+      const GLuint numFaces = _mesa_num_tex_faces(t->Target);
       GLuint width, height, depth, face;
 
       if (minLevel > maxLevel) {
@@ -783,7 +783,8 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
       texObj->Sampler.MinFilter = GL_NEAREST;
       texObj->Sampler.MagFilter = GL_NEAREST;
 
-      texFormat = ctx->Driver.ChooseTextureFormat(ctx, GL_RGBA, GL_RGBA,
+      texFormat = ctx->Driver.ChooseTextureFormat(ctx, target,
+                                                  GL_RGBA, GL_RGBA,
                                                   GL_UNSIGNED_BYTE);
 
       /* need a loop here just for cube maps */
@@ -826,7 +827,7 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
 static GLuint
 texture_size(const struct gl_texture_object *texObj)
 {
-   const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   const GLuint numFaces = _mesa_num_tex_faces(texObj->Target);
    GLuint face, level, size = 0;
 
    for (face = 0; face < numFaces; face++) {
@@ -1118,27 +1119,39 @@ _mesa_DeleteTextures( GLsizei n, const GLuint *textures)
  * \return TEXTURE_x_INDEX or -1 if target is invalid
  */
 static GLint
-target_enum_to_index(GLenum target)
+target_enum_to_index(struct gl_context *ctx, GLenum target)
 {
    switch (target) {
    case GL_TEXTURE_1D:
-      return TEXTURE_1D_INDEX;
+      return _mesa_is_desktop_gl(ctx) ? TEXTURE_1D_INDEX : -1;
    case GL_TEXTURE_2D:
       return TEXTURE_2D_INDEX;
    case GL_TEXTURE_3D:
       return TEXTURE_3D_INDEX;
    case GL_TEXTURE_CUBE_MAP_ARB:
-      return TEXTURE_CUBE_INDEX;
+      return ctx->Extensions.ARB_texture_cube_map
+         ? TEXTURE_CUBE_INDEX : -1;
    case GL_TEXTURE_RECTANGLE_NV:
-      return TEXTURE_RECT_INDEX;
+      return _mesa_is_desktop_gl(ctx) && ctx->Extensions.NV_texture_rectangle
+         ? TEXTURE_RECT_INDEX : -1;
    case GL_TEXTURE_1D_ARRAY_EXT:
-      return TEXTURE_1D_ARRAY_INDEX;
+      return _mesa_is_desktop_gl(ctx)
+         && (ctx->Extensions.EXT_texture_array
+             || ctx->Extensions.MESA_texture_array)
+         ? TEXTURE_1D_ARRAY_INDEX : -1;
    case GL_TEXTURE_2D_ARRAY_EXT:
-      return TEXTURE_2D_ARRAY_INDEX;
+      return (_mesa_is_desktop_gl(ctx)
+              && (ctx->Extensions.EXT_texture_array
+                  || ctx->Extensions.MESA_texture_array))
+         || _mesa_is_gles3(ctx)
+         ? TEXTURE_2D_ARRAY_INDEX : -1;
    case GL_TEXTURE_BUFFER_ARB:
-      return TEXTURE_BUFFER_INDEX;
+      return _mesa_is_desktop_gl(ctx)
+         && ctx->Extensions.ARB_texture_buffer_object
+         ? TEXTURE_BUFFER_INDEX : -1;
    case GL_TEXTURE_EXTERNAL_OES:
-      return TEXTURE_EXTERNAL_INDEX;
+      return _mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external
+         ? TEXTURE_EXTERNAL_INDEX : -1;
    default:
       return -1;
    }
@@ -1173,7 +1186,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       _mesa_debug(ctx, "glBindTexture %s %d\n",
                   _mesa_lookup_enum_by_nr(target), (GLint) texName);
 
-   targetIndex = target_enum_to_index(target);
+   targetIndex = target_enum_to_index(ctx, target);
    if (targetIndex < 0) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glBindTexture(target)");
       return;
diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index 93e0d7738..a6f1d3a14 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -78,6 +78,17 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
 }
 
 
+/**
+ * Return number of faces for a texture target.  This will be 6 for
+ * cube maps (and cube map arrays) and 1 otherwise.
+ */
+static inline GLuint
+_mesa_num_tex_faces(GLenum target)
+{
+   return target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+}
+
+
 /** Is the texture "complete" with respect to the given sampler state? */
 static inline GLboolean
 _mesa_is_texture_complete(const struct gl_texture_object *texObj,
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 41b9f97bf..e6140eb65 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -29,7 +29,7 @@
  * glTexParameter-related functions
  */
 
-
+#include <stdbool.h>
 #include "main/glheader.h"
 #include "main/colormac.h"
 #include "main/context.h"
@@ -56,43 +56,56 @@ static GLboolean
 validate_texture_wrap_mode(struct gl_context * ctx, GLenum target, GLenum wrap)
 {
    const struct gl_extensions * const e = & ctx->Extensions;
+   const bool is_desktop_gl = _mesa_is_desktop_gl(ctx);
+   bool supported;
 
-   if (target == GL_TEXTURE_RECTANGLE_NV) {
-      if (wrap == GL_CLAMP || wrap == GL_CLAMP_TO_EDGE ||
-          (wrap == GL_CLAMP_TO_BORDER && e->ARB_texture_border_clamp))
-         return GL_TRUE;
-   }
-   else if (target == GL_TEXTURE_EXTERNAL_OES) {
-      if (wrap == GL_CLAMP_TO_EDGE)
-         return GL_TRUE;
-   }
-   else {
-      switch (wrap) {
-      case GL_CLAMP:
-      case GL_REPEAT:
-      case GL_CLAMP_TO_EDGE:
-      case GL_MIRRORED_REPEAT:
-         return GL_TRUE;
-      case GL_CLAMP_TO_BORDER:
-         if (e->ARB_texture_border_clamp)
-            return GL_TRUE;
-         break;
-      case GL_MIRROR_CLAMP_EXT:
-      case GL_MIRROR_CLAMP_TO_EDGE_EXT:
-         if (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)
-            return GL_TRUE;
-         break;
-      case GL_MIRROR_CLAMP_TO_BORDER_EXT:
-         if (e->EXT_texture_mirror_clamp)
-            return GL_TRUE;
-         break;
-      default:
-         break;
-      }
+   switch (wrap) {
+   case GL_CLAMP:
+      /* GL_CLAMP was removed in the core profile, and it has never existed in
+       * OpenGL ES.
+       */
+      supported = (ctx->API == API_OPENGL)
+         && (target != GL_TEXTURE_EXTERNAL_OES);
+      break;
+
+   case GL_CLAMP_TO_EDGE:
+      supported = true;
+      break;
+
+   case GL_CLAMP_TO_BORDER:
+      supported = is_desktop_gl && e->ARB_texture_border_clamp
+         && (target != GL_TEXTURE_EXTERNAL_OES);
+      break;
+
+   case GL_REPEAT:
+   case GL_MIRRORED_REPEAT:
+      supported = (target != GL_TEXTURE_RECTANGLE_NV)
+         && (target != GL_TEXTURE_EXTERNAL_OES);
+      break;
+
+   case GL_MIRROR_CLAMP_EXT:
+   case GL_MIRROR_CLAMP_TO_EDGE_EXT:
+      supported = is_desktop_gl 
+         && (e->ATI_texture_mirror_once || e->EXT_texture_mirror_clamp)
+	 && (target != GL_TEXTURE_RECTANGLE_NV)
+         && (target != GL_TEXTURE_EXTERNAL_OES);
+      break;
+
+   case GL_MIRROR_CLAMP_TO_BORDER_EXT:
+      supported = is_desktop_gl && e->EXT_texture_mirror_clamp
+	 && (target != GL_TEXTURE_RECTANGLE_NV)
+         && (target != GL_TEXTURE_EXTERNAL_OES);
+      break;
+
+   default:
+      supported = false;
+      break;
    }
 
-   _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );
-   return GL_FALSE;
+   if (!supported)
+      _mesa_error( ctx, GL_INVALID_ENUM, "glTexParameter(param=0x%x)", wrap );
+
+   return supported;
 }
 
 
@@ -118,35 +131,42 @@ get_texobj(struct gl_context *ctx, GLenum target, GLboolean get)
 
    switch (target) {
    case GL_TEXTURE_1D:
-      return texUnit->CurrentTex[TEXTURE_1D_INDEX];
+      if (_mesa_is_desktop_gl(ctx))
+         return texUnit->CurrentTex[TEXTURE_1D_INDEX];
+      break;
    case GL_TEXTURE_2D:
       return texUnit->CurrentTex[TEXTURE_2D_INDEX];
    case GL_TEXTURE_3D:
-      return texUnit->CurrentTex[TEXTURE_3D_INDEX];
+      if (ctx->API != API_OPENGLES)
+         return texUnit->CurrentTex[TEXTURE_3D_INDEX];
+      break;
    case GL_TEXTURE_CUBE_MAP:
       if (ctx->Extensions.ARB_texture_cube_map) {
          return texUnit->CurrentTex[TEXTURE_CUBE_INDEX];
       }
       break;
    case GL_TEXTURE_RECTANGLE_NV:
-      if (ctx->Extensions.NV_texture_rectangle) {
+      if (_mesa_is_desktop_gl(ctx)
+          && ctx->Extensions.NV_texture_rectangle) {
          return texUnit->CurrentTex[TEXTURE_RECT_INDEX];
       }
       break;
    case GL_TEXTURE_1D_ARRAY_EXT:
-      if (ctx->Extensions.MESA_texture_array ||
-          ctx->Extensions.EXT_texture_array) {
+      if (_mesa_is_desktop_gl(ctx)
+          && (ctx->Extensions.MESA_texture_array ||
+              ctx->Extensions.EXT_texture_array)) {
          return texUnit->CurrentTex[TEXTURE_1D_ARRAY_INDEX];
       }
       break;
    case GL_TEXTURE_2D_ARRAY_EXT:
-      if (ctx->Extensions.MESA_texture_array ||
-          ctx->Extensions.EXT_texture_array) {
+      if ((_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx))
+          && (ctx->Extensions.MESA_texture_array ||
+              ctx->Extensions.EXT_texture_array)) {
          return texUnit->CurrentTex[TEXTURE_2D_ARRAY_INDEX];
       }
       break;
    case GL_TEXTURE_EXTERNAL_OES:
-      if (ctx->Extensions.OES_EGL_image_external) {
+      if (_mesa_is_gles(ctx) && ctx->Extensions.OES_EGL_image_external) {
          return texUnit->CurrentTex[TEXTURE_EXTERNAL_INDEX];
       }
       break;
@@ -305,6 +325,9 @@ set_tex_parameteri(struct gl_context *ctx,
       return GL_FALSE;
 
    case GL_TEXTURE_BASE_LEVEL:
+      if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+         goto invalid_pname;
+
       if (texObj->BaseLevel == params[0])
          return GL_FALSE;
       if (params[0] < 0 ||
@@ -330,6 +353,9 @@ set_tex_parameteri(struct gl_context *ctx,
       return GL_TRUE;
 
    case GL_GENERATE_MIPMAP_SGIS:
+      if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES)
+         goto invalid_pname;
+
       if (params[0] && texObj->Target == GL_TEXTURE_EXTERNAL_OES)
          goto invalid_param;
       if (texObj->GenerateMipmap != params[0]) {
@@ -340,7 +366,8 @@ set_tex_parameteri(struct gl_context *ctx,
       return GL_FALSE;
 
    case GL_TEXTURE_COMPARE_MODE_ARB:
-      if (ctx->Extensions.ARB_shadow) {
+      if ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_shadow)
+          || _mesa_is_gles3(ctx)) {
          if (texObj->Sampler.CompareMode == params[0])
             return GL_FALSE;
          if (params[0] == GL_NONE ||
@@ -354,7 +381,8 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_TEXTURE_COMPARE_FUNC_ARB:
-      if (ctx->Extensions.ARB_shadow) {
+      if ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_shadow)
+          || _mesa_is_gles3(ctx)) {
          if (texObj->Sampler.CompareFunc == params[0])
             return GL_FALSE;
          switch (params[0]) {
@@ -382,7 +410,10 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_DEPTH_TEXTURE_MODE_ARB:
-      if (ctx->Extensions.ARB_depth_texture) {
+      /* GL_DEPTH_TEXTURE_MODE_ARB is removed in core-profile and it has never
+       * existed in OpenGL ES.
+       */
+      if (ctx->API == API_OPENGL && ctx->Extensions.ARB_depth_texture) {
          if (texObj->DepthMode == params[0])
             return GL_FALSE;
          if (params[0] == GL_LUMINANCE ||
@@ -399,6 +430,9 @@ set_tex_parameteri(struct gl_context *ctx,
 
 #if FEATURE_OES_draw_texture
    case GL_TEXTURE_CROP_RECT_OES:
+      if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
+         goto invalid_pname;
+
       texObj->CropRect[0] = params[0];
       texObj->CropRect[1] = params[1];
       texObj->CropRect[2] = params[2];
@@ -410,7 +444,8 @@ set_tex_parameteri(struct gl_context *ctx,
    case GL_TEXTURE_SWIZZLE_G_EXT:
    case GL_TEXTURE_SWIZZLE_B_EXT:
    case GL_TEXTURE_SWIZZLE_A_EXT:
-      if (ctx->Extensions.EXT_texture_swizzle) {
+      if ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_swizzle)
+          || _mesa_is_gles3(ctx)) {
          const GLuint comp = pname - GL_TEXTURE_SWIZZLE_R_EXT;
          const GLint swz = comp_to_swizzle(params[0]);
          if (swz < 0) {
@@ -428,7 +463,8 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-      if (ctx->Extensions.EXT_texture_swizzle) {
+      if ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.EXT_texture_swizzle)
+          || _mesa_is_gles3(ctx)) {
          GLuint comp;
          flush(ctx);
          for (comp = 0; comp < 4; comp++) {
@@ -448,7 +484,8 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_TEXTURE_SRGB_DECODE_EXT:
-      if (ctx->Extensions.EXT_texture_sRGB_decode) {
+      if (_mesa_is_desktop_gl(ctx)
+          && ctx->Extensions.EXT_texture_sRGB_decode) {
 	 GLenum decode = params[0];
 	 if (decode == GL_DECODE_EXT || decode == GL_SKIP_DECODE_EXT) {
 	    if (texObj->Sampler.sRGBDecode != decode) {
@@ -461,7 +498,8 @@ set_tex_parameteri(struct gl_context *ctx,
       goto invalid_pname;
 
    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-      if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {
+      if (_mesa_is_desktop_gl(ctx)
+          && ctx->Extensions.AMD_seamless_cubemap_per_texture) {
          GLenum param = params[0];
          if (param != GL_TRUE && param != GL_FALSE) {
             goto invalid_param;
@@ -501,6 +539,9 @@ set_tex_parameterf(struct gl_context *ctx,
 {
    switch (pname) {
    case GL_TEXTURE_MIN_LOD:
+      if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+         goto invalid_pname;
+
       if (texObj->Sampler.MinLod == params[0])
          return GL_FALSE;
       flush(ctx);
@@ -508,6 +549,9 @@ set_tex_parameterf(struct gl_context *ctx,
       return GL_TRUE;
 
    case GL_TEXTURE_MAX_LOD:
+      if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+         goto invalid_pname;
+
       if (texObj->Sampler.MaxLod == params[0])
          return GL_FALSE;
       flush(ctx);
@@ -515,6 +559,9 @@ set_tex_parameterf(struct gl_context *ctx,
       return GL_TRUE;
 
    case GL_TEXTURE_PRIORITY:
+      if (ctx->API != API_OPENGL)
+         goto invalid_pname;
+
       flush(ctx);
       texObj->Priority = CLAMP(params[0], 0.0F, 1.0F);
       return GL_TRUE;
@@ -536,13 +583,18 @@ set_tex_parameterf(struct gl_context *ctx,
       else {
          static GLuint count = 0;
          if (count++ < 10)
-            _mesa_error(ctx, GL_INVALID_ENUM,
-                        "glTexParameter(pname=GL_TEXTURE_MAX_ANISOTROPY_EXT)");
+            goto invalid_pname;
       }
       return GL_FALSE;
 
    case GL_TEXTURE_LOD_BIAS:
-      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias */
+      /* NOTE: this is really part of OpenGL 1.4, not EXT_texture_lod_bias.
+       * It was removed in core-profile, and it has never existed in OpenGL
+       * ES.
+       */
+      if (ctx->API != API_OPENGL)
+         goto invalid_pname;
+
       if (texObj->Sampler.LodBias != params[0]) {
 	 flush(ctx);
 	 texObj->Sampler.LodBias = params[0];
@@ -551,6 +603,9 @@ set_tex_parameterf(struct gl_context *ctx,
       break;
 
    case GL_TEXTURE_BORDER_COLOR:
+      if (!_mesa_is_desktop_gl(ctx))
+         goto invalid_pname;
+
       flush(ctx);
       /* ARB_texture_float disables clamping */
       if (ctx->Extensions.ARB_texture_float) {
@@ -567,9 +622,14 @@ set_tex_parameterf(struct gl_context *ctx,
       return GL_TRUE;
 
    default:
-      _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=0x%x)", pname);
+      goto invalid_pname;
    }
    return GL_FALSE;
+
+invalid_pname:
+   _mesa_error(ctx, GL_INVALID_ENUM, "glTexParameter(pname=%s)",
+               _mesa_lookup_enum_by_nr(pname));
+   return GL_FALSE;
 }
 
 
@@ -1250,6 +1310,9 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          *params = ENUM_TO_FLOAT(obj->Sampler.WrapR);
          break;
       case GL_TEXTURE_BORDER_COLOR:
+         if (!_mesa_is_desktop_gl(ctx))
+            goto invalid_pname;
+
          if (ctx->NewState & (_NEW_BUFFERS | _NEW_FRAG_CLAMP))
             _mesa_update_state_locked(ctx);
          if (ctx->Color._ClampFragmentColor) {
@@ -1266,18 +1329,33 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          }
          break;
       case GL_TEXTURE_RESIDENT:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = 1.0F;
          break;
       case GL_TEXTURE_PRIORITY:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = obj->Priority;
          break;
       case GL_TEXTURE_MIN_LOD:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = obj->Sampler.MinLod;
          break;
       case GL_TEXTURE_MAX_LOD:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = obj->Sampler.MaxLod;
          break;
       case GL_TEXTURE_BASE_LEVEL:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = (GLfloat) obj->BaseLevel;
          break;
       case GL_TEXTURE_MAX_LEVEL:
@@ -1289,28 +1367,42 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          *params = obj->Sampler.MaxAnisotropy;
          break;
       case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES)
+            goto invalid_pname;
+
 	 *params = (GLfloat) obj->GenerateMipmap;
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (!ctx->Extensions.ARB_shadow)
+         if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_shadow)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = (GLfloat) obj->Sampler.CompareMode;
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (!ctx->Extensions.ARB_shadow)
+         if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_shadow)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = (GLfloat) obj->Sampler.CompareFunc;
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (!ctx->Extensions.ARB_depth_texture)
+         /* GL_DEPTH_TEXTURE_MODE_ARB is removed in core-profile and it has
+          * never existed in OpenGL ES.
+          */
+         if (ctx->API != API_OPENGL || !ctx->Extensions.ARB_depth_texture)
             goto invalid_pname;
          *params = (GLfloat) obj->DepthMode;
          break;
       case GL_TEXTURE_LOD_BIAS:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = obj->Sampler.LodBias;
          break;
 #if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
+         if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
+            goto invalid_pname;
+
          params[0] = obj->CropRect[0];
          params[1] = obj->CropRect[1];
          params[2] = obj->CropRect[2];
@@ -1322,13 +1414,17 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
       case GL_TEXTURE_SWIZZLE_G_EXT:
       case GL_TEXTURE_SWIZZLE_B_EXT:
       case GL_TEXTURE_SWIZZLE_A_EXT:
-         if (!ctx->Extensions.EXT_texture_swizzle)
+         if ((!_mesa_is_desktop_gl(ctx)
+              || !ctx->Extensions.EXT_texture_swizzle)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = (GLfloat) obj->Swizzle[pname - GL_TEXTURE_SWIZZLE_R_EXT];
          break;
 
       case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-         if (!ctx->Extensions.EXT_texture_swizzle) {
+         if ((!_mesa_is_desktop_gl(ctx)
+              || !ctx->Extensions.EXT_texture_swizzle)
+             && !_mesa_is_gles3(ctx)) {
             goto invalid_pname;
          }
          else {
@@ -1340,7 +1436,8 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          break;
 
       case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         if (!_mesa_is_desktop_gl(ctx)
+             || !ctx->Extensions.AMD_seamless_cubemap_per_texture)
             goto invalid_pname;
          *params = (GLfloat) obj->Sampler.CubeMapSeamless;
          break;
@@ -1394,6 +1491,9 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          *params = (GLint) obj->Sampler.WrapR;
          break;
       case GL_TEXTURE_BORDER_COLOR:
+         if (!_mesa_is_desktop_gl(ctx))
+            goto invalid_pname;
+
          {
             GLfloat b[4];
             b[0] = CLAMP(obj->Sampler.BorderColor.f[0], 0.0F, 1.0F);
@@ -1407,18 +1507,33 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          }
          break;
       case GL_TEXTURE_RESIDENT:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = 1;
          break;
       case GL_TEXTURE_PRIORITY:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = FLOAT_TO_INT(obj->Priority);
          break;
       case GL_TEXTURE_MIN_LOD:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = (GLint) obj->Sampler.MinLod;
          break;
       case GL_TEXTURE_MAX_LOD:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = (GLint) obj->Sampler.MaxLod;
          break;
       case GL_TEXTURE_BASE_LEVEL:
+         if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
+            goto invalid_pname;
+
          *params = obj->BaseLevel;
          break;
       case GL_TEXTURE_MAX_LEVEL:
@@ -1430,28 +1545,39 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          *params = (GLint) obj->Sampler.MaxAnisotropy;
          break;
       case GL_GENERATE_MIPMAP_SGIS:
+         if (ctx->API != API_OPENGL && ctx->API != API_OPENGLES)
+            goto invalid_pname;
+
 	 *params = (GLint) obj->GenerateMipmap;
          break;
       case GL_TEXTURE_COMPARE_MODE_ARB:
-         if (!ctx->Extensions.ARB_shadow)
+         if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_shadow)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = (GLint) obj->Sampler.CompareMode;
          break;
       case GL_TEXTURE_COMPARE_FUNC_ARB:
-         if (!ctx->Extensions.ARB_shadow)
+         if ((!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_shadow)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = (GLint) obj->Sampler.CompareFunc;
          break;
       case GL_DEPTH_TEXTURE_MODE_ARB:
-         if (!ctx->Extensions.ARB_depth_texture)
+         if (ctx->API != API_OPENGL || !ctx->Extensions.ARB_depth_texture)
             goto invalid_pname;
          *params = (GLint) obj->DepthMode;
          break;
       case GL_TEXTURE_LOD_BIAS:
+         if (ctx->API != API_OPENGL)
+            goto invalid_pname;
+
          *params = (GLint) obj->Sampler.LodBias;
          break;
 #if FEATURE_OES_draw_texture
       case GL_TEXTURE_CROP_RECT_OES:
+         if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
+            goto invalid_pname;
+
          params[0] = obj->CropRect[0];
          params[1] = obj->CropRect[1];
          params[2] = obj->CropRect[2];
@@ -1462,19 +1588,24 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
       case GL_TEXTURE_SWIZZLE_G_EXT:
       case GL_TEXTURE_SWIZZLE_B_EXT:
       case GL_TEXTURE_SWIZZLE_A_EXT:
-         if (!ctx->Extensions.EXT_texture_swizzle)
+         if ((!_mesa_is_desktop_gl(ctx)
+              || !ctx->Extensions.EXT_texture_swizzle)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          *params = obj->Swizzle[pname - GL_TEXTURE_SWIZZLE_R_EXT];
          break;
 
       case GL_TEXTURE_SWIZZLE_RGBA_EXT:
-         if (!ctx->Extensions.EXT_texture_swizzle)
+         if ((!_mesa_is_desktop_gl(ctx)
+              || !ctx->Extensions.EXT_texture_swizzle)
+             && !_mesa_is_gles3(ctx))
             goto invalid_pname;
          COPY_4V(params, obj->Swizzle);
          break;
 
       case GL_TEXTURE_CUBE_MAP_SEAMLESS:
-         if (!ctx->Extensions.AMD_seamless_cubemap_per_texture)
+         if (!_mesa_is_desktop_gl(ctx)
+             || !ctx->Extensions.AMD_seamless_cubemap_per_texture)
             goto invalid_pname;
          *params = (GLint) obj->Sampler.CubeMapSeamless;
          break;
@@ -1486,7 +1617,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          break;
 
       case GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES:
-         if (!ctx->Extensions.OES_EGL_image_external)
+         if (!_mesa_is_gles(ctx) || !ctx->Extensions.OES_EGL_image_external)
             goto invalid_pname;
          *params = obj->RequiredTextureImageUnits;
          break;
diff --git a/mesalib/src/mesa/main/texstorage.c b/mesalib/src/mesa/main/texstorage.c
index 5e1f31a93..f8af8bf01 100644
--- a/mesalib/src/mesa/main/texstorage.c
+++ b/mesalib/src/mesa/main/texstorage.c
@@ -36,6 +36,7 @@
 #include "macros.h"
 #include "mfeatures.h"
 #include "teximage.h"
+#include "texobj.h"
 #include "texstorage.h"
 #include "mtypes.h"
 
@@ -128,7 +129,7 @@ setup_texstorage(struct gl_context *ctx,
                  GLsizei width, GLsizei height, GLsizei depth)
 {
    const GLenum target = texObj->Target;
-   const GLuint numFaces = (target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
+   const GLuint numFaces = _mesa_num_tex_faces(target);
    gl_format texFormat;
    GLint level, levelWidth = width, levelHeight = height, levelDepth = depth;
    GLuint face;
@@ -206,7 +207,7 @@ clear_image_fields(struct gl_context *ctx,
                    struct gl_texture_object *texObj)
 {
    const GLenum target = texObj->Target;
-   const GLuint numFaces = (target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
+   const GLuint numFaces = _mesa_num_tex_faces(target);
    GLint level;
    GLuint face;
 
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 816c2779c..bddb8f95e 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -809,7 +809,8 @@ _mesa_uniform(struct gl_context *ctx, struct gl_shader_program *shProg,
 		   sizeof(shProg->SamplerUnits));
 
 	    _mesa_update_shader_textures_used(shProg, prog);
-	    (void) ctx->Driver.ProgramStringNotify(ctx, prog->Target, prog);
+            if (ctx->Driver.SamplerUniformChange)
+	       ctx->Driver.SamplerUniformChange(ctx, prog->Target, prog);
 	 }
       }
    }
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index 327fabbc1..8c3ddc524 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -133,16 +133,37 @@ update_array(struct gl_context *ctx,
    GLsizei elementSize;
    GLenum format = GL_RGBA;
 
-   if (ctx->API != API_OPENGLES && ctx->API != API_OPENGLES2) {
-      /* fixed point arrays / data is only allowed with OpenGL ES 1.x/2.0 */
+   if (_mesa_is_gles(ctx)) {
+      /* Once Mesa gets support for GL_OES_vertex_half_float this mask will
+       * change.  Adding support for this extension isn't quite as trivial as
+       * we'd like because ES uses a different enum value for GL_HALF_FLOAT.
+       */
+      legalTypesMask &= ~(FIXED_GL_BIT | HALF_BIT | DOUBLE_BIT);
+
+      /* GL_INT and GL_UNSIGNED_INT data is not allowed in OpenGL ES until
+       * 3.0.  The 2_10_10_10 types are added in OpenGL ES 3.0 or
+       * GL_OES_vertex_type_10_10_10_2.
+       */
+      if (ctx->Version < 30) {
+         legalTypesMask &= ~(UNSIGNED_INT_BIT
+                             | INT_BIT
+                             | UNSIGNED_INT_2_10_10_10_REV_BIT
+                             | INT_2_10_10_10_REV_BIT);
+      }
+
+      /* BGRA ordering is not supported in ES contexts.
+       */
+      if (sizeMax == BGRA_OR_4)
+         sizeMax = 4;
+   } else {
       legalTypesMask &= ~FIXED_ES_BIT;
-   }
-   if (!ctx->Extensions.ARB_ES2_compatibility) {
-      legalTypesMask &= ~FIXED_GL_BIT;
-   }
-   if (!ctx->Extensions.ARB_vertex_type_2_10_10_10_rev) {
-      legalTypesMask &= ~(UNSIGNED_INT_2_10_10_10_REV_BIT |
-                          INT_2_10_10_10_REV_BIT);
+
+      if (!ctx->Extensions.ARB_ES2_compatibility)
+         legalTypesMask &= ~FIXED_GL_BIT;
+
+      if (!ctx->Extensions.ARB_vertex_type_2_10_10_10_rev)
+         legalTypesMask &= ~(UNSIGNED_INT_2_10_10_10_REV_BIT |
+                             INT_2_10_10_10_REV_BIT);
    }
 
    typeBit = type_to_bit(ctx, type);
@@ -228,16 +249,15 @@ update_array(struct gl_context *ctx,
 void GLAPIENTRY
 _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   GLbitfield legalTypes = (SHORT_BIT | INT_BIT | FLOAT_BIT |
-                            DOUBLE_BIT | HALF_BIT | FIXED_ES_BIT |
-                            UNSIGNED_INT_2_10_10_10_REV_BIT |
-                            INT_2_10_10_10_REV_BIT);
    GET_CURRENT_CONTEXT(ctx);
+   GLbitfield legalTypes = (ctx->API == API_OPENGLES)
+      ? (BYTE_BIT | SHORT_BIT | FLOAT_BIT | FIXED_ES_BIT)
+      : (SHORT_BIT | INT_BIT | FLOAT_BIT |
+         DOUBLE_BIT | HALF_BIT |
+         UNSIGNED_INT_2_10_10_10_REV_BIT |
+         INT_2_10_10_10_REV_BIT);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->API == API_OPENGLES)
-      legalTypes |= BYTE_BIT;
-
    update_array(ctx, "glVertexPointer", VERT_ATTRIB_POS,
                 legalTypes, 2, 4,
                 size, type, stride, GL_FALSE, GL_FALSE, ptr);
@@ -247,12 +267,13 @@ _mesa_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 void GLAPIENTRY
 _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
 {
-   const GLbitfield legalTypes = (BYTE_BIT | SHORT_BIT | INT_BIT |
-                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
-                                  FIXED_ES_BIT |
-                                  UNSIGNED_INT_2_10_10_10_REV_BIT |
-                                  INT_2_10_10_10_REV_BIT);
    GET_CURRENT_CONTEXT(ctx);
+   const GLbitfield legalTypes = (ctx->API == API_OPENGLES)
+      ? (BYTE_BIT | SHORT_BIT | FLOAT_BIT | FIXED_ES_BIT)
+      : (BYTE_BIT | SHORT_BIT | INT_BIT |
+         HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
+         UNSIGNED_INT_2_10_10_10_REV_BIT |
+         INT_2_10_10_10_REV_BIT);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    update_array(ctx, "glNormalPointer", VERT_ATTRIB_NORMAL,
@@ -264,18 +285,20 @@ _mesa_NormalPointer(GLenum type, GLsizei stride, const GLvoid *ptr )
 void GLAPIENTRY
 _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
-                                  SHORT_BIT | UNSIGNED_SHORT_BIT |
-                                  INT_BIT | UNSIGNED_INT_BIT |
-                                  HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
-                                  FIXED_ES_BIT |
-                                  UNSIGNED_INT_2_10_10_10_REV_BIT |
-                                  INT_2_10_10_10_REV_BIT);
    GET_CURRENT_CONTEXT(ctx);
+   const GLbitfield legalTypes = (ctx->API == API_OPENGLES)
+      ? (UNSIGNED_BYTE_BIT | HALF_BIT | FLOAT_BIT | FIXED_ES_BIT)
+      : (BYTE_BIT | UNSIGNED_BYTE_BIT |
+         SHORT_BIT | UNSIGNED_SHORT_BIT |
+         INT_BIT | UNSIGNED_INT_BIT |
+         HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
+         UNSIGNED_INT_2_10_10_10_REV_BIT |
+         INT_2_10_10_10_REV_BIT);
+   const GLint sizeMin = (ctx->API == API_OPENGLES) ? 4 : 3;
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    update_array(ctx, "glColorPointer", VERT_ATTRIB_COLOR0,
-                legalTypes, 3, BGRA_OR_4,
+                legalTypes, sizeMin, BGRA_OR_4,
                 size, type, stride, GL_TRUE, GL_FALSE, ptr);
 }
 
@@ -330,20 +353,19 @@ void GLAPIENTRY
 _mesa_TexCoordPointer(GLint size, GLenum type, GLsizei stride,
                       const GLvoid *ptr)
 {
-   GLbitfield legalTypes = (SHORT_BIT | INT_BIT |
-                            HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
-                            FIXED_ES_BIT |
-                            UNSIGNED_INT_2_10_10_10_REV_BIT |
-                            INT_2_10_10_10_REV_BIT);
    GET_CURRENT_CONTEXT(ctx);
+   GLbitfield legalTypes = (ctx->API == API_OPENGLES)
+      ? (BYTE_BIT | SHORT_BIT | FLOAT_BIT | FIXED_ES_BIT)
+      : (SHORT_BIT | INT_BIT |
+         HALF_BIT | FLOAT_BIT | DOUBLE_BIT |
+         UNSIGNED_INT_2_10_10_10_REV_BIT |
+         INT_2_10_10_10_REV_BIT);
+   const GLint sizeMin = (ctx->API == API_OPENGLES) ? 2 : 1;
    const GLuint unit = ctx->Array.ActiveTexture;
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
-   if (ctx->API == API_OPENGLES)
-      legalTypes |= BYTE_BIT;
-
    update_array(ctx, "glTexCoordPointer", VERT_ATTRIB_TEX(unit),
-                legalTypes, 1, 4,
+                legalTypes, sizeMin, 4,
                 size, type, stride, GL_FALSE, GL_FALSE,
                 ptr);
 }
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index ee260cbfd..7f7ea2885 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -32,7 +32,6 @@ MAIN_FILES = \
 	$(SRCDIR)main/debug.c \
 	$(SRCDIR)main/depth.c \
 	$(SRCDIR)main/dlist.c \
-	$(SRCDIR)main/dlopen.c \
 	$(SRCDIR)main/drawpix.c \
 	$(SRCDIR)main/drawtex.c \
 	$(SRCDIR)main/enable.c \
@@ -85,6 +84,7 @@ MAIN_FILES = \
 	$(SRCDIR)main/stencil.c \
 	$(SRCDIR)main/syncobj.c \
 	$(SRCDIR)main/texcompress.c \
+	$(SRCDIR)main/texcompress_cpal.c \
 	$(SRCDIR)main/texcompress_rgtc.c \
 	$(SRCDIR)main/texcompress_s3tc.c \
 	$(SRCDIR)main/texcompress_fxt1.c \
@@ -95,7 +95,6 @@ MAIN_FILES = \
 	$(SRCDIR)main/texgetimage.c \
 	$(SRCDIR)main/teximage.c \
 	$(SRCDIR)main/texobj.c \
-	$(SRCDIR)main/texpal.c \
 	$(SRCDIR)main/texparam.c \
 	$(SRCDIR)main/texstate.c \
 	$(SRCDIR)main/texstorage.c \
diff --git a/mesalib/src/mesa/state_tracker/st_cb_texture.c b/mesalib/src/mesa/state_tracker/st_cb_texture.c
index a7c732bd7..3de96adf3 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_texture.c
@@ -1299,7 +1299,7 @@ st_AllocTextureStorage(struct gl_context *ctx,
                        GLsizei levels, GLsizei width,
                        GLsizei height, GLsizei depth)
 {
-   const GLuint numFaces = (texObj->Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1;
+   const GLuint numFaces = _mesa_num_tex_faces(texObj->Target);
    struct st_context *st = st_context(ctx);
    struct st_texture_object *stObj = st_texture_object(texObj);
    GLuint ptWidth, ptHeight, ptDepth, ptLayers, bindings;
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index 2e14da211..aa3534125 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -114,12 +114,15 @@ st_get_msaa(void)
 
 
 static struct st_context *
-st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe )
+st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe,
+		const struct st_config_options *options)
 {
    struct pipe_screen *screen = pipe->screen;
    uint i;
    struct st_context *st = ST_CALLOC_STRUCT( st_context );
    
+   st->options = *options;
+
    ctx->st = st;
 
    st->ctx = ctx;
@@ -207,7 +210,8 @@ static void st_init_driver_flags(struct gl_driver_flags *f)
 
 struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
                                      const struct gl_config *visual,
-                                     struct st_context *share)
+                                     struct st_context *share,
+                                     const struct st_config_options *options)
 {
    struct gl_context *ctx;
    struct gl_context *shareCtx = share ? share->ctx : NULL;
@@ -234,7 +238,7 @@ struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
    if (debug_get_option_mesa_mvp_dp4())
       _mesa_set_mvp_with_dp4( ctx, GL_TRUE );
 
-   return st_create_context_priv(ctx, pipe);
+   return st_create_context_priv(ctx, pipe, options);
 }
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index 47d3af520..c85d09cb5 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -194,6 +194,8 @@ struct st_context
 
    int32_t draw_stamp;
    int32_t read_stamp;
+
+   struct st_config_options options;
 };
 
 
@@ -266,7 +268,8 @@ st_get_msaa(void);
 extern struct st_context *
 st_create_context(gl_api api, struct pipe_context *pipe,
                   const struct gl_config *visual,
-                  struct st_context *share);
+                  struct st_context *share,
+                  const struct st_config_options *options);
 
 extern void
 st_destroy_context(struct st_context *st);
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 2f034cb28..5e482d9f7 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -646,4 +646,6 @@ void st_init_extensions(struct st_context *st)
        ctx->Extensions.ARB_draw_instanced) {
       ctx->Extensions.ARB_transform_feedback_instanced = GL_TRUE;
    }
+   if (st->options.force_glsl_extensions_warn)
+	   ctx->Const.ForceGLSLExtensionsWarn = 1;
 }
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 962b09250..302b58c7b 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -1631,7 +1631,8 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
  * Called via ctx->Driver.ChooseTextureFormat().
  */
 gl_format
-st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
+st_ChooseTextureFormat(struct gl_context *ctx, GLenum target,
+                       GLint internalFormat,
                        GLenum format, GLenum type)
 {
    boolean want_renderable =
@@ -1640,6 +1641,15 @@ st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
       internalFormat == GL_RGB8 || internalFormat == GL_RGBA8 ||
       internalFormat == GL_BGRA;
 
+   if (target == GL_TEXTURE_1D || target == GL_TEXTURE_1D_ARRAY) {
+      /* We don't do compression for these texture targets because of
+       * difficulty with sub-texture updates on non-block boundaries, etc.
+       * So change the internal format request to an uncompressed format.
+       */
+      internalFormat =
+        _mesa_generic_compressed_format_to_uncompressed_format(internalFormat);
+   }
+
    return st_ChooseTextureFormat_renderable(ctx, internalFormat,
 					    format, type, want_renderable);
 }
diff --git a/mesalib/src/mesa/state_tracker/st_format.h b/mesalib/src/mesa/state_tracker/st_format.h
index 7cf92eb41..2eef2c0d4 100644
--- a/mesalib/src/mesa/state_tracker/st_format.h
+++ b/mesalib/src/mesa/state_tracker/st_format.h
@@ -63,7 +63,8 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
 				  GLenum format, GLenum type, GLboolean renderable);
 
 extern gl_format
-st_ChooseTextureFormat(struct gl_context * ctx, GLint internalFormat,
+st_ChooseTextureFormat(struct gl_context * ctx, GLenum target,
+                       GLint internalFormat,
                        GLenum format, GLenum type);
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
index 5142eb2dd..df73d0e1b 100644
--- a/mesalib/src/mesa/state_tracker/st_manager.c
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -468,7 +468,7 @@ st_context_flush(struct st_context_iface *stctxi, unsigned flags,
 
 static boolean
 st_context_teximage(struct st_context_iface *stctxi,
-                    enum st_texture_type target,
+                    enum st_texture_type tex_type,
                     int level, enum pipe_format internal_format,
                     struct pipe_resource *tex, boolean mipmap)
 {
@@ -481,8 +481,9 @@ st_context_teximage(struct st_context_iface *stctxi,
    struct st_texture_image *stImage;
    GLenum internalFormat;
    GLuint width, height, depth;
+   GLenum target;
 
-   switch (target) {
+   switch (tex_type) {
    case ST_TEXTURE_1D:
       target = GL_TEXTURE_1D;
       break;
@@ -497,7 +498,6 @@ st_context_teximage(struct st_context_iface *stctxi,
       break;
    default:
       return FALSE;
-      break;
    }
 
    texObj = _mesa_select_tex_object(ctx, texUnit, target);
@@ -533,7 +533,7 @@ st_context_teximage(struct st_context_iface *stctxi,
       else
          internalFormat = GL_RGB;
 
-      texFormat = st_ChooseTextureFormat(ctx, internalFormat,
+      texFormat = st_ChooseTextureFormat(ctx, target, internalFormat,
                                          GL_BGRA, GL_UNSIGNED_BYTE);
 
       _mesa_init_teximage_fields(ctx, texImage,
@@ -637,7 +637,7 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi,
    }
 
    st_visual_to_context_mode(&attribs->visual, &mode);
-   st = st_create_context(api, pipe, &mode, shared_ctx);
+   st = st_create_context(api, pipe, &mode, shared_ctx, &attribs->options);
    if (!st) {
       *error = ST_CONTEXT_ERROR_NO_MEMORY;
       pipe->destroy(pipe);
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c
index db7c887b6..741dd876c 100644
--- a/mesalib/src/mesa/swrast/s_texfetch.c
+++ b/mesalib/src/mesa/swrast/s_texfetch.c
@@ -426,27 +426,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
    },
    {
       MESA_FORMAT_SRGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgb_dxt1,
-      NULL
+      _mesa_fetch_texel_srgb_dxt1,
+      _mesa_fetch_texel_srgb_dxt1,
+      _mesa_fetch_texel_srgb_dxt1
    },
    {
       MESA_FORMAT_SRGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt1,
-      NULL
+      _mesa_fetch_texel_srgba_dxt1,
+      _mesa_fetch_texel_srgba_dxt1,
+      _mesa_fetch_texel_srgba_dxt1
    },
    {
       MESA_FORMAT_SRGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt3,
-      NULL
+      _mesa_fetch_texel_srgba_dxt3,
+      _mesa_fetch_texel_srgba_dxt3,
+      _mesa_fetch_texel_srgba_dxt3
    },
    {
       MESA_FORMAT_SRGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_srgba_dxt5,
-      NULL
+      _mesa_fetch_texel_srgba_dxt5,
+      _mesa_fetch_texel_srgba_dxt5,
+      _mesa_fetch_texel_srgba_dxt5
    },
 
    {
@@ -463,27 +463,27 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
    },
    {
       MESA_FORMAT_RGB_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgb_dxt1,
-      NULL
+      _mesa_fetch_texel_rgb_dxt1,
+      _mesa_fetch_texel_rgb_dxt1,
+      _mesa_fetch_texel_rgb_dxt1
    },
    {
       MESA_FORMAT_RGBA_DXT1,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt1,
-      NULL
+      _mesa_fetch_texel_rgba_dxt1,
+      _mesa_fetch_texel_rgba_dxt1,
+      _mesa_fetch_texel_rgba_dxt1
    },
    {
       MESA_FORMAT_RGBA_DXT3,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt3,
-      NULL
+      _mesa_fetch_texel_rgba_dxt3,
+      _mesa_fetch_texel_rgba_dxt3,
+      _mesa_fetch_texel_rgba_dxt3
    },
    {
       MESA_FORMAT_RGBA_DXT5,
-      NULL,
-      _mesa_fetch_texel_2d_f_rgba_dxt5,
-      NULL
+      _mesa_fetch_texel_rgba_dxt5,
+      _mesa_fetch_texel_rgba_dxt5,
+      _mesa_fetch_texel_rgba_dxt5
    },
    {
       MESA_FORMAT_RGBA_FLOAT32,
@@ -976,51 +976,51 @@ texfetch_funcs[MESA_FORMAT_COUNT] =
    },
    {
       MESA_FORMAT_RED_RGTC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_red_rgtc1,
-      NULL
+      _mesa_fetch_texel_red_rgtc1,
+      _mesa_fetch_texel_red_rgtc1,
+      _mesa_fetch_texel_red_rgtc1
    },
    {
       MESA_FORMAT_SIGNED_RED_RGTC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_red_rgtc1,
-      NULL
+      _mesa_fetch_texel_signed_red_rgtc1,
+      _mesa_fetch_texel_signed_red_rgtc1,
+      _mesa_fetch_texel_signed_red_rgtc1
    },
    {
       MESA_FORMAT_RG_RGTC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_rg_rgtc2,
-      NULL
+      _mesa_fetch_texel_rg_rgtc2,
+      _mesa_fetch_texel_rg_rgtc2,
+      _mesa_fetch_texel_rg_rgtc2
    },
    {
       MESA_FORMAT_SIGNED_RG_RGTC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_rg_rgtc2,
-      NULL
+      _mesa_fetch_texel_signed_rg_rgtc2,
+      _mesa_fetch_texel_signed_rg_rgtc2,
+      _mesa_fetch_texel_signed_rg_rgtc2
    },
    {
       MESA_FORMAT_L_LATC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_l_latc1,
-      NULL
+      _mesa_fetch_texel_l_latc1,
+      _mesa_fetch_texel_l_latc1,
+      _mesa_fetch_texel_l_latc1
    },
    {
       MESA_FORMAT_SIGNED_L_LATC1,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_l_latc1,
-      NULL
+      _mesa_fetch_texel_signed_l_latc1,
+      _mesa_fetch_texel_signed_l_latc1,
+      _mesa_fetch_texel_signed_l_latc1
    },
    {
       MESA_FORMAT_LA_LATC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_la_latc2,
-      NULL
+      _mesa_fetch_texel_la_latc2,
+      _mesa_fetch_texel_la_latc2,
+      _mesa_fetch_texel_la_latc2
    },
    {
       MESA_FORMAT_SIGNED_LA_LATC2,
-      NULL,
-      _mesa_fetch_texel_2d_f_signed_la_latc2,
-      NULL
+      _mesa_fetch_texel_signed_la_latc2,
+      _mesa_fetch_texel_signed_la_latc2,
+      _mesa_fetch_texel_signed_la_latc2
    },
    {
       MESA_FORMAT_ETC1_RGB8,
diff --git a/mesalib/src/mesa/swrast/s_texfilter.c b/mesalib/src/mesa/swrast/s_texfilter.c
index 3c2aae913..d116a059d 100644
--- a/mesalib/src/mesa/swrast/s_texfilter.c
+++ b/mesalib/src/mesa/swrast/s_texfilter.c
@@ -800,6 +800,42 @@ get_border_color(const struct gl_sampler_object *samp,
 }
 
 
+/**
+ * Put z into texel according to GL_DEPTH_MODE.
+ */
+static INLINE void
+apply_depth_mode(GLenum depthMode, GLfloat z, GLfloat texel[4])
+{
+   switch (depthMode) {
+   case GL_LUMINANCE:
+      ASSIGN_4V(texel, z, z, z, 1.0F);
+      break;
+   case GL_INTENSITY:
+      ASSIGN_4V(texel, z, z, z, z);
+      break;
+   case GL_ALPHA:
+      ASSIGN_4V(texel, 0.0F, 0.0F, 0.0F, z);
+      break;
+   case GL_RED:
+      ASSIGN_4V(texel, z, 0.0F, 0.0F, 1.0F);
+      break;
+   default:
+      _mesa_problem(NULL, "Bad depth texture mode");
+   }
+}
+
+
+/**
+ * Is the given texture a depth (or depth/stencil) texture?
+ */
+static GLboolean
+is_depth_texture(const struct gl_texture_object *tObj)
+{
+   GLenum format = tObj->Image[0][tObj->BaseLevel]->_BaseFormat;
+   return format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT;
+}
+
+
 /**********************************************************************/
 /*                    1-D Texture Sampling Functions                  */
 /**********************************************************************/
@@ -2391,6 +2427,11 @@ sample_nearest_cube(struct gl_context *ctx,
       sample_2d_nearest(ctx, samp, images[tObj->BaseLevel],
                         newCoord, rgba[i]);
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -2410,6 +2451,11 @@ sample_linear_cube(struct gl_context *ctx,
       sample_2d_linear(ctx, samp, images[tObj->BaseLevel],
                        newCoord, rgba[i]);
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -2440,6 +2486,11 @@ sample_cube_nearest_mipmap_nearest(struct gl_context *ctx,
 
       sample_2d_nearest(ctx, samp, images[level], newCoord, rgba[i]);
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -2460,6 +2511,11 @@ sample_cube_linear_mipmap_nearest(struct gl_context *ctx,
       images = choose_cube_face(tObj, texcoord[i], newCoord);
       sample_2d_linear(ctx, samp, images[level], newCoord, rgba[i]);
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -2490,6 +2546,11 @@ sample_cube_nearest_mipmap_linear(struct gl_context *ctx,
          lerp_rgba(rgba[i], f, t0, t1);
       }
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -2520,6 +2581,11 @@ sample_cube_linear_mipmap_linear(struct gl_context *ctx,
          lerp_rgba(rgba[i], f, t0, t1);
       }
    }
+   if (is_depth_texture(tObj)) {
+      for (i = 0; i < n; i++) {
+         apply_depth_mode(tObj->DepthMode, rgba[i][0], rgba[i]);
+      }
+   }
 }
 
 
@@ -3520,23 +3586,7 @@ sample_depth_texture( struct gl_context *ctx,
 
          result = shadow_compare(function, depthRef, depthSample);
 
-         switch (tObj->DepthMode) {
-         case GL_LUMINANCE:
-            ASSIGN_4V(texel[i], result, result, result, 1.0F);
-            break;
-         case GL_INTENSITY:
-            ASSIGN_4V(texel[i], result, result, result, result);
-            break;
-         case GL_ALPHA:
-            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);
-            break;
-         case GL_RED:
-            ASSIGN_4V(texel[i], result, 0.0F, 0.0F, 1.0F);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad depth texture mode");
-            break;
-         }
+         apply_depth_mode(tObj->DepthMode, result, texel[i]);
       }
    }
    else {
@@ -3615,20 +3665,7 @@ sample_depth_texture( struct gl_context *ctx,
                                   depth00, depth01, depth10, depth11,
                                   wi, wj);
 
-         switch (tObj->DepthMode) {
-         case GL_LUMINANCE:
-            ASSIGN_4V(texel[i], result, result, result, 1.0F);
-            break;
-         case GL_INTENSITY:
-            ASSIGN_4V(texel[i], result, result, result, result);
-            break;
-         case GL_ALPHA:
-            ASSIGN_4V(texel[i], 0.0F, 0.0F, 0.0F, result);
-            break;
-         default:
-            _mesa_problem(ctx, "Bad depth texture mode");
-         }
-
+         apply_depth_mode(tObj->DepthMode, result, texel[i]);
       }  /* for */
    }  /* if filter */
 }
@@ -3676,11 +3713,10 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
    else {
       const GLboolean needLambda =
          (GLboolean) (sampler->MinFilter != sampler->MagFilter);
-      const GLenum format = t->Image[0][t->BaseLevel]->_BaseFormat;
 
       switch (t->Target) {
       case GL_TEXTURE_1D:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
+         if (is_depth_texture(t)) {
             return &sample_depth_texture;
          }
          else if (needLambda) {
@@ -3694,7 +3730,7 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
             return &sample_nearest_1d;
          }
       case GL_TEXTURE_2D:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
+         if (is_depth_texture(t)) {
             return &sample_depth_texture;
          }
          else if (needLambda) {
@@ -3741,10 +3777,7 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
             return &sample_nearest_3d;
          }
       case GL_TEXTURE_CUBE_MAP:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
-	    return &sample_depth_texture;
-	 }
-	 else if (needLambda) {
+         if (needLambda) {
             return &sample_lambda_cube;
          }
          else if (sampler->MinFilter == GL_LINEAR) {
@@ -3755,7 +3788,7 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
             return &sample_nearest_cube;
          }
       case GL_TEXTURE_RECTANGLE_NV:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
+         if (is_depth_texture(t)) {
             return &sample_depth_texture;
          }
          else if (needLambda) {
@@ -3769,7 +3802,7 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
             return &sample_nearest_rect;
          }
       case GL_TEXTURE_1D_ARRAY_EXT:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
+         if (is_depth_texture(t)) {
             return &sample_depth_texture;
          }
 	 else if (needLambda) {
@@ -3783,7 +3816,7 @@ _swrast_choose_texture_sample_func( struct gl_context *ctx,
             return &sample_nearest_1d_array;
          }
       case GL_TEXTURE_2D_ARRAY_EXT:
-         if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) {
+         if (is_depth_texture(t)) {
             return &sample_depth_texture;
          }
 	 else if (needLambda) {
diff --git a/mesalib/src/mesa/swrast/s_texture.c b/mesalib/src/mesa/swrast/s_texture.c
index 8df4b8439..1b73d46e4 100644
--- a/mesalib/src/mesa/swrast/s_texture.c
+++ b/mesalib/src/mesa/swrast/s_texture.c
@@ -29,6 +29,7 @@
 #include "main/context.h"
 #include "main/fbobject.h"
 #include "main/teximage.h"
+#include "main/texobj.h"
 #include "swrast/swrast.h"
 #include "swrast/s_context.h"
 
@@ -246,7 +247,7 @@ _swrast_unmap_teximage(struct gl_context *ctx,
 void
 _swrast_map_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
-   const GLuint faces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   const GLuint faces = _mesa_num_tex_faces(texObj->Target);
    GLuint face, level;
 
    for (face = 0; face < faces; face++) {
@@ -267,7 +268,7 @@ _swrast_map_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 void
 _swrast_unmap_texture(struct gl_context *ctx, struct gl_texture_object *texObj)
 {
-   const GLuint faces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1;
+   const GLuint faces = _mesa_num_tex_faces(texObj->Target);
    GLuint face, level;
 
    for (face = 0; face < faces; face++) {
diff --git a/pixman/TODO b/pixman/TODO
deleted file mode 100644
index 465abe7b5..000000000
--- a/pixman/TODO
+++ /dev/null
@@ -1,271 +0,0 @@
-  - Testing

-    - Test implementations against each other

-    - Test both with and without the operator strength reduction.

-      They shold be identical.

-

-  - SSE 2 issues:

-

-      - Use MM_HINT_NTA instead of MM_HINT_T0

-

-      - Use of fbCompositeOver_x888x8x8888sse2()

-

-  - Update the RLEASING file

-

-  - Things to keep in mind if breaking ABI:

-

-      - There should be a guard #ifndef I_AM_EITHER_CAIRO_OR_THE_X_SERVER

-

-      - X server will require 16.16 essentially forever. Can we get

-        the required precision by simply adding offset_x/y to the

-        relevant rendering API?

-

-      - Get rid of workaround for X server bug.

-

-      - pixman_image_set_indexed() should copy its argument, and X

-        should be ported over to use a pixman_image as the

-        representation of a Picture, rather than creating one on each

-        operation.

-

-      - We should get rid of pixman_set_static_pointers()

-

-      - We should get rid of the various trapezoid helper functions().

-        (They only exist because they are theoretically available to

-        drivers).

-

-      - 16 bit regions should be deleted

-

-      - There should only be one trap rasterization API.

-

-      - The PIXMAN_g8/c8/etc formats should use the A channel

-        to indicate the actual depth. That way PIXMAN_x4c4 and PIXMAN_c8

-	won't collide.

-

-  - Maybe bite the bullet and make configure.ac generate a pixman-types.h

-    file that can be included from pixman.h to avoid the #ifdef magic

-    in pixman.h

-

-  - Make pixman_region_point_in() survive a NULL box, then fix up

-    pixman-compose.c

-

-      - Possibly look into inlining the fetch functions

-

-  - There is a bug with source clipping demonstrated by clip-test in the

-    test directory. If we interprete source clipping as given in

-    destination coordinates, which is probably the only sane choice,

-    then the result should have two red bars down the sides.

-    

-  - Test suite

-

-  - Add a general way of dealing with architecture specific

-    fast-paths.  The current idea is to have each operation that can

-    be optimized is called through a function pointer that is

-    initially set to an initialization function that is responsible for

-    setting the function pointer to the appropriate fast-path.

-

-  - Go through things marked FIXME

-

-  - Add calls to prepare and finish access where necessary.  grep for

-    ACCESS_MEM, and make sure they are correctly wrapped in prepare

-    and finish.

-

-  - restore READ/WRITE in the fbcompose combiners since they sometimes

-    store directly to destination drawables.

-

-  - It probably makes sense to move the more strange X region API

-    into pixman as well, but guarded with PIXMAN_XORG_COMPATIBILITY

-

-  - Reinstate the FbBits typedef? At the moment we don't

-    even have the FbBits type; we just use uint32_t everywhere.

-

-    Keith says in bug 2335:

-

-        The 64-bit code in fb (pixman) is probably broken; it hasn't been

-        used in quite some time as PCI (and AGP) is 32-bits wide, so

-        doing things 64-bits at a time is a net loss.  To quickly fix

-        this, I suggest just using 32-bit datatypes by setting

-        IC_SHIFT to 5 for all machines.

-

-  - Consider optimizing the 8/16 bit solid fills in pixman-util.c by

-    storing more than one value at a time.

-

-  - Add an image cache to prevent excessive malloc/free. Note that pixman

-    needs to be thread safe when used from cairo.

-

-  - Moving to 24.8 coordinates. This is tricky because X is still

-    defined as 16.16 and will be basically forever. It's possible we

-    could do this by adding extra offset_x/y parameters to the

-    trapezoid calls. The X server could then just call the API with

-    (0, 0). Cairo would have to make sure that the delta *within* a

-    batch of trapezoids does not exceed 16 bit.

-

-  - Consider adding actual backends. Brain dump:

-

-    A backend is something that knows how to

-

-      - Create images

-      - Composite three images

-      - Rasterize trapezoids

-      - Do solid fills and blits

-

-    These operations are provided by a vtable that the backend will

-    create when it is initialized. Initial backends:

-

-      - VMX

-      - SSE2

-      - MMX

-      - Plain Old C

-

-    When the SIMD backends are initialized, they will be passed a

-    pointer to the Plain Old C backend that they can use for fallback

-    purposes.

-

-    Images would gain a vtable as well that would contain things like

-

-      - Read scanline

-      - Write scanline

-

-    (Or even read_patch/write_patch as suggested by Keith a while

-    back).

-

-    This could simplify the compositing code considerably.

-

-  - Review the pixman_format_code_t enum to make sure it will support

-    future formats. Some formats we will probably need:

-

-    	   ARGB/ABGR with 16/32/64 bit integer/floating channels

-	   YUV2,

-	   YV12

-

-    Also we may need the ability to distinguish between PICT_c8 and

-    PICT_x4c4. (This could be done by interpreting the A channel as

-    the depth for TYPE_COLOR and TYPE_GRAY formats).

-

-    A possibility may be to reserve the two top bits and make them

-    encode "number of places to shift the channel widths given" Since

-    these bits are 00 at the moment everything will continue to work,

-    but these additional widths will be allowed:

-

-    	     All even widths between 18-32

-	     All multiples of four widths between 33 and 64

-	     All multiples of eight between 64 and 128

-

-    This means things like r21g22b21 won't work - is that worth

-    worrying about? I don't think so. And of course the bpp field

-    can't handle a depth of over 256, so > 64 bit channels arent'

-    really all that useful.

-

-    We could reserve one extra bit to indicate floating point, but

-    we may also just add 

-

-       	   PIXMAN_TYPE_ARGB_FLOAT

-	   PIXMAN_TYPE_BGRA_FLOAT

-	   PIXMAN_TYPE_A_FLOAT

-    

-    image types. With five bits we can support up to 32 different

-    format types, which should be enough for everybody, even if we

-    decide to support all the various video formats here:

-

-    	        http://www.fourcc.org/yuv.php

-

-    It may make sense to have a PIXMAN_TYPE_YUV, and then use the

-    channel bits to specify the exact subtype.

-

-    Another possibility is to add 

-

-      	  PIXMAN_TYPE_ARGB_W

-	  PIXMAN_TYPE_ARGB_WW

-    

-    where the channel widths would get 16 and 32 added to them,

-    respectively.

-

-    What about color spaces such a linear vs. srGB etc.?

-

-

-done:

-

-- Use pixmanFillsse2 and pixmanBltsse2

-

-- Be consistent about calling sse2 sse2

-

-- Rename "SSE" to "MMX_EXTENSIONS". (Deleted mmx extensions).

-

-- Commented-out uses of fbCompositeCopyAreasse2()

-

-- Consider whether calling regions region16 is really such a great

-  idea. Vlad wants 32 bit regions for Cairo. This will break X server

-  ABI, but should otherwise be mostly harmless, though a

-  pixman_region_get_boxes16() may be useful.

-

-- Altivec signal issue (Company has fix, there is also a patch by

-  dwmw2 in rawhide).

-

-- Behdad's MMX issue - see list

-

-- SSE2 issues:

-    - Crashes in Mozilla because of unaligned stack. Possible fixes

-        - Make use of gcc 4.2 feature to align the stack

-        - Write some sort of trampoline that aligns the stack

-          before calling SSE functions.

-

-- Get rid of the switch-of-doom; replace it with a big table

-  describing the various fast paths.

-

-- Make source clipping optional.

-    - done: source clipping happens through an indirection.

-        still needs to make the indirection settable. (And call it

-        from X)

-

-- Run cairo test suite; fix bugs

-	- one bug in source-scale-clip

-

- - Remove the warning suppression in the ACCESS_MEM macro and fix the

-    warnings that are real

-	- irrelevant now.

-

-- make the wrapper functions global instead of image specific

-	- this won't work since pixman is linked to both fb and wfb

-

-- Add non-mmx solid fill

-

-- Make sure the endian-ness macros are defined correctly.

-

-- The rectangles in a region probably shouldn't be returned const as

-  the X server will be changing them.

-

-- Right now we _always_ have a clip region, which is empty by default.

-  Why does this work at all? It probably doesn't. The server

-  distinguishes two cases, one where nothing is clipped (CT_NONE), and

-  one where there is a clip region (CT_REGION).

-

-- Default clip region should be the full image

-

-  - Test if pseudo color still works. It does, but it also shows that

-    copying a pixman_indexed_t on every composite operation is not

-    going to fly. So, for now set_indexed() does not copy the 

-    indexed table. 

-

-    Also just the malloc() to allocate a pixman image shows up pretty

-    high.

-

-    Options include

-

-      - Make all the setters not copy their arguments

-

-      - Possibly combined with going back to the stack allocated 

-        approach that we already use for regions.

-

-      - Keep a cached pixman_image_t around for every picture. It would

-        have to be kept uptodate every time something changes about the

-        picture.

-

-      - Break the X server ABI and simply have the relevant parameter

-        stored in the pixman image. This would have the additional benefits

-        that:

-

-          - We can get rid of the annoying repeat field which is duplicated

-            elsewhere.

-

-          - We can use pixman_color_t and pixman_gradient_stop_t

-            etc. instead of the types that are defined in

-            renderproto.h

-

diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index d2c43fb9c..fc5a0a27c 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -6,14 +6,6 @@
 // Eliminate deadkeys alternative sent by Linus Torvalds
 //
 
-//
-// Missing from X11/keysymdef.h as of 2010-05-13
-//
-// U2030 # PER MILLE SIGN
-// U0292 # LATIN SMALL LETTER EZH
-// U01B7 # LATIN CAPITAL LETTER EZH
-//
-
 partial alphanumeric_keys default
 xkb_symbols "kotoistus" {
 
@@ -21,7 +13,7 @@ xkb_symbols "kotoistus" {
     //
     // This keymap implements all the functionality of Annex 1
     // of the standard and additionally defines the following to
-    // allow entering these characters with keyboars without LSGT.
+    // allow entering these characters with keyboards without LSGT.
     //
     // AE08+4, U+003C : LESS-THAN SIGN     (less)
     // AE09+4, U+003E : GREATER-THAN SIGN  (greater)
@@ -36,7 +28,7 @@ xkb_symbols "kotoistus" {
     key <AE02> { [  2,               quotedbl,         at,                    rightdoublequotemark  ] };
     key <AE03> { [  3,               numbersign,       sterling,              guillemotright        ] };
     key <AE04> { [  4,               currency,         dollar,                guillemotleft         ] };
-    key <AE05> { [  5,               percent,          U2030,                 leftdoublequotemark   ] };
+    key <AE05> { [  5,               percent,          permille,              leftdoublequotemark   ] };
     key <AE06> { [  6,               ampersand,        singlelowquotemark,    doublelowquotemark    ] };
     key <AE07> { [  7,               slash,            braceleft,             NoSymbol              ] };
     key <AE08> { [  8,               parenleft,        bracketleft,           less                  ] };
@@ -72,7 +64,7 @@ xkb_symbols "kotoistus" {
     key <BKSL> { [  apostrophe,      asterisk,         dead_caron,            dead_breve            ] };
 
     key <LSGT> { [  less,            greater,          bar,                   NoSymbol              ] };
-    key <AB01> { [  z,               Z,                U0292,                 U01B7                 ] };
+    key <AB01> { [  z,               Z,                ezh,                   EZH                   ] };
     key <AB02> { [  x,               X,                multiply,              periodcentered        ] };
     key <AB03> { [  c,               C,                c,                     C                     ] };
     key <AB04> { [  v,               V,                v,                     V                     ] };