mesa libXext pixman git update 12 Apr 2011

2 files changed, 233 insertions, 219 deletions

diff --git a/libXext/include/X11/extensions/XShm.h b/libXext/include/X11/extensions/XShm.h
index daeef3e32..23f065115 100644
--- a/libXext/include/X11/extensions/XShm.h
+++ b/libXext/include/X11/extensions/XShm.h
@@ -1,135 +1,135 @@
-/************************************************************

-

-Copyright 1989, 1998  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.

-

-********************************************************/

-

-/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */

-

-#ifndef _XSHM_H_

-#define _XSHM_H_

-

-#include <X11/Xfuncproto.h>

-#include <X11/extensions/shm.h>

-

-#ifndef _XSHM_SERVER_

-typedef unsigned long ShmSeg;

-

-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 */

-    Drawable drawable;	    /* drawable of request */

-    int major_code;	    /* ShmReqCode */

-    int minor_code;	    /* X_ShmPutImage */

-    ShmSeg shmseg;	    /* the ShmSeg used in the request */

-    unsigned long offset;   /* the offset into ShmSeg used in the request */

-} XShmCompletionEvent;

-

-typedef struct {

-    ShmSeg shmseg;	/* resource id */

-    int shmid;		/* kernel id */

-    char *shmaddr;	/* address in client */

-    Bool readOnly;	/* how the server should attach it */

-} XShmSegmentInfo;

-

-_XFUNCPROTOBEGIN

-

-Bool XShmQueryExtension(

-    Display*		/* dpy */

-);

-

-int XShmGetEventBase(

-    Display* 		/* dpy */

-);

-

-Bool XShmQueryVersion(

-    Display*		/* dpy */,

-    int*		/* majorVersion */,

-    int*		/* minorVersion */,

-    Bool*		/* sharedPixmaps */

-);

-

-int XShmPixmapFormat(

-    Display*		/* dpy */

-);

-

-Status XShmAttach(

-    Display*		/* dpy */,

-    XShmSegmentInfo*	/* shminfo */

-);

-

-Status XShmDetach(

-    Display*		/* dpy */,

-    XShmSegmentInfo*	/* shminfo */

-);

-

-Status XShmPutImage(

-    Display*		/* dpy */,

-    Drawable		/* d */,

-    GC			/* gc */,

-    XImage*		/* image */,

-    int			/* src_x */,

-    int			/* src_y */,

-    int			/* dst_x */,

-    int			/* dst_y */,

-    unsigned int	/* src_width */,

-    unsigned int	/* src_height */,

-    Bool		/* send_event */

-);

-

-Status XShmGetImage(

-    Display*		/* dpy */,

-    Drawable		/* d */,

-    XImage*		/* image */,

-    int			/* x */,

-    int			/* y */,

-    unsigned long	/* plane_mask */

-);

-

-XImage *XShmCreateImage(

-    Display*		/* dpy */,

-    Visual*		/* visual */,

-    unsigned int	/* depth */,

-    int			/* format */,

-    char*		/* data */,

-    XShmSegmentInfo*	/* shminfo */,

-    unsigned int	/* width */,

-    unsigned int	/* height */

-);

-

-Pixmap XShmCreatePixmap(

-    Display*		/* dpy */,

-    Drawable		/* d */,

-    char*		/* data */,

-    XShmSegmentInfo*	/* shminfo */,

-    unsigned int	/* width */,

-    unsigned int	/* height */,

-    unsigned int	/* depth */

-);

-

-_XFUNCPROTOEND

-#endif /* _XSHM_SERVER_ */

-

-#endif

+/************************************************************
+
+Copyright 1989, 1998  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.
+
+********************************************************/
+
+/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
+
+#ifndef _XSHM_H_
+#define _XSHM_H_
+
+#include <X11/Xfuncproto.h>
+#include <X11/extensions/shm.h>
+
+#ifndef _XSHM_SERVER_
+typedef unsigned long ShmSeg;
+
+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 */
+    Drawable drawable;	    /* drawable of request */
+    int major_code;	    /* ShmReqCode */
+    int minor_code;	    /* X_ShmPutImage */
+    ShmSeg shmseg;	    /* the ShmSeg used in the request */
+    unsigned long offset;   /* the offset into ShmSeg used in the request */
+} XShmCompletionEvent;
+
+typedef struct {
+    ShmSeg shmseg;	/* resource id */
+    int shmid;		/* kernel id */
+    char *shmaddr;	/* address in client */
+    Bool readOnly;	/* how the server should attach it */
+} XShmSegmentInfo;
+
+_XFUNCPROTOBEGIN
+
+Bool XShmQueryExtension(
+    Display*		/* dpy */
+);
+
+int XShmGetEventBase(
+    Display* 		/* dpy */
+);
+
+Bool XShmQueryVersion(
+    Display*		/* dpy */,
+    int*		/* majorVersion */,
+    int*		/* minorVersion */,
+    Bool*		/* sharedPixmaps */
+);
+
+int XShmPixmapFormat(
+    Display*		/* dpy */
+);
+
+Bool XShmAttach(
+    Display*		/* dpy */,
+    XShmSegmentInfo*	/* shminfo */
+);
+
+Bool XShmDetach(
+    Display*		/* dpy */,
+    XShmSegmentInfo*	/* shminfo */
+);
+
+Bool XShmPutImage(
+    Display*		/* dpy */,
+    Drawable		/* d */,
+    GC			/* gc */,
+    XImage*		/* image */,
+    int			/* src_x */,
+    int			/* src_y */,
+    int			/* dst_x */,
+    int			/* dst_y */,
+    unsigned int	/* src_width */,
+    unsigned int	/* src_height */,
+    Bool		/* send_event */
+);
+
+Bool XShmGetImage(
+    Display*		/* dpy */,
+    Drawable		/* d */,
+    XImage*		/* image */,
+    int			/* x */,
+    int			/* y */,
+    unsigned long	/* plane_mask */
+);
+
+XImage *XShmCreateImage(
+    Display*		/* dpy */,
+    Visual*		/* visual */,
+    unsigned int	/* depth */,
+    int			/* format */,
+    char*		/* data */,
+    XShmSegmentInfo*	/* shminfo */,
+    unsigned int	/* width */,
+    unsigned int	/* height */
+);
+
+Pixmap XShmCreatePixmap(
+    Display*		/* dpy */,
+    Drawable		/* d */,
+    char*		/* data */,
+    XShmSegmentInfo*	/* shminfo */,
+    unsigned int	/* width */,
+    unsigned int	/* height */,
+    unsigned int	/* depth */
+);
+
+_XFUNCPROTOEND
+#endif /* _XSHM_SERVER_ */
+
+#endif
diff --git a/libXext/include/X11/extensions/xtestext1.h b/libXext/include/X11/extensions/xtestext1.h
index d6fae784e..59cdd151d 100644
--- a/libXext/include/X11/extensions/xtestext1.h
+++ b/libXext/include/X11/extensions/xtestext1.h
@@ -1,84 +1,98 @@
-/*

- * xtestext1.h

- *

- * X11 Input Synthesis Extension include file

- */

