xserver mesa git update 10 Mar 2011

5 files changed, 546 insertions, 609 deletions

diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index 3f99098a2..c201e3ac1 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -576,35 +576,4 @@ extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master);
 extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what);
 extern _X_HIDDEN int CoreKeyboardProc(DeviceIntPtr dev, int what);
 
-
-/*
- * These are deprecated compatibility functions and will be removed soon!
- * Please use the noted replacements instead.
- */
-/* replaced by dixLookupWindow */
-extern _X_EXPORT WindowPtr SecurityLookupWindow(
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-/* replaced by dixLookupWindow */
-extern _X_EXPORT WindowPtr LookupWindow(
-    XID id,
-    ClientPtr client);
-
-/* replaced by dixLookupDrawable */
-extern _X_EXPORT pointer SecurityLookupDrawable(
-    XID id,
-    ClientPtr client,
-    Mask access_mode);
-
-/* replaced by dixLookupDrawable */
-extern _X_EXPORT pointer LookupDrawable(
-    XID id,
-    ClientPtr client);
-
-/* replaced by dixLookupClient */
-extern _X_EXPORT ClientPtr LookupClient(
-    XID id,
-    ClientPtr client);
-
 #endif /* DIX_H */
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index 6cc29c024..0717db64d 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -1,292 +1,290 @@
-/***********************************************************

-

-Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-Copyright 1992, 1993 Data General Corporation;

-Copyright 1992, 1993 OMRON Corporation  

-

-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, and that

-neither the name OMRON or DATA GENERAL be used in advertising or publicity

-pertaining to distribution of the software without specific, written prior

-permission of the party whose name is to be used.  Neither OMRON or 

-DATA GENERAL make any representation about the suitability of this software

-for any purpose.  It is provided "as is" without express or implied warranty.  

-

-OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,

-IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT

-OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

-OF THIS SOFTWARE.

-

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

-#ifndef MISC_H

-#define MISC_H 1

-/*

- *  X internal definitions 

- *

- */

-

-#include <X11/Xosdefs.h>

-#include <X11/Xfuncproto.h>

-#include <X11/Xmd.h>

-#include <X11/X.h>

-#include <X11/Xdefs.h>

-

-#include <stddef.h>

-

-#ifndef MAXSCREENS

-#define MAXSCREENS	16

-#endif

-#define MAXCLIENTS	256

-#define MAXEXTENSIONS   128

-#define MAXFORMATS	8

-#define MAXDEVICES	40 /* input devices */

-

-#define EXTENSION_EVENT_BASE 64

-#define EXTENSION_BASE 128

-

-typedef unsigned long PIXEL;

-typedef unsigned long ATOM;

-

-

-#ifndef TRUE

-#define TRUE 1

-#define FALSE 0

-#endif

-

-#ifndef _XTYPEDEF_CALLBACKLISTPTR

-typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */

-#define _XTYPEDEF_CALLBACKLISTPTR

-#endif

-

-typedef struct _xReq *xReqPtr;

-

-#include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */

-#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */

-

-#define NullBox ((BoxPtr)0)

-#define MILLI_PER_MIN (1000 * 60)

-#define MILLI_PER_SECOND (1000)

-

-    /* this next is used with None and ParentRelative to tell

-       PaintWin() what to use to paint the background. Also used

-       in the macro IS_VALID_PIXMAP */

-

-#define USE_BACKGROUND_PIXEL 3

-#define USE_BORDER_PIXEL 3

-

-

-/* byte swap a 32-bit literal */

-#define lswapl(x) ((((x) & 0xff) << 24) |\

-		   (((x) & 0xff00) << 8) |\

-		   (((x) & 0xff0000) >> 8) |\

-		   (((x) >> 24) & 0xff))

-

-/* byte swap a short literal */

-#define lswaps(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff))

-

-#undef min

-#undef max

-

-#define min(a, b) (((a) < (b)) ? (a) : (b))

-#define max(a, b) (((a) > (b)) ? (a) : (b))

-/* abs() is a function, not a macro; include the file declaring

- * it in case we haven't done that yet.

- */

-#include <stdlib.h>

-#ifndef Fabs

-#define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */

-#endif

