[Xorg-commit] xc/include/extensions Xinerama.h,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/include/extensions
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/include/extensions

Modified Files:
      Tag: XORG-CURRENT
	Xinerama.h 
Log Message:
/home/kaleb/xin.commsg

Index: Xinerama.h
===================================================================
RCS file: /cvs/xorg/xc/include/extensions/Xinerama.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- Xinerama.h	14 Nov 2003 16:48:43 -0000	1.1
+++ Xinerama.h	18 Dec 2003 22:59:34 -0000	1.1.4.1
@@ -1,48 +1,77 @@
-/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
-
-#ifndef _Xinerama_h
-#define _Xinerama_h
-
-typedef struct {
-   int   screen_number;
-   short x_org;
-   short y_org;
-   short width;
-   short height;
-} XineramaScreenInfo;
+/* $XdotOrg$ */
+/*
 
-_XFUNCPROTOBEGIN
+Copyright 2003  The Open Group
 
-Bool XineramaQueryExtension (
-   Display *dpy,
-   int     *event_base,
-   int     *error_base
-);
+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.
 
-Status XineramaQueryVersion(
-   Display *dpy,
-   int     *major,
-   int     *minor
-);
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-Bool XineramaIsActive(Display *dpy);
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 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.
 
-/* 
-   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().
 */
+/* $XFree86: xc/include/extensions/Xinerama.h,v 3.3 2002/09/16 18:05:19 eich Exp $ */
 
-XineramaScreenInfo * 
-XineramaQueryScreens(
-   Display *dpy,
-   int     *number
+ 
+#ifndef _XINERAMA_H
+#define _XINERAMA_H
+ 
+#include <X11/Xfuncproto.h>
+ 
+_XFUNCPROTOBEGIN
+ 
+Bool XineramaQueryExtension (
+    Display *dpy,
+    int *event_basep,
+    int *error_basep
 );
-
+ 
+Status XineramaQueryVersion(
+    Display *dpy,
+    int *major_version,
+    int *minor_version
+);
+ 
+Bool XineramaActive (
+    Display *dpy,
+    Window window
+);
+ 
+Status XineramaGetData(
+    Display *dpy,
+    Window window,
+    XRectangle **framebuffer_rects,
+    int *number_framebuffers
+);
+ 
+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 */