-

-/*

-

-

-Copyright 1986, 1987, 1988, 1998  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.

-

-

-Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Hewlett-Packard not be used in

-advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-Hewlett-Packard makes no representations about the 

-suitability of this software for any purpose.  It is provided 

-"as is" without express or implied warranty.

-

-This software is not subject to any license of the American

-Telephone and Telegraph Company or of the Regents of the

-University of California.

-

-*/

-

-#ifndef _XTESTEXT1_H

-#define _XTESTEXT1_H

-/*

- * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h

- */

-

-#include <X11/extensions/xtestext1const.h>

-/*

- * This is the definition for the input action host format event structure.

- * This is the form that a client using this extension will see when

- * it receives an input action event.

- */

-typedef struct {

-        int     type;           /* always XTestInputActionType */

-	Display *display;

-	Window  window;

-        CARD8   actions[XTestACTIONS_SIZE];

-} XTestInputActionEvent;

-

-/*

- * This is the definition for the xTestFakeAck host format event structure.

- * This is the form that a client using this extension will see when

- * it receives an XTestFakeAck event.

- */

-typedef struct {

-        int     type;           /* always XTestFakeAckType */

-	Display *display;

-	Window  window;

-} XTestFakeAckEvent;

-

-#endif /* _XTESTEXT1_H */

+/*
+ * xtestext1.h
+ *
+ * X11 Input Synthesis Extension include file
+ */
+
+/*
+
+
+Copyright 1986, 1987, 1988, 1998  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.
+
+
+Copyright 1986, 1987, 1988 by Hewlett-Packard Corporation
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Hewlett-Packard not be used in
+advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+Hewlett-Packard makes no representations about the 
+suitability of this software for any purpose.  It is provided 
+"as is" without express or implied warranty.
+
+This software is not subject to any license of the American
+Telephone and Telegraph Company or of the Regents of the
+University of California.
+
+*/
+
+#ifndef _XTESTEXT1_H
+#define _XTESTEXT1_H
+/*
+ * the typedefs for CARD8, CARD16, and CARD32 are defined in Xmd.h
+ */
+
+#include <X11/extensions/xtestext1const.h>
+/*
+ * This is the definition for the input action host format event structure.
+ * This is the form that a client using this extension will see when
+ * it receives an input action event.
+ */
+typedef struct {
+        int     type;           /* always XTestInputActionType */
+	Display *display;
+	Window  window;
+        CARD8   actions[XTestACTIONS_SIZE];
+} XTestInputActionEvent;
+
+/*
+ * This is the definition for the xTestFakeAck host format event structure.
+ * This is the form that a client using this extension will see when
+ * it receives an XTestFakeAck event.
+ */
+typedef struct {
+        int     type;           /* always XTestFakeAckType */
+	Display *display;
+	Window  window;
+} XTestFakeAckEvent;
+
+_XFUNCPROTOBEGIN
+
+int XTestFakeInput(register Display *dpy, char *action_list_addr, int action_list_size, int ack_flag);
+int XTestGetInput(register Display *dpy, int action_handling);
+int XTestQueryInputSize(register Display *dpy, unsigned long *size_return);
+int XTestPressKey(Display *display, int device_id, unsigned long delay, unsigned int keycode, unsigned int key_action);
+int XTestPressButton(Display * display, int device_id, unsigned long delay, unsigned int button_number, unsigned int button_action);
+int XTestMovePointer(Display *display, int device_id, unsigned long delay[], int x[], int y[], unsigned int count);
+int XTestFlush(Display *display);
+int XTestStopInput(register Display *dpy);
+int XTestReset(register Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif /* _XTESTEXT1_H */