Merging XORG-CURRENT into trunk

1 files changed, 42 insertions, 76 deletions

diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man
index 9faaa355..f1e678ea 100644
--- a/man/XCreateWindow.man
+++ b/man/XCreateWindow.man
@@ -41,6 +41,9 @@
 .\" of this documentation for any purpose.
 .\" It is provided ``as is'' without express or implied warranty.
 .\" 
+.\" $XFree86: xc/doc/man/X11/XCreWin.man,v 1.5 2003/04/28 22:17:54 herrb Exp $
+.\" $XdotOrg: lib/X11/man/XCreateWindow.man,v 1.2 2004-04-23 18:42:09 eich Exp $
+.\"
 .ds xT X Toolkit Intrinsics \- C Language Interface
 .ds xW Athena X Widgets \- C Language X Toolkit Interface
 .ds xL Xlib \- C Language X Interface
@@ -140,51 +143,14 @@
 ..
 .ny0
 '\" t
-.TH XCreateWindow 3X11 "Release 6.6" "X Version 11" "XLIB FUNCTIONS"
+.TH XCreateWindow 3X11 __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
 XCreateWindow, XCreateSimpleWindow, XSetWindowAttributes \- create windows and window attributes structure
 .SH SYNTAX
-Window XCreateWindow\^(\^\fIdisplay\fP, \fIparent\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIborder_width\fP\^, \fIdepth\fP\^, 
-.br
-                       \fIclass\fP\^, \fIvisual\fP\^, \fIvaluemask\fP\^, \fIattributes\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIparent\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^; 
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int \fIborder_width\fP\^;
-.br
-      int \fIdepth\fP\^;
-.br
-      unsigned int \fIclass\fP\^;
-.br
-      Visual *\fIvisual\fP\^
-.br
-      unsigned long \fIvaluemask\fP\^;
-.br
-      XSetWindowAttributes *\fIattributes\fP\^;
-.LP
-Window XCreateSimpleWindow\^(\^\fIdisplay\fP, \fIparent\fP\^, \fIx\fP\^, \fIy\fP\^, \fIwidth\fP\^, \fIheight\fP\^, \fIborder_width\fP\^, 
-.br
-                             \fIborder\fP\^, \fIbackground\fP\^)
-.br
-      Display *\fIdisplay\fP\^;
-.br
-      Window \fIparent\fP\^;
-.br
-      int \fIx\fP\^, \fIy\fP\^;
-.br
-      unsigned int \fIwidth\fP\^, \fIheight\fP\^;
-.br
-      unsigned int \fIborder_width\fP\^;
-.br
-      unsigned long \fIborder\fP\^;
-.br
-      unsigned long \fIbackground\fP\^;
+.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)
@@ -230,14 +196,14 @@ A visual of
 .ZN CopyFromParent 
 means the visual type is taken from the 
 parent.
-.ds Wh , which are the created window's inside dimensions \
+.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 \
+.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
@@ -353,109 +319,109 @@ The
 structure contains:
 .LP
 .LP
-/* Window attribute value mask bits */
+/\(** Window attribute value mask bits */
 .TS
 lw(.5i) lw(2.5i) lw(.8i).
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBackPixmap
 T}	T{
 (1L<<0)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBackPixel
 T}	T{
 (1L<<1)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBorderPixmap
 T}	T{
 (1L<<2)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBorderPixel
 T}	T{
 (1L<<3)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBitGravity
 T}	T{
 (1L<<4)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWWinGravity
 T}	T{
 (1L<<5)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBackingStore
 T}	T{
 (1L<<6)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBackingPlanes
 T}	T{
 (1L<<7)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWBackingPixel
 T}	T{
 (1L<<8)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWOverrideRedirect
 T}	T{
 (1L<<9)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWSaveUnder
 T}	T{
 (1L<<10)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWEventMask
 T}	T{
 (1L<<11)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWDontPropagate
 T}	T{
 (1L<<12)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWColormap
 T}	T{
 (1L<<13)
 T}
 T{
-#define
+\&#define
 T}	T{
 .ZN CWCursor
 T}	T{
@@ -466,24 +432,24 @@ T}
 .Ds 0
 .TA .5i 3i
 .ta .5i 3i
-/* Values */
+/\(** 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) */
+	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