-#define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))

-/* this assumes b > 0 */

-#define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)

-/*

- * return the least significant bit in x which is set

- *

- * This works on 1's complement and 2's complement machines.

- * If you care about the extra instruction on 2's complement

- * machines, change to ((x) & (-(x)))

- */

-#define lowbit(x) ((x) & (~(x) + 1))

-

-/* XXX Not for modules */

-#include <limits.h>

-#if !defined(MAXSHORT) || !defined(MINSHORT) || \

-    !defined(MAXINT) || !defined(MININT)

-/*

- * Some implementations #define these through <math.h>, so preclude

- * #include'ing it later.

- */

-

-#include <math.h>

-#undef MAXSHORT

-#define MAXSHORT SHRT_MAX

-#undef MINSHORT

-#define MINSHORT SHRT_MIN

-#undef MAXINT

-#define MAXINT INT_MAX

-#undef MININT

-#define MININT INT_MIN

-

-#include <assert.h>

-#include <ctype.h>

-#include <stdio.h>     /* for fopen, etc... */

-

-#endif

-

-/**

- * Calculate the number of bytes needed to hold bits.

- * @param bits The minimum number of bits needed.

- * @return The number of bytes needed to hold bits.

- */

-static inline int

-bits_to_bytes(const int bits) {

-    return ((bits + 7) >> 3);

-}

-/**

- * Calculate the number of 4-byte units needed to hold the given number of

- * bytes.

- * @param bytes The minimum number of bytes needed.

- * @return The number of 4-byte units needed to hold bytes.

- */

-static inline int

-bytes_to_int32(const int bytes) {

-    return (((bytes) + 3) >> 2);

-}

-

-/**

- * Calculate the number of bytes (in multiples of 4) needed to hold bytes.

- * @param bytes The minimum number of bytes needed.

- * @return The closest multiple of 4 that is equal or higher than bytes.

- */

-static inline int

-pad_to_int32(const int bytes) {

-    return (((bytes) + 3) & ~3);

-}

-

-extern char**

-xstrtokenize(const char *str, const char* separators);

-

-/* some macros to help swap requests, replies, and events */

-

-#define LengthRestB(stuff) \

-    ((client->req_len << 2) - sizeof(*stuff))

-

-#define LengthRestS(stuff) \

-    ((client->req_len << 1) - (sizeof(*stuff) >> 1))

-

-#define LengthRestL(stuff) \

-    (client->req_len - (sizeof(*stuff) >> 2))

-

-#define SwapRestS(stuff) \

-    SwapShorts((short *)(stuff + 1), LengthRestS(stuff))

-

-#define SwapRestL(stuff) \

-    SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))

-

-/* byte swap a 32-bit value */

-#define swapl(x, n) { \

-		 n = ((char *) (x))[0];\

-		 ((char *) (x))[0] = ((char *) (x))[3];\

-		 ((char *) (x))[3] = n;\

-		 n = ((char *) (x))[1];\

-		 ((char *) (x))[1] = ((char *) (x))[2];\

-		 ((char *) (x))[2] = n; }

-

-/* byte swap a short */

-#define swaps(x, n) { \

-		 n = ((char *) (x))[0];\

-		 ((char *) (x))[0] = ((char *) (x))[1];\

-		 ((char *) (x))[1] = n; }

-

-/* copy 32-bit value from src to dst byteswapping on the way */

-#define cpswapl(src, dst) { \

-                 ((char *)&(dst))[0] = ((char *) &(src))[3];\

-                 ((char *)&(dst))[1] = ((char *) &(src))[2];\

-                 ((char *)&(dst))[2] = ((char *) &(src))[1];\

-                 ((char *)&(dst))[3] = ((char *) &(src))[0]; }

-

-/* copy short from src to dst byteswapping on the way */

-#define cpswaps(src, dst) { \

-		 ((char *) &(dst))[0] = ((char *) &(src))[1];\

-		 ((char *) &(dst))[1] = ((char *) &(src))[0]; }

-

-extern _X_EXPORT void SwapLongs(

-    CARD32 *list,

-    unsigned long count);

-

-extern _X_EXPORT void SwapShorts(

-    short *list,

-    unsigned long count);

-

