merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE

3 files changed, 85 insertions, 32 deletions

diff --git a/Xinerama.h b/Xinerama.h
index 3c6af52..29e0b3d 100644
--- a/Xinerama.h
+++ b/Xinerama.h
@@ -1,8 +1,39 @@
+/* $XdotOrg: xc/include/extensions/Xinerama.h,v 1.1.4.2.4.1 2004/03/04 17:46:24 eich Exp $ */
 /* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
+/*
 
-#ifndef _Xinerama_h
-#define _Xinerama_h
+Copyright 2003  The Open Group
 
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
+
+ 
+#ifndef _XINERAMA_H
+#define _XINERAMA_H
+ 
+#include <X11/Xfuncproto.h>
+
+#ifndef XNOXINERAMABC
 typedef struct {
    int   screen_number;
    short x_org;
@@ -10,39 +41,61 @@ typedef struct {
    short width;
    short height;
 } XineramaScreenInfo;
-
+#endif
+ 
 _XFUNCPROTOBEGIN
-
+ 
 Bool XineramaQueryExtension (
-   Display *dpy,
-   int     *event_base,
-   int     *error_base
+    Display *dpy,
+    int *event_basep,
+    int *error_basep
 );
-
+ 
 Status XineramaQueryVersion(
-   Display *dpy,
-   int     *major,
-   int     *minor
+    Display *dpy,
+    int *major_version,
+    int *minor_version
 );
-
-Bool XineramaIsActive(Display *dpy);
-
-
-/* 
-   Returns the number of heads and a pointer to an array of
-   structures describing the position and size of the individual
-   heads.  Returns NULL and number = 0 if Xinerama is not active.
-  
-   Returned array should be freed with XFree().
-*/
-
-XineramaScreenInfo * 
-XineramaQueryScreens(
-   Display *dpy,
-   int     *number
+ 
+Bool XineramaActive (
+    Display *dpy,
+    Window window
 );
 
+#ifndef XNOXINERAMABC
+Bool XineramaIsActive (
+    Display *dpy
+);
+#endif
+ 
+Status XineramaGetData(
+    Display *dpy,
+    Window window,
+    XRectangle **framebuffer_rects,
+    int *number_framebuffers
+);
+ 
+#ifndef XNOXINERAMABC
+XineramaScreenInfo *XineramaQueryScreens (
+    Display *dpy,
+    int *number
+);
+#endif
+ 
+Status XineramaGetCenterHint (
+    Display *dpy,
+    Window root,
+    int *x,
+    int *y
+);
+ 
+Status XineramaSetCenterHint (
+    Display *dpy,
+    Window root,
+    int x,
+    int y
+);
+ 
 _XFUNCPROTOEND
-
-#endif /* _Xinerama_h */
-
+ 
+#endif /* _XINERAMA_H */
diff --git a/panoramiXext.h b/panoramiXext.h
index 3342e38..ad2f7e4 100644
--- a/panoramiXext.h
+++ b/panoramiXext.h
@@ -26,7 +26,7 @@ Equipment Corporation.
 /*  
  *	PanoramiX definitions
  */
-/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.7 2003/11/17 22:20:03 dawes Exp $ */
+/* $XFree86: xc/include/extensions/panoramiXext.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
 
diff --git a/panoramiXproto.h b/panoramiXproto.h
index fe3826e..6b27c56 100644
--- a/panoramiXproto.h
+++ b/panoramiXproto.h
@@ -23,7 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
-/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.6 2001/01/17 17:53:22 dawes Exp $ */
+/* $XFree86: xc/include/extensions/panoramiXproto.h,v 3.5 2000/03/01 01:04:21 dawes Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */