merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE

4 files changed, 16 insertions, 15 deletions

diff --git a/include/X11/extensions/Xrandr.h b/include/X11/extensions/Xrandr.h
index 7a0d6c5..e27115c 100644
--- a/include/X11/extensions/Xrandr.h
+++ b/include/X11/extensions/Xrandr.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.11 2002/10/14 18:01:39 keithp Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation, Inc.
  * Copyright © 2002 Hewlett-Packard Company, Inc.
diff --git a/man/Xrandr.man b/man/Xrandr.man
index 0e84e59..93db5ec 100644
--- a/man/Xrandr.man
+++ b/man/Xrandr.man
@@ -1,5 +1,6 @@
 .\"
 .\" $XFree86: xc/lib/Xrandr/Xrandr.man,v 1.7 2003/08/04 10:32:21 eich Exp $
+.\" $XdotOrg: xc/lib/Xrandr/Xrandr.man,v 1.1.4.2.4.1 2004/03/04 17:46:58 eich Exp $
 .\"
 .\" Copyright 2002 Hewlett-Packard Company.\"
 .\" Permission to use, copy, modify, distribute, and sell this software and its
@@ -96,14 +97,14 @@ XRRScreenConfiguration *XRRConfig\^(\^Screen *\fIscreen\fP\^);
 .sp
 void XRRSelectInput\^(\^Display *\fIdpy\fP, Window \fIwindow\fP, int \fImask\fP\^);
 .sp
-/* 
+/\(** 
  * intended to take RRScreenChangeNotify,  or 
  * ConfigureNotify \^(\^\fIon the root window\fP\^)
  * returns 1 if it is an event type it understands, 0 if not
  */
 int XRRUpdateConfiguration\^(\^XEvent *\fIevent\fP^);
 .sp
-/* 
+/\(** 
  * the following are always safe to call, even if RandR is 
  * not implemented on a screen 
  */
@@ -154,8 +155,8 @@ Can be any of:
 #define RR_Rotate_180           4
 #define RR_Rotate_270           8
 
-/* new in 1.0 protocol, to allow reflection of screen */
-/* reflection is applied after rotation */
+/\(** new in 1.0 protocol, to allow reflection of screen */
+/\(** reflection is applied after rotation */
 
 #define RR_Reflect_X            16
 #define RR_Reflect_Y            32
@@ -167,14 +168,14 @@ typedef struct {
 } XRRScreenSize;
 
 typedef struct {
-    int type;				/* event base */
-    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 which selected for this event */
-    Window root;			/* Root window for changed screen */
-    Time timestamp;			/* when the screen change occurred */
-    Time config_timestamp;	/* when the last configuration change */
+    int type;				/\(** event base */
+    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 which selected for this event */
+    Window root;			/\(** Root window for changed screen */
+    Time timestamp;			/\(** when the screen change occurred */
+    Time config_timestamp;	/\(** when the last configuration change */
     SizeID size_index;
     SubpixelOrder subpixel_order;
     Rotation rotation;
diff --git a/src/Xrandr.c b/src/Xrandr.c
index 6b3e2f5..95563d2 100644
--- a/src/Xrandr.c
+++ b/src/Xrandr.c
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.14 2003/05/27 22:26:42 tsi Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandr.c,v 1.13tsi Exp $
  *
  * Copyright © 2000 Compaq Computer Corporation, Inc.
  * Copyright © 2002 Hewlett Packard Company, Inc.
diff --git a/src/Xrandrint.h b/src/Xrandrint.h
index 2ec5d86..87724c9 100644
--- a/src/Xrandrint.h
+++ b/src/Xrandrint.h
@@ -1,5 +1,5 @@
 /*
- * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.4 2002/10/14 18:01:40 keithp Exp $
+ * $XFree86: xc/lib/Xrandr/Xrandrint.h,v 1.2 2001/06/07 15:33:43 keithp Exp $
  *
  *
  * Copyright © 2000, Compaq Computer Corporation,