-extern _X_EXPORT void MakePredeclaredAtoms(void);

-

-extern _X_EXPORT int Ones(

-    unsigned long /*mask*/);

-

-typedef struct _xPoint *DDXPointPtr;

-typedef struct pixman_box16 *BoxPtr;

-typedef struct _xEvent *xEventPtr;

-typedef struct _xRectangle *xRectanglePtr;

-typedef struct _GrabRec *GrabPtr;

-

-/*  typedefs from other places - duplicated here to minimize the amount

- *  of unnecessary junk that one would normally have to include to get

- *  these symbols defined

- */

-

-#ifndef _XTYPEDEF_CHARINFOPTR

-typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */

-#define _XTYPEDEF_CHARINFOPTR

-#endif

-

-extern _X_EXPORT unsigned long globalSerialNumber;

-extern _X_EXPORT unsigned long serverGeneration;

-

-#endif /* MISC_H */

+/***********************************************************
+
+Copyright 1987, 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 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+Copyright 1992, 1993 Data General Corporation;
+Copyright 1992, 1993 OMRON Corporation  
+
+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, and that
+neither the name OMRON or DATA GENERAL be used in advertising or publicity
+pertaining to distribution of the software without specific, written prior
+permission of the party whose name is to be used.  Neither OMRON or 
+DATA GENERAL make any representation about the suitability of this software
+for any purpose.  It is provided "as is" without express or implied warranty.  
+
+OMRON AND DATA GENERAL EACH DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
+IN NO EVENT SHALL OMRON OR DATA GENERAL BE LIABLE FOR ANY SPECIAL, INDIRECT
+OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+OF THIS SOFTWARE.
+
+******************************************************************/
+#ifndef MISC_H
+#define MISC_H 1
+/*
+ *  X internal definitions 
+ *
+ */
+
+#include <X11/Xosdefs.h>
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+#include <X11/X.h>
+#include <X11/Xdefs.h>
+
+#include <stddef.h>
+
+#ifndef MAXSCREENS
+#define MAXSCREENS	16
+#endif
+#define MAXCLIENTS	256
+#define MAXEXTENSIONS   128
+#define MAXFORMATS	8
+#define MAXDEVICES	40 /* input devices */
+
+#define EXTENSION_EVENT_BASE 64
+#define EXTENSION_BASE 128
+
+typedef unsigned long ATOM;
+
+#ifndef TRUE
+#define TRUE 1
+#define FALSE 0
+#endif
+
+#ifndef _XTYPEDEF_CALLBACKLISTPTR
+typedef struct _CallbackList *CallbackListPtr; /* also in dix.h */
+#define _XTYPEDEF_CALLBACKLISTPTR
+#endif
+
+typedef struct _xReq *xReqPtr;
+
+#include "os.h" 	/* for ALLOCATE_LOCAL and DEALLOCATE_LOCAL */
+#include <X11/Xfuncs.h> /* for bcopy, bzero, and bcmp */
+
+#define NullBox ((BoxPtr)0)
+#define MILLI_PER_MIN (1000 * 60)
+#define MILLI_PER_SECOND (1000)
+
+    /* this next is used with None and ParentRelative to tell
+       PaintWin() what to use to paint the background. Also used
+       in the macro IS_VALID_PIXMAP */
+
+#define USE_BACKGROUND_PIXEL 3
+#define USE_BORDER_PIXEL 3
+
+
+/* byte swap a 32-bit literal */
+#define lswapl(x) ((((x) & 0xff) << 24) |\
+		   (((x) & 0xff00) << 8) |\
+		   (((x) & 0xff0000) >> 8) |\
+		   (((x) >> 24) & 0xff))
+
+/* byte swap a short literal */
+#define lswaps(x) ((((x) & 0xff) << 8) | (((x) >> 8) & 0xff))
+
+#undef min
+#undef max
+
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+/* abs() is a function, not a macro; include the file declaring
+ * it in case we haven't done that yet.
+ */
+#include <stdlib.h>
+#ifndef Fabs
+#define Fabs(a) ((a) > 0.0 ? (a) : -(a))	/* floating absolute value */
+#endif
+#define sign(x) ((x) < 0 ? -1 : ((x) > 0 ? 1 : 0))
+/* this assumes b > 0 */
+#define modulus(a, b, d)    if (((d) = (a) % (b)) < 0) (d) += (b)
+/*
+ * return the least significant bit in x which is set
+ *
+ * This works on 1's complement and 2's complement machines.
+ * If you care about the extra instruction on 2's complement
+ * machines, change to ((x) & (-(x)))
+ */
+#define lowbit(x) ((x) & (~(x) + 1))
+
+/* XXX Not for modules */
+#include <limits.h>
+#if !defined(MAXSHORT) || !defined(MINSHORT) || \
+    !defined(MAXINT) || !defined(MININT)
+/*
+ * Some implementations #define these through <math.h>, so preclude
+ * #include'ing it later.
+ */
+
+#include <math.h>
+#undef MAXSHORT
+#define MAXSHORT SHRT_MAX
+#undef MINSHORT
+#define MINSHORT SHRT_MIN
+#undef MAXINT
+#define MAXINT INT_MAX
+#undef MININT
+#define MININT INT_MIN
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>     /* for fopen, etc... */
+
+#endif
+
+/**
+ * Calculate the number of bytes needed to hold bits.
+ * @param bits The minimum number of bits needed.
+ * @return The number of bytes needed to hold bits.
+ */
+static inline int
+bits_to_bytes(const int bits) {
+    return ((bits + 7) >> 3);
+}
+/**
+ * Calculate the number of 4-byte units needed to hold the given number of
+ * bytes.
+ * @param bytes The minimum number of bytes needed.
+ * @return The number of 4-byte units needed to hold bytes.
+ */
+static inline int
+bytes_to_int32(const int bytes) {
+    return (((bytes) + 3) >> 2);
+}
+
+/**
+ * Calculate the number of bytes (in multiples of 4) needed to hold bytes.
+ * @param bytes The minimum number of bytes needed.
+ * @return The closest multiple of 4 that is equal or higher than bytes.
+ */
+static inline int
+pad_to_int32(const int bytes) {
+    return (((bytes) + 3) & ~3);
+}
+
+extern char**
+xstrtokenize(const char *str, const char* separators);
+
+/* some macros to help swap requests, replies, and events */
+
+#define LengthRestB(stuff) \
+    ((client->req_len << 2) - sizeof(*stuff))
+
+#define LengthRestS(stuff) \
+    ((client->req_len << 1) - (sizeof(*stuff) >> 1))
+
+#define LengthRestL(stuff) \
+    (client->req_len - (sizeof(*stuff) >> 2))
+
+#define SwapRestS(stuff) \
+    SwapShorts((short *)(stuff + 1), LengthRestS(stuff))
+
+#define SwapRestL(stuff) \
+    SwapLongs((CARD32 *)(stuff + 1), LengthRestL(stuff))
+
+/* byte swap a 32-bit value */
+#define swapl(x, n) { \
+		 n = ((char *) (x))[0];\
+		 ((char *) (x))[0] = ((char *) (x))[3];\
+		 ((char *) (x))[3] = n;\
+		 n = ((char *) (x))[1];\
+		 ((char *) (x))[1] = ((char *) (x))[2];\
+		 ((char *) (x))[2] = n; }
+
+/* byte swap a short */
+#define swaps(x, n) { \
+		 n = ((char *) (x))[0];\
+		 ((char *) (x))[0] = ((char *) (x))[1];\
+		 ((char *) (x))[1] = n; }
+
+/* copy 32-bit value from src to dst byteswapping on the way */
+#define cpswapl(src, dst) { \
+                 ((char *)&(dst))[0] = ((char *) &(src))[3];\
+                 ((char *)&(dst))[1] = ((char *) &(src))[2];\
+                 ((char *)&(dst))[2] = ((char *) &(src))[1];\
+                 ((char *)&(dst))[3] = ((char *) &(src))[0]; }
+
+/* copy short from src to dst byteswapping on the way */
+#define cpswaps(src, dst) { \
+		 ((char *) &(dst))[0] = ((char *) &(src))[1];\
+		 ((char *) &(dst))[1] = ((char *) &(src))[0]; }
+
+extern _X_EXPORT void SwapLongs(
+    CARD32 *list,
+    unsigned long count);
+
+extern _X_EXPORT void SwapShorts(
+    short *list,
+    unsigned long count);
+
+extern _X_EXPORT void MakePredeclaredAtoms(void);
+
+extern _X_EXPORT int Ones(
+    unsigned long /*mask*/);
+
+typedef struct _xPoint *DDXPointPtr;
+typedef struct pixman_box16 *BoxPtr;
+typedef struct _xEvent *xEventPtr;
+typedef struct _xRectangle *xRectanglePtr;
+typedef struct _GrabRec *GrabPtr;
+
+/*  typedefs from other places - duplicated here to minimize the amount
+ *  of unnecessary junk that one would normally have to include to get
+ *  these symbols defined
+ */
+
+#ifndef _XTYPEDEF_CHARINFOPTR
+typedef struct _CharInfo *CharInfoPtr; /* also in fonts/include/font.h */
+#define _XTYPEDEF_CHARINFOPTR
+#endif
+
+extern _X_EXPORT unsigned long globalSerialNumber;
+extern _X_EXPORT unsigned long serverGeneration;
+
+#endif /* MISC_H */
diff --git a/xorg-server/include/pixmapstr.h b/xorg-server/include/pixmapstr.h
index 702faf0ac..542c381bc 100644
--- a/xorg-server/include/pixmapstr.h
+++ b/xorg-server/include/pixmapstr.h
@@ -80,7 +80,6 @@ typedef struct _Pixmap {
     short		screen_x;
     short		screen_y;
 #endif
-    unsigned		usage_hint; /* see CREATE_PIXMAP_USAGE_* */
 } PixmapRec;
 
 #endif /* PIXMAPSTRUCT_H */
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index a09679ad6..763aa99d9 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -1,284 +1,255 @@
-/***********************************************************

-

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

-

-

-Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-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 Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

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

-

-#ifndef RESOURCE_H

-#define RESOURCE_H 1

-#include "misc.h"

-#include "dixaccess.h"

-

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

- * STUFF FOR RESOURCES 

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

-

-/* classes for Resource routines */

