merge XFree86 4.3.99.901 (RC1) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE

2 files changed, 40 insertions, 38 deletions

diff --git a/man/XShape.man b/man/XShape.man
index 41358a8..c4cc541 100644
--- a/man/XShape.man
+++ b/man/XShape.man
@@ -25,7 +25,8 @@
 .\" dealing in this Software without prior written authorization from the 
 .\" X Consortium.
 .\"
-.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/XShape.man,v 1.4 2003/11/23 05:40:35 dawes Exp $
+.\" $XdotOrg$
 .\"
 .de ZN
 .ie t \fB\^\\$1\^\fR\\$2
@@ -130,16 +131,16 @@ XRectangle *XShapeGetRectangles (
 .LP
 .ta 3i
 typedef struct {
-    int type;	/* of event */
-    unsigned long serial;	/* # of last request processed by server */
-    Bool send_event;	/* true if this came frome a SendEvent request */
-    Display *display;	/* Display the event was read from */
-    Window window;	/* window of event */
-    int kind;	/* ShapeBounding or ShapeClip */
-    int x, y;	/* extents of new region */
+    int type;	/\(** of event */
+    unsigned long serial;	/\(** # of last request processed by server */
+    Bool send_event;	/\(** true if this came frome a SendEvent request */
+    Display *display;	/\(** Display the event was read from */
+    Window window;	/\(** window of event */
+    int kind;	/\(** ShapeBounding or ShapeClip */
+    int x, y;	/\(** extents of new region */
     unsigned width, height;
-    Time time;	/* server timestamp when region changed */
-    Bool shaped;	/* true if the region exists */
+    Time time;	/\(** server timestamp when region changed */
+    Bool shaped;	/\(** true if the region exists */
 } XShapeEvent;
 .fi
 .SH DESCRIPTION
diff --git a/man/Xmbuf.man b/man/Xmbuf.man
index 4a450dd..0dd9aae 100644
--- a/man/Xmbuf.man
+++ b/man/Xmbuf.man
@@ -34,7 +34,8 @@
 .\" without express or implied warranty.
 .\" 
 .\"
-.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.3 2001/02/07 22:35:21 tsi Exp $
+.\" $XFree86: xc/doc/man/Xext/Xmbuf.man,v 1.4 2003/11/23 05:40:35 dawes Exp $
+.\" $XdotOrg$
 .\"
 .de ZN
 .ie t \fB\^\\$1\^\fR\\$2
@@ -117,7 +118,7 @@ Window XmbufCreateStereoWindow(
     unsigned int height,
     unsigned int border_width,
     int depth,
-    unsigned int class,                 /* InputOutput, InputOnly*/
+    unsigned int class,                 /\(** InputOutput, InputOnly*/
     Visual *visual,
     unsigned long valuemask,
     XSetWindowAttributes *attributes,
@@ -129,55 +130,55 @@ Window XmbufCreateStereoWindow(
 .ta 3i
 \fIEvents:\fP
 typedef struct {
-    int type;	/* of event */
-    unsigned long serial;	/* # of last request processed by server */
-    int send_event;	/* true if this came frome 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 frome 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 frome 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 frome a SendEvent request */
+    Display *display;	/\(** Display the event was read from */
+    Multibuffer buffer;	/\(** buffer of event */
 } XmbufUpdateNotifyEvent;
 .LP
 \fIPer-window attributes that can be got:\fP
 typedef struct {
-    int displayed_index;	/* which buffer is being displayed */
-    int update_action;	/* Undefined, Background, Untouched, Copied */
-    int update_hint;	/* Frequent, Intermittent, Static */
-    int window_mode;	/* Mono, Stereo */
-    int nbuffers;	/* Number of buffers */
-    Multibuffer *buffers;	/* Buffers */
+    int displayed_index;	/\(** which buffer is being displayed */
+    int update_action;	/\(** Undefined, Background, Untouched, Copied */
+    int update_hint;	/\(** Frequent, Intermittent, Static */
+    int window_mode;	/\(** Mono, Stereo */
+    int nbuffers;	/\(** Number of buffers */
+    Multibuffer *buffers;	/\(** Buffers */
 } XmbufWindowAttributes;
 .LP
 \fIPer-window attributes that can be set:\fP
 typedef struct {
-    int update_hint;	/* Frequent, Intermittent, Static */
+    int update_hint;	/\(** Frequent, Intermittent, Static */
 } XmbufSetWindowAttributes;
 .LP
 \fIPer-buffer attributes that can be got:\fP
 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 */
+    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
 \fIPer-buffer attributes that can be set:\fP
 typedef struct {
-    unsigned long event_mask;	/* events that have been selected */
+    unsigned long event_mask;	/\(** events that have been selected */
 } XmbufSetBufferAttributes;
 .LP
 \fIPer-screen buffer info (there will be lists of them):\fP
 typedef struct {
-    VisualID visualid;	/* visual usuable at this depth */
-    int max_buffers;	/* most buffers for this visual */
-    int depth;	/* depth of buffers to be created */
+    VisualID visualid;	/\(** visual usuable at this depth */
+    int max_buffers;	/\(** most buffers for this visual */
+    int depth;	/\(** depth of buffers to be created */
 } XmbufBufferInfo;
 .fi
 .SH DESCRIPTION