-

-typedef unsigned long RESTYPE;

-

-#define RC_VANILLA	((RESTYPE)0)

-#define RC_CACHED	((RESTYPE)1<<31)

-#define RC_DRAWABLE	((RESTYPE)1<<30)

-/*  Use class RC_NEVERRETAIN for resources that should not be retained

- *  regardless of the close down mode when the client dies.  (A client's

- *  event selections on objects that it doesn't own are good candidates.)

- *  Extensions can use this too!

- */

-#define RC_NEVERRETAIN	((RESTYPE)1<<29)

-#define RC_LASTPREDEF	RC_NEVERRETAIN

-#define RC_ANY		(~(RESTYPE)0)

-

-/* types for Resource routines */

-

-#define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)

-#define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)

-#define RT_GC		((RESTYPE)3)

-#undef RT_FONT

-#undef RT_CURSOR

-#define RT_FONT		((RESTYPE)4)

-#define RT_CURSOR	((RESTYPE)5)

-#define RT_COLORMAP	((RESTYPE)6)

-#define RT_CMAPENTRY	((RESTYPE)7)

-#define RT_OTHERCLIENT	((RESTYPE)8|RC_NEVERRETAIN)

-#define RT_PASSIVEGRAB	((RESTYPE)9|RC_NEVERRETAIN)

-#define RT_LASTPREDEF	((RESTYPE)9)

-#define RT_NONE		((RESTYPE)0)

-

-/* bits and fields within a resource id */

-#define RESOURCE_AND_CLIENT_COUNT   29			/* 29 bits for XIDs */

-#if MAXCLIENTS == 64

-#define RESOURCE_CLIENT_BITS	6

-#endif

-#if MAXCLIENTS == 128

-#define RESOURCE_CLIENT_BITS	7

-#endif

-#if MAXCLIENTS == 256

-#define RESOURCE_CLIENT_BITS	8

-#endif

-#if MAXCLIENTS == 512

-#define RESOURCE_CLIENT_BITS	9

-#endif

-/* client field offset */

-#define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)

-/* resource field */

-#define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)

-/* client field */

-#define RESOURCE_CLIENT_MASK	(((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET)

-/* extract the client mask from an XID */

-#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)

-/* extract the client id from an XID */

-#define CLIENT_ID(id) ((int)(CLIENT_BITS(id) >> CLIENTOFFSET))

-#define SERVER_BIT		(Mask)0x40000000	/* use illegal bit */

-

-#ifdef INVALID

-#undef INVALID	/* needed on HP/UX */

-#endif

-

-/* Invalid resource id */

-#define INVALID	(0)

-

-#define BAD_RESOURCE 0xe0000000

-

-#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])

-

-/* Resource state callback */

-extern _X_EXPORT CallbackListPtr ResourceStateCallback;

-

-typedef enum {ResourceStateAdding,

-	      ResourceStateFreeing} ResourceState;

-

-typedef struct {

-    ResourceState state;

-    XID id;

-    RESTYPE type;

-    pointer value;

-} ResourceStateInfoRec;

-

-typedef int (*DeleteType)(

-    pointer /*value*/,

-    XID /*id*/);

-

-typedef void (*FindResType)(

-    pointer /*value*/,

-    XID /*id*/,

-    pointer /*cdata*/);

-

-typedef void (*FindAllRes)(

-    pointer /*value*/,

-    XID /*id*/,

-    RESTYPE /*type*/,

-    pointer /*cdata*/);

-

-typedef Bool (*FindComplexResType)(

-    pointer /*value*/,

-    XID /*id*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT RESTYPE CreateNewResourceType(

-    DeleteType /*deleteFunc*/, char * /*name*/);

-

-extern _X_EXPORT void SetResourceTypeErrorValue(

-    RESTYPE /*type*/, int /*errorValue*/);

-

-extern _X_EXPORT RESTYPE CreateNewResourceClass(void);

-

-extern _X_EXPORT Bool InitClientResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT XID FakeClientID(

-    int /*client*/);

-

-/* Quartz support on Mac OS X uses the CarbonCore

-   framework whose AddResource function conflicts here. */

-#ifdef __APPLE__

-#define AddResource Darwin_X_AddResource

-#endif

-extern _X_EXPORT Bool AddResource(

-    XID /*id*/,

-    RESTYPE /*type*/,

-    pointer /*value*/);

-

-extern _X_EXPORT void FreeResource(

-    XID /*id*/,

-    RESTYPE /*skipDeleteFuncType*/);

-

-extern _X_EXPORT void FreeResourceByType(

-    XID /*id*/,

-    RESTYPE /*type*/,

-    Bool /*skipFree*/);

-

-extern _X_EXPORT Bool ChangeResourceValue(

-    XID /*id*/,

-    RESTYPE /*rtype*/,

-    pointer /*value*/);

-

-extern _X_EXPORT void FindClientResourcesByType(

-    ClientPtr /*client*/,

-    RESTYPE /*type*/,

-    FindResType /*func*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT void FindAllClientResources(

-    ClientPtr /*client*/,

-    FindAllRes /*func*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT void FreeClientNeverRetainResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT void FreeClientResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT void FreeAllResources(void);

-

-extern _X_EXPORT Bool LegalNewID(

-    XID /*id*/,

-    ClientPtr /*client*/);

-

-extern _X_EXPORT pointer LookupClientResourceComplex(

-    ClientPtr client,

-    RESTYPE type,

-    FindComplexResType func,

-    pointer cdata);

-

-extern _X_EXPORT int dixLookupResourceByType(

-    pointer *result,

-    XID id,

-    RESTYPE rtype,

-    ClientPtr client,

-    Mask access_mode);

-

-extern _X_EXPORT int dixLookupResourceByClass(

-    pointer *result,

-    XID id,

-    RESTYPE rclass,

-    ClientPtr client,

-    Mask access_mode);

-

-extern _X_EXPORT void GetXIDRange(

-    int /*client*/,

-    Bool /*server*/,

-    XID * /*minp*/,

-    XID * /*maxp*/);

-

-extern _X_EXPORT unsigned int GetXIDList(

-    ClientPtr /*client*/,

-    unsigned int /*count*/,

-    XID * /*pids*/);

-

-extern _X_EXPORT RESTYPE lastResourceType;

-extern _X_EXPORT RESTYPE TypeMask;

-

-/*

- * These are deprecated compatibility functions and will be removed soon!

- * Please use the noted replacements instead.

- */

-

-/* replaced by dixLookupResourceByType */

-extern _X_EXPORT pointer SecurityLookupIDByType(

-    ClientPtr client,

-    XID id,

-    RESTYPE rtype,

-    Mask access_mode) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByClass */

-extern _X_EXPORT pointer SecurityLookupIDByClass(

-    ClientPtr client,

-    XID id,

-    RESTYPE classes,

-    Mask access_mode) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByType */

-extern _X_EXPORT pointer LookupIDByType(

-    XID id,

-    RESTYPE rtype) _X_DEPRECATED;

-

-/* replaced by dixLookupResourceByClass */

-extern _X_EXPORT pointer LookupIDByClass(

-    XID id,

-    RESTYPE classes) _X_DEPRECATED;

-

-#endif /* RESOURCE_H */

-

+/***********************************************************
+
+Copyright 1987, 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.
+
+
+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+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 Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef RESOURCE_H
+#define RESOURCE_H 1
+#include "misc.h"
+#include "dixaccess.h"
+
+/*****************************************************************
+ * STUFF FOR RESOURCES 
+ *****************************************************************/
+
+/* classes for Resource routines */
+
+typedef unsigned long RESTYPE;
+
+#define RC_VANILLA	((RESTYPE)0)
+#define RC_CACHED	((RESTYPE)1<<31)
+#define RC_DRAWABLE	((RESTYPE)1<<30)
+/*  Use class RC_NEVERRETAIN for resources that should not be retained
+ *  regardless of the close down mode when the client dies.  (A client's
+ *  event selections on objects that it doesn't own are good candidates.)
+ *  Extensions can use this too!
+ */
+#define RC_NEVERRETAIN	((RESTYPE)1<<29)
+#define RC_LASTPREDEF	RC_NEVERRETAIN
+#define RC_ANY		(~(RESTYPE)0)
+
+/* types for Resource routines */
+
+#define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)
+#define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)
+#define RT_GC		((RESTYPE)3)
+#undef RT_FONT
+#undef RT_CURSOR
+#define RT_FONT		((RESTYPE)4)
+#define RT_CURSOR	((RESTYPE)5)
+#define RT_COLORMAP	((RESTYPE)6)
+#define RT_CMAPENTRY	((RESTYPE)7)
+#define RT_OTHERCLIENT	((RESTYPE)8|RC_NEVERRETAIN)
+#define RT_PASSIVEGRAB	((RESTYPE)9|RC_NEVERRETAIN)
+#define RT_LASTPREDEF	((RESTYPE)9)
+#define RT_NONE		((RESTYPE)0)
+
+/* bits and fields within a resource id */
+#define RESOURCE_AND_CLIENT_COUNT   29			/* 29 bits for XIDs */
+#if MAXCLIENTS == 64
+#define RESOURCE_CLIENT_BITS	6
+#endif
+#if MAXCLIENTS == 128
+#define RESOURCE_CLIENT_BITS	7
+#endif
+#if MAXCLIENTS == 256
+#define RESOURCE_CLIENT_BITS	8
+#endif
+#if MAXCLIENTS == 512
+#define RESOURCE_CLIENT_BITS	9
+#endif
+/* client field offset */
+#define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)
+/* resource field */
+#define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
+/* client field */
+#define RESOURCE_CLIENT_MASK	(((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET)
+/* extract the client mask from an XID */
+#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
+/* extract the client id from an XID */
+#define CLIENT_ID(id) ((int)(CLIENT_BITS(id) >> CLIENTOFFSET))
+#define SERVER_BIT		(Mask)0x40000000	/* use illegal bit */
+
+#ifdef INVALID
+#undef INVALID	/* needed on HP/UX */
+#endif
+
+/* Invalid resource id */
+#define INVALID	(0)
+
+#define BAD_RESOURCE 0xe0000000
+
+#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
+
+/* Resource state callback */
+extern _X_EXPORT CallbackListPtr ResourceStateCallback;
+
+typedef enum {ResourceStateAdding,
+	      ResourceStateFreeing} ResourceState;
+
+typedef struct {
+    ResourceState state;
+    XID id;
+    RESTYPE type;
+    pointer value;
+} ResourceStateInfoRec;
+
+typedef int (*DeleteType)(
+    pointer /*value*/,
+    XID /*id*/);
+
+typedef void (*FindResType)(
+    pointer /*value*/,
+    XID /*id*/,
+    pointer /*cdata*/);
+
+typedef void (*FindAllRes)(
+    pointer /*value*/,
+    XID /*id*/,
+    RESTYPE /*type*/,
+    pointer /*cdata*/);
+
+typedef Bool (*FindComplexResType)(
+    pointer /*value*/,
+    XID /*id*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT RESTYPE CreateNewResourceType(
+    DeleteType /*deleteFunc*/, char * /*name*/);
+
+extern _X_EXPORT void SetResourceTypeErrorValue(
+    RESTYPE /*type*/, int /*errorValue*/);
+
+extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
+
+extern _X_EXPORT Bool InitClientResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT XID FakeClientID(
+    int /*client*/);
+
+/* Quartz support on Mac OS X uses the CarbonCore
+   framework whose AddResource function conflicts here. */
+#ifdef __APPLE__
+#define AddResource Darwin_X_AddResource
+#endif
+extern _X_EXPORT Bool AddResource(
+    XID /*id*/,
+    RESTYPE /*type*/,
+    pointer /*value*/);
+
+extern _X_EXPORT void FreeResource(
+    XID /*id*/,
+    RESTYPE /*skipDeleteFuncType*/);
+
+extern _X_EXPORT void FreeResourceByType(
+    XID /*id*/,
+    RESTYPE /*type*/,
+    Bool /*skipFree*/);
+
+extern _X_EXPORT Bool ChangeResourceValue(
+    XID /*id*/,
+    RESTYPE /*rtype*/,
+    pointer /*value*/);
+
+extern _X_EXPORT void FindClientResourcesByType(
+    ClientPtr /*client*/,
+    RESTYPE /*type*/,
+    FindResType /*func*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT void FindAllClientResources(
+    ClientPtr /*client*/,
+    FindAllRes /*func*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT void FreeClientNeverRetainResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT void FreeClientResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT void FreeAllResources(void);
+
+extern _X_EXPORT Bool LegalNewID(
+    XID /*id*/,
+    ClientPtr /*client*/);
+
+extern _X_EXPORT pointer LookupClientResourceComplex(
+    ClientPtr client,
+    RESTYPE type,
+    FindComplexResType func,
+    pointer cdata);
+
+extern _X_EXPORT int dixLookupResourceByType(
+    pointer *result,
+    XID id,
+    RESTYPE rtype,
+    ClientPtr client,
+    Mask access_mode);
+
+extern _X_EXPORT int dixLookupResourceByClass(
+    pointer *result,
+    XID id,
+    RESTYPE rclass,
+    ClientPtr client,
+    Mask access_mode);
+
+extern _X_EXPORT void GetXIDRange(
+    int /*client*/,
+    Bool /*server*/,
+    XID * /*minp*/,
+    XID * /*maxp*/);
+
+extern _X_EXPORT unsigned int GetXIDList(
+    ClientPtr /*client*/,
+    unsigned int /*count*/,
+    XID * /*pids*/);
+
+extern _X_EXPORT RESTYPE lastResourceType;
+extern _X_EXPORT RESTYPE TypeMask;
+
+#endif /* RESOURCE_H */
+
diff --git a/xorg-server/include/scrnintstr.h b/xorg-server/include/scrnintstr.h
index a9357e8a5..302a561bd 100644
--- a/xorg-server/include/scrnintstr.h
+++ b/xorg-server/include/scrnintstr.h
@@ -208,7 +208,7 @@ typedef    PixmapPtr (* CreatePixmapProcPtr)(
 	int /*width*/,
 	int /*height*/,
 	int /*depth*/,
-	unsigned /*usage_hint*/);
+	unsigned /*class*/);
 
 typedef    Bool (* DestroyPixmapProcPtr)(
 	PixmapPtr /*pPixmap*/);