xserver xkeyboard-config mesa git update 28 Apr 2011

3 files changed, 547 insertions, 545 deletions

diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 14229b435..4710ef881 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -30,9 +30,6 @@
 /* Support Damage extension */
 #undef DAMAGE
 
-/* Build for darwin with Quartz support */
-#undef DARWIN_WITH_QUARTZ
-
 /* Use OsVendorVErrorF */
 #undef DDXOSVERRORF
 
@@ -127,8 +124,8 @@
 /* Support application updating through sparkle. */
 #undef XQUARTZ_SPARKLE
 
-/* Prefix to use for launchd identifiers */
-#undef LAUNCHD_ID_PREFIX
+/* Prefix to use for bundle identifiers */
+#undef BUNDLE_ID_PREFIX
 
 /* Build a standalone xpbproxy */
 #undef STANDALONE_XPBPROXY
@@ -447,7 +444,7 @@
 /* Define to 1 if you have the `ffs' function. */
 #undef HAVE_FFS
 
-/* If the compiler supports a TLS storage class define it to that here */
+/* The compiler supported TLS storage class, prefering initial-exec if tls_model is supported */
 #undef TLS
 
 /* Correctly set _XSERVER64 for OSX fat binaries */
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 87e786e1f..506dc5d2a 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -1,539 +1,539 @@
-/***********************************************************

-

-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.

-

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

-

-

-#ifndef OS_H

-#define OS_H

-

-#include "misc.h"

-#include <stdarg.h>

-#include <string.h>

-

-#define SCREEN_SAVER_ON   0

-#define SCREEN_SAVER_OFF  1

-#define SCREEN_SAVER_FORCER 2

-#define SCREEN_SAVER_CYCLE  3

-

-#ifndef MAX_REQUEST_SIZE

-#define MAX_REQUEST_SIZE 65535

-#endif

-#ifndef MAX_BIG_REQUEST_SIZE

-#define MAX_BIG_REQUEST_SIZE 4194303

-#endif

-

-typedef struct _FontPathRec *FontPathPtr;

-typedef struct _NewClientRec *NewClientPtr;

-

-#ifndef xalloc

-#define xnfalloc(size) XNFalloc((unsigned long)(size))

-#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))

-#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))

-

-#define xalloc(size) Xalloc((unsigned long)(size))

-#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))

-#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))

-#define xfree(ptr) Xfree((pointer)(ptr))

-#define xstrdup(s) Xstrdup(s)

-#define xnfstrdup(s) XNFstrdup(s)

-#endif

-

-#include <stdio.h>

-#include <stdarg.h>

-

-#ifdef DDXBEFORERESET

-extern void ddxBeforeReset (void);

-#endif

-

-#ifdef DDXOSVERRORF

-extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);

-#endif

-

-extern _X_EXPORT int WaitForSomething(

-    int* /*pClientsReady*/

-);

-

-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/);

-

-extern _X_EXPORT Bool InsertFakeRequest(

-    ClientPtr /*client*/, 

-    char* /*data*/, 

-    int /*count*/);

-

-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/);

-

-extern _X_EXPORT void FlushAllOutput(void);

-

-extern _X_EXPORT void FlushIfCriticalOutputPending(void);

-

-extern _X_EXPORT void SetCriticalOutputPending(void);

-

-extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/);

-

-extern _X_EXPORT void ResetOsBuffers(void);

-

-extern _X_EXPORT void InitConnectionLimits(void);

-

-extern _X_EXPORT void NotifyParentProcess(void);

-

-extern _X_EXPORT void CreateWellKnownSockets(void);

-

-extern _X_EXPORT void ResetWellKnownSockets(void);

-

-extern _X_EXPORT void CloseWellKnownConnections(void);

-

-extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);

-

-extern _X_EXPORT char *ClientAuthorized(

-    ClientPtr /*client*/,

-    unsigned int /*proto_n*/,

-    char* /*auth_proto*/,

-    unsigned int /*string_n*/,

-    char* /*auth_string*/);

-

-extern _X_EXPORT Bool EstablishNewConnections(

-    ClientPtr /*clientUnused*/,

-    pointer /*closure*/);

-

-extern _X_EXPORT void CheckConnections(void);

-

-extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/);

-

-extern _X_EXPORT void AddGeneralSocket(int /*fd*/);

-

-extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/);

-

-extern _X_EXPORT void AddEnabledDevice(int /*fd*/);

-

-extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/);

-

-extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/);

-

-extern _X_EXPORT void ListenToAllClients(void);

-

-extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/);

-

-extern _X_EXPORT void AttendClient(ClientPtr /*client*/);

-

-extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/);

-

-extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/);

-

-#ifdef XQUARTZ

-extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);

-#endif

-

-extern _X_EXPORT CARD32 GetTimeInMillis(void);

-

-extern _X_EXPORT void AdjustWaitForDelay(

-    pointer /*waitTime*/,

-    unsigned long /*newdelay*/);

-

-typedef	struct _OsTimerRec *OsTimerPtr;

-

-typedef CARD32 (*OsTimerCallback)(

-    OsTimerPtr /* timer */,

-    CARD32 /* time */,

-    pointer /* arg */);

-

-extern _X_EXPORT void TimerInit(void);

-

-extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);

-

-#define TimerAbsolute (1<<0)

-#define TimerForceOld (1<<1)

-

-extern _X_EXPORT OsTimerPtr TimerSet(

-    OsTimerPtr /* timer */,

-    int /* flags */,

-    CARD32 /* millis */,

-    OsTimerCallback /* func */,

-    pointer /* arg */);

-

-extern _X_EXPORT void TimerCheck(void);

-extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */);

-extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);

-

-extern _X_EXPORT void SetScreenSaverTimer(void);

-extern _X_EXPORT void FreeScreenSaverTimer(void);

-

-extern _X_EXPORT void AutoResetServer(int /*sig*/);

-

-extern _X_EXPORT void GiveUp(int /*sig*/);

-

-extern _X_EXPORT void UseMsg(void);

-

-extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);

-

-extern _X_EXPORT int set_font_authorizations(

-    char ** /* authorizations */, 

-    int * /*authlen */, 

-    pointer /* client */);

-

-#ifndef _HAVE_XALLOC_DECLS

-#define _HAVE_XALLOC_DECLS

-

-/*

- * Use malloc(3) instead.

- */

-extern _X_EXPORT void *Xalloc(unsigned long /*amount*/) _X_DEPRECATED;

-/*

- * Use calloc(3) instead

- */

-extern _X_EXPORT void *Xcalloc(unsigned long /*amount*/) _X_DEPRECATED;

-/*

- * Use realloc(3) instead

- */

-extern _X_EXPORT void *Xrealloc(void * /*ptr*/, unsigned long /*amount*/)

-    _X_DEPRECATED;

-/*

- * Use free(3) instead

- */

-extern _X_EXPORT void Xfree(void * /*ptr*/) _X_DEPRECATED;

-

-#endif

-

-/*

- * This function malloc(3)s buffer, terminating the server if there is not

- * enough memory.

- */

-extern _X_EXPORT void *XNFalloc(unsigned long /*amount*/);

-/*

- * This function calloc(3)s buffer, terminating the server if there is not

- * enough memory.

- */

-extern _X_EXPORT void *XNFcalloc(unsigned long /*amount*/);

-/*

- * This function realloc(3)s passed buffer, terminating the server if there is

- * not enough memory.

- */

-extern _X_EXPORT void *XNFrealloc(void * /*ptr*/, unsigned long /*amount*/);

-

-/*

- * This function strdup(3)s passed string. The only difference from the library

- * function that it is safe to pass NULL, as NULL will be returned.

- */

-extern _X_EXPORT char *Xstrdup(const char *s);

-

-/*

- * This function strdup(3)s passed string, terminating the server if there is

- * not enough memory. If NULL is passed to this function, NULL is returned.

- */

-extern _X_EXPORT char *XNFstrdup(const char *s);

-

-/* Include new X*asprintf API */

-#include "Xprintf.h"

-

-/* Older api deprecated in favor of the asprintf versions */

-extern _X_EXPORT char *Xprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED;

-extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED;

-extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED;

-extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED;

-

-typedef void (*OsSigHandlerPtr)(int /* sig */);

-typedef int (*OsSigWrapperPtr)(int /* sig */);

-

-extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);

-extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap);

-

-extern _X_EXPORT int auditTrailLevel;

-

-extern _X_EXPORT void LockServer(void);

-extern _X_EXPORT void UnlockServer(void);

-

-extern _X_EXPORT int OsLookupColor(

-    int	/*screen*/,

-    char * /*name*/,

-    unsigned /*len*/,

-    unsigned short * /*pred*/,

-    unsigned short * /*pgreen*/,

-    unsigned short * /*pblue*/);

-

-extern _X_EXPORT void OsInit(void);

-

-extern _X_EXPORT void OsCleanup(Bool);

-

-extern _X_EXPORT void OsVendorFatalError(void);

-

-extern _X_EXPORT void OsVendorInit(void);

-

-extern _X_EXPORT void OsBlockSignals (void);

-

-extern _X_EXPORT void OsReleaseSignals (void);

-

-extern _X_EXPORT void OsAbort (void) _X_NORETURN;

-

-#if !defined(WIN32)

-extern _X_EXPORT int System(char *);

-extern _X_EXPORT pointer Popen(char *, char *);

-extern _X_EXPORT int Pclose(pointer);

-extern _X_EXPORT pointer Fopen(char *, char *);

-extern _X_EXPORT int Fclose(pointer);

-#else

-#define System(a) system(a)

-#define Popen(a,b) popen(a,b)

-#define Pclose(a) pclose(a)

-#define Fopen(a,b) fopen(a,b)

-#define Fclose(a) fclose(a)

-#endif

-

-extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp);

-extern _X_EXPORT void CheckUserAuthorization(void);

-

-extern _X_EXPORT int AddHost(

-    ClientPtr	/*client*/,

-    int         /*family*/,

-    unsigned    /*length*/,

-    const void */*pAddr*/);

-

-extern _X_EXPORT Bool ForEachHostInFamily (

-    int	    /*family*/,

-    Bool    (* /*func*/ )(

-            unsigned char * /* addr */,

-            short           /* len */,

-            pointer         /* closure */),

-    pointer /*closure*/);

-

-extern _X_EXPORT int RemoveHost(

-    ClientPtr	/*client*/,

-    int         /*family*/,

-    unsigned    /*length*/,

-    pointer     /*pAddr*/);

-

-extern _X_EXPORT int GetHosts(

-    pointer * /*data*/,

-    int	    * /*pnHosts*/,

-    int	    * /*pLen*/,

-    BOOL    * /*pEnabled*/);

-

-typedef struct sockaddr * sockaddrPtr;

-

-extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);

-

-extern _X_EXPORT int LocalClient(ClientPtr /* client */);

-

-extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);

-

-#define LCC_UID_SET	(1 << 0)

-#define LCC_GID_SET	(1 << 1)

-#define LCC_PID_SET	(1 << 2)

-#define LCC_ZID_SET	(1 << 3)

-

-typedef struct {

-    int fieldsSet;	/* Bit mask of fields set */

-    int	euid;		/* Effective uid */

-    int egid;		/* Primary effective group id */

-    int nSuppGids;	/* Number of supplementary group ids */

-    int *pSuppGids;	/* Array of supplementary group ids */

-    int pid;		/* Process id */

-    int zoneid;		/* Only set on Solaris 10 & later */

-} LocalClientCredRec;

-

-extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);

-extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *);

-

-extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);

-

-extern _X_EXPORT int GetAccessControl(void);

-

-

-extern _X_EXPORT void AddLocalHosts(void);

-

-extern _X_EXPORT void ResetHosts(char *display);

-

-extern _X_EXPORT void EnableLocalHost(void);

-

-extern _X_EXPORT void DisableLocalHost(void);

-

-extern _X_EXPORT void AccessUsingXdmcp(void);

-

-extern _X_EXPORT void DefineSelf(int /*fd*/);

-

-#if XDMCP

-extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);

-

-extern _X_EXPORT void RegisterAuthorizations(void);

-#endif

-

-extern _X_EXPORT void InitAuthorization(char * /*filename*/);

-

-/* extern int LoadAuthorization(void); */

-

-extern _X_EXPORT int AuthorizationFromID (

-	XID 		id,

-	unsigned short	*name_lenp,

-	char		**namep,

-	unsigned short	*data_lenp,

-	char		**datap);

-

-extern _X_EXPORT XID CheckAuthorization(

-    unsigned int /*namelength*/,

-    const char * /*name*/,

-    unsigned int /*datalength*/,

-    const char * /*data*/,

-    ClientPtr /*client*/,

-    char ** /*reason*/

-);

-

-extern _X_EXPORT void ResetAuthorization(void);

-

-extern _X_EXPORT int RemoveAuthorization (

-    unsigned short	name_length,

-    const char		*name,

-    unsigned short	data_length,

-    const char		*data);

-

-extern _X_EXPORT int AddAuthorization(

-    unsigned int	/*name_length*/,

-    const char *	/*name*/,

-    unsigned int	/*data_length*/,

-    char *		/*data*/);

-

-#ifdef XCSECURITY

-extern _X_EXPORT XID GenerateAuthorization(

-    unsigned int   /* name_length */,

-    const char	*  /* name */,

-    unsigned int   /* data_length */,

-    const char	*  /* data */,

-    unsigned int * /* data_length_return */,

-    char	** /* data_return */);

-#endif

-

-extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);

-

-extern _X_EXPORT void ddxUseMsg(void);

-

-/* stuff for ReplyCallback */

-extern _X_EXPORT CallbackListPtr ReplyCallback;

-typedef struct {

-    ClientPtr client;

-    const void *replyData;

-    unsigned long dataLenBytes;

-    unsigned long bytesRemaining;

-    Bool startOfReply;

-} ReplyInfoRec;

-

-/* stuff for FlushCallback */

-extern _X_EXPORT CallbackListPtr FlushCallback;

-

-extern _X_EXPORT void AbortDDX(void);

-extern _X_EXPORT void ddxGiveUp(void);

-extern _X_EXPORT int TimeSinceLastInputEvent(void);

-

-/* strcasecmp.c */

-#if NEED_STRCASECMP

-#define strcasecmp xstrcasecmp

-extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2);

-#endif

-

-#if NEED_STRNCASECMP

-#define strncasecmp xstrncasecmp

-extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n);

-#endif

-

-#if NEED_STRCASESTR

-#define strcasestr xstrcasestr

-extern _X_EXPORT char *xstrcasestr(const char *s, const char *find);

-#endif

-

-#ifndef HAS_STRLCPY

-extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz);

-extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz);

-#endif

-

-/* Logging. */

-typedef enum _LogParameter {

-    XLOG_FLUSH,

-    XLOG_SYNC,

-    XLOG_VERBOSITY,

-    XLOG_FILE_VERBOSITY

-} LogParameter;

-

-/* Flags for log messages. */

-typedef enum {

-    X_PROBED,			/* Value was probed */

-    X_CONFIG,			/* Value was given in the config file */

-    X_DEFAULT,			/* Value is a default */

-    X_CMDLINE,			/* Value was given on the command line */

-    X_NOTICE,			/* Notice */

-    X_ERROR,			/* Error message */

-    X_WARNING,			/* Warning message */

-    X_INFO,			/* Informational message */

-    X_NONE,			/* No prefix */

-    X_NOT_IMPLEMENTED,		/* Not implemented */

-    X_UNKNOWN = -1		/* unknown -- this must always be last */

-} MessageType;

-

-extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);

-extern _X_EXPORT void LogClose(void);

-extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);

-extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args);

-extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);

-extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format,

-			    va_list args);

-extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format,

-			   ...) _X_ATTRIBUTE_PRINTF(3,4);

-extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)

-			_X_ATTRIBUTE_PRINTF(2,3);

-extern _X_EXPORT void FreeAuditTimer(void);

-extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT void VAuditF(const char *f, va_list args);

-extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;

-

-#ifdef DEBUG

-#define DebugF ErrorF

-#else

-#define DebugF(...) /* */

-#endif

-

-extern _X_EXPORT void VErrorF(const char *f, va_list args);

-extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);

-extern _X_EXPORT void Error(const char *str);

-extern _X_EXPORT void LogPrintMarkers(void);

-

-extern _X_EXPORT void xorg_backtrace(void);

-

-#endif /* OS_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.
+
+******************************************************************/
+
+
+#ifndef OS_H
+#define OS_H
+
+#include "misc.h"
+#include <stdarg.h>
+#include <string.h>
+
+#define SCREEN_SAVER_ON   0
+#define SCREEN_SAVER_OFF  1
+#define SCREEN_SAVER_FORCER 2
+#define SCREEN_SAVER_CYCLE  3
+
+#ifndef MAX_REQUEST_SIZE
+#define MAX_REQUEST_SIZE 65535
+#endif
+#ifndef MAX_BIG_REQUEST_SIZE
+#define MAX_BIG_REQUEST_SIZE 4194303
+#endif
+
+typedef struct _FontPathRec *FontPathPtr;
+typedef struct _NewClientRec *NewClientPtr;
+
+#ifndef xalloc
+#define xnfalloc(size) XNFalloc((unsigned long)(size))
+#define xnfcalloc(_num, _size) XNFcalloc((unsigned long)(_num)*(unsigned long)(_size))
+#define xnfrealloc(ptr, size) XNFrealloc((pointer)(ptr), (unsigned long)(size))
+
+#define xalloc(size) Xalloc((unsigned long)(size))
+#define xcalloc(_num, _size) Xcalloc((unsigned long)(_num)*(unsigned long)(_size))
+#define xrealloc(ptr, size) Xrealloc((pointer)(ptr), (unsigned long)(size))
+#define xfree(ptr) Xfree((pointer)(ptr))
+#define xstrdup(s) Xstrdup(s)
+#define xnfstrdup(s) XNFstrdup(s)
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+
+#ifdef DDXBEFORERESET
+extern void ddxBeforeReset (void);
+#endif
+
+#ifdef DDXOSVERRORF
+extern _X_EXPORT void (*OsVendorVErrorFProc)(const char *, va_list args);
+#endif
+
+extern _X_EXPORT int WaitForSomething(
+    int* /*pClientsReady*/
+);
+
+extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client*/);
+
+extern _X_EXPORT Bool InsertFakeRequest(
+    ClientPtr /*client*/, 
+    char* /*data*/, 
+    int /*count*/);
+
+extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client*/);
+
+extern _X_EXPORT void FlushAllOutput(void);
+
+extern _X_EXPORT void FlushIfCriticalOutputPending(void);
+
+extern _X_EXPORT void SetCriticalOutputPending(void);
+
+extern _X_EXPORT int WriteToClient(ClientPtr /*who*/, int /*count*/, const void* /*buf*/);
+
+extern _X_EXPORT void ResetOsBuffers(void);
+
+extern _X_EXPORT void InitConnectionLimits(void);
+
+extern _X_EXPORT void NotifyParentProcess(void);
+
+extern _X_EXPORT void CreateWellKnownSockets(void);
+
+extern _X_EXPORT void ResetWellKnownSockets(void);
+
+extern _X_EXPORT void CloseWellKnownConnections(void);
+
+extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
+
+extern _X_EXPORT char *ClientAuthorized(
+    ClientPtr /*client*/,
+    unsigned int /*proto_n*/,
+    char* /*auth_proto*/,
+    unsigned int /*string_n*/,
+    char* /*auth_string*/);
+
+extern _X_EXPORT Bool EstablishNewConnections(
+    ClientPtr /*clientUnused*/,
+    pointer /*closure*/);
+
+extern _X_EXPORT void CheckConnections(void);
+
+extern _X_EXPORT void CloseDownConnection(ClientPtr /*client*/);
+
+extern _X_EXPORT void AddGeneralSocket(int /*fd*/);
+
+extern _X_EXPORT void RemoveGeneralSocket(int /*fd*/);
+
+extern _X_EXPORT void AddEnabledDevice(int /*fd*/);
+
+extern _X_EXPORT void RemoveEnabledDevice(int /*fd*/);
+
+extern _X_EXPORT int OnlyListenToOneClient(ClientPtr /*client*/);
+
+extern _X_EXPORT void ListenToAllClients(void);
+
+extern _X_EXPORT void IgnoreClient(ClientPtr /*client*/);
+
+extern _X_EXPORT void AttendClient(ClientPtr /*client*/);
+
+extern _X_EXPORT void MakeClientGrabImpervious(ClientPtr /*client*/);
+
+extern _X_EXPORT void MakeClientGrabPervious(ClientPtr /*client*/);
+
+#ifdef XQUARTZ
+extern void ListenOnOpenFD(int /* fd */, int /* noxauth */);
+#endif
+
+extern _X_EXPORT CARD32 GetTimeInMillis(void);
+
+extern _X_EXPORT void AdjustWaitForDelay(
+    pointer /*waitTime*/,
+    unsigned long /*newdelay*/);
+
+typedef	struct _OsTimerRec *OsTimerPtr;
+
+typedef CARD32 (*OsTimerCallback)(
+    OsTimerPtr /* timer */,
+    CARD32 /* time */,
+    pointer /* arg */);
+
+extern _X_EXPORT void TimerInit(void);
+
+extern _X_EXPORT Bool TimerForce(OsTimerPtr /* timer */);
+
+#define TimerAbsolute (1<<0)
+#define TimerForceOld (1<<1)
+
+extern _X_EXPORT OsTimerPtr TimerSet(
+    OsTimerPtr /* timer */,
+    int /* flags */,
+    CARD32 /* millis */,
+    OsTimerCallback /* func */,
+    pointer /* arg */);
+
+extern _X_EXPORT void TimerCheck(void);
+extern _X_EXPORT void TimerCancel(OsTimerPtr /* pTimer */);
+extern _X_EXPORT void TimerFree(OsTimerPtr /* pTimer */);
+
+extern _X_EXPORT void SetScreenSaverTimer(void);
+extern _X_EXPORT void FreeScreenSaverTimer(void);
+
+extern _X_EXPORT void AutoResetServer(int /*sig*/);
+
+extern _X_EXPORT void GiveUp(int /*sig*/);
+
+extern _X_EXPORT void UseMsg(void);
+
+extern _X_EXPORT void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
+
+extern _X_EXPORT int set_font_authorizations(
+    char ** /* authorizations */, 
+    int * /*authlen */, 
+    pointer /* client */);
+
+#ifndef _HAVE_XALLOC_DECLS
+#define _HAVE_XALLOC_DECLS
+
+/*
+ * Use malloc(3) instead.
+ */
+extern _X_EXPORT void *Xalloc(unsigned long /*amount*/) _X_DEPRECATED;
+/*
+ * Use calloc(3) instead
+ */
+extern _X_EXPORT void *Xcalloc(unsigned long /*amount*/) _X_DEPRECATED;
+/*
+ * Use realloc(3) instead
+ */
+extern _X_EXPORT void *Xrealloc(void * /*ptr*/, unsigned long /*amount*/)
+    _X_DEPRECATED;
+/*
+ * Use free(3) instead
+ */
+extern _X_EXPORT void Xfree(void * /*ptr*/) _X_DEPRECATED;
+
+#endif
+
+/*
+ * This function malloc(3)s buffer, terminating the server if there is not
+ * enough memory.
+ */
+extern _X_EXPORT void *XNFalloc(unsigned long /*amount*/);
+/*
+ * This function calloc(3)s buffer, terminating the server if there is not
+ * enough memory.
+ */
+extern _X_EXPORT void *XNFcalloc(unsigned long /*amount*/);
+/*
+ * This function realloc(3)s passed buffer, terminating the server if there is
+ * not enough memory.
+ */
+extern _X_EXPORT void *XNFrealloc(void * /*ptr*/, unsigned long /*amount*/);
+
+/*
+ * This function strdup(3)s passed string. The only difference from the library
+ * function that it is safe to pass NULL, as NULL will be returned.
+ */
+extern _X_EXPORT char *Xstrdup(const char *s);
+
+/*
+ * This function strdup(3)s passed string, terminating the server if there is
+ * not enough memory. If NULL is passed to this function, NULL is returned.
+ */
+extern _X_EXPORT char *XNFstrdup(const char *s);
+
+/* Include new X*asprintf API */
+#include "Xprintf.h"
+
+/* Older api deprecated in favor of the asprintf versions */
+extern _X_EXPORT char *Xprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED;
+extern _X_EXPORT char *Xvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED;
+extern _X_EXPORT char *XNFprintf(const char *fmt, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_DEPRECATED;
+extern _X_EXPORT char *XNFvprintf(const char *fmt, va_list va)_X_ATTRIBUTE_PRINTF(1,0) _X_DEPRECATED;
+
+typedef void (*OsSigHandlerPtr)(int /* sig */);
+typedef int (*OsSigWrapperPtr)(int /* sig */);
+
+extern _X_EXPORT OsSigHandlerPtr OsSignal(int /* sig */, OsSigHandlerPtr /* handler */);
+extern _X_EXPORT OsSigWrapperPtr OsRegisterSigWrapper(OsSigWrapperPtr newWrap);
+
+extern _X_EXPORT int auditTrailLevel;
+
+extern _X_EXPORT void LockServer(void);
+extern _X_EXPORT void UnlockServer(void);
+
+extern _X_EXPORT int OsLookupColor(
+    int	/*screen*/,
+    char * /*name*/,
+    unsigned /*len*/,
+    unsigned short * /*pred*/,
+    unsigned short * /*pgreen*/,
+    unsigned short * /*pblue*/);
+
+extern _X_EXPORT void OsInit(void);
+
+extern _X_EXPORT void OsCleanup(Bool);
+
+extern _X_EXPORT void OsVendorFatalError(void);
+
+extern _X_EXPORT void OsVendorInit(void);
+
+extern _X_EXPORT void OsBlockSignals (void);
+
+extern _X_EXPORT void OsReleaseSignals (void);
+
+extern _X_EXPORT void OsAbort (void) _X_NORETURN;
+
+#if !defined(WIN32)
+extern _X_EXPORT int System(char *);
+extern _X_EXPORT pointer Popen(char *, char *);
+extern _X_EXPORT int Pclose(pointer);
+extern _X_EXPORT pointer Fopen(char *, char *);
+extern _X_EXPORT int Fclose(pointer);
+#else
+#define System(a) system(a)
+#define Popen(a,b) popen(a,b)
+#define Pclose(a) pclose(a)
+#define Fopen(a,b) fopen(a,b)
+#define Fclose(a) fclose(a)
+#endif
+
+extern _X_EXPORT void CheckUserParameters(int argc, char **argv, char **envp);
+extern _X_EXPORT void CheckUserAuthorization(void);
+
+extern _X_EXPORT int AddHost(
+    ClientPtr	/*client*/,
+    int         /*family*/,
+    unsigned    /*length*/,
+    const void */*pAddr*/);
+
+extern _X_EXPORT Bool ForEachHostInFamily (
+    int	    /*family*/,
+    Bool    (* /*func*/ )(
+            unsigned char * /* addr */,
+            short           /* len */,
+            pointer         /* closure */),
+    pointer /*closure*/);
+
+extern _X_EXPORT int RemoveHost(
+    ClientPtr	/*client*/,
+    int         /*family*/,
+    unsigned    /*length*/,
+    pointer     /*pAddr*/);
+
+extern _X_EXPORT int GetHosts(
+    pointer * /*data*/,
+    int	    * /*pnHosts*/,
+    int	    * /*pLen*/,
+    BOOL    * /*pEnabled*/);
+
+typedef struct sockaddr * sockaddrPtr;
+
+extern _X_EXPORT int InvalidHost(sockaddrPtr /*saddr*/, int /*len*/, ClientPtr client);
+
+extern _X_EXPORT int LocalClient(ClientPtr /* client */);
+
+extern _X_EXPORT int LocalClientCred(ClientPtr, int *, int *);
+
+#define LCC_UID_SET	(1 << 0)
+#define LCC_GID_SET	(1 << 1)
+#define LCC_PID_SET	(1 << 2)
+#define LCC_ZID_SET	(1 << 3)
+
+typedef struct {
+    int fieldsSet;	/* Bit mask of fields set */
+    int	euid;		/* Effective uid */
+    int egid;		/* Primary effective group id */
+    int nSuppGids;	/* Number of supplementary group ids */
+    int *pSuppGids;	/* Array of supplementary group ids */
+    int pid;		/* Process id */
+    int zoneid;		/* Only set on Solaris 10 & later */
+} LocalClientCredRec;
+
+extern _X_EXPORT int GetLocalClientCreds(ClientPtr, LocalClientCredRec **);
+extern _X_EXPORT void FreeLocalClientCreds(LocalClientCredRec *);
+
+extern _X_EXPORT int ChangeAccessControl(ClientPtr /*client*/, int /*fEnabled*/);
+
+extern _X_EXPORT int GetAccessControl(void);
+
+
+extern _X_EXPORT void AddLocalHosts(void);
+
+extern _X_EXPORT void ResetHosts(char *display);
+
+extern _X_EXPORT void EnableLocalHost(void);
+
+extern _X_EXPORT void DisableLocalHost(void);
+
+extern _X_EXPORT void AccessUsingXdmcp(void);
+
+extern _X_EXPORT void DefineSelf(int /*fd*/);
+
+#if XDMCP
+extern _X_EXPORT void AugmentSelf(pointer /*from*/, int /*len*/);
+
+extern _X_EXPORT void RegisterAuthorizations(void);
+#endif
+
+extern _X_EXPORT void InitAuthorization(char * /*filename*/);
+
+/* extern int LoadAuthorization(void); */
+
+extern _X_EXPORT int AuthorizationFromID (
+	XID 		id,
+	unsigned short	*name_lenp,
+	char		**namep,
+	unsigned short	*data_lenp,
+	char		**datap);
+
+extern _X_EXPORT XID CheckAuthorization(
+    unsigned int /*namelength*/,
+    const char * /*name*/,
+    unsigned int /*datalength*/,
+    const char * /*data*/,
+    ClientPtr /*client*/,
+    char ** /*reason*/
+);
+
+extern _X_EXPORT void ResetAuthorization(void);
+
+extern _X_EXPORT int RemoveAuthorization (
+    unsigned short	name_length,
+    const char		*name,
+    unsigned short	data_length,
+    const char		*data);
+
+extern _X_EXPORT int AddAuthorization(
+    unsigned int	/*name_length*/,
+    const char *	/*name*/,
+    unsigned int	/*data_length*/,
+    char *		/*data*/);
+
+#ifdef XCSECURITY
+extern _X_EXPORT XID GenerateAuthorization(
+    unsigned int   /* name_length */,
+    const char	*  /* name */,
+    unsigned int   /* data_length */,
+    const char	*  /* data */,
+    unsigned int * /* data_length_return */,
+    char	** /* data_return */);
+#endif
+
+extern _X_EXPORT int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
+
+extern _X_EXPORT void ddxUseMsg(void);
+
+/* stuff for ReplyCallback */
+extern _X_EXPORT CallbackListPtr ReplyCallback;
+typedef struct {
+    ClientPtr client;
+    const void *replyData;
+    unsigned long dataLenBytes;
+    unsigned long bytesRemaining;
+    Bool startOfReply;
+} ReplyInfoRec;
+
+/* stuff for FlushCallback */
+extern _X_EXPORT CallbackListPtr FlushCallback;
+
+extern _X_EXPORT void AbortDDX(void);
+extern _X_EXPORT void ddxGiveUp(void);
+extern _X_EXPORT int TimeSinceLastInputEvent(void);
+
+/* strcasecmp.c */
+#if NEED_STRCASECMP
+#define strcasecmp xstrcasecmp
+extern _X_EXPORT int xstrcasecmp(const char *s1, const char *s2);
+#endif
+
+#if NEED_STRNCASECMP
+#define strncasecmp xstrncasecmp
+extern _X_EXPORT int xstrncasecmp(const char *s1, const char *s2, size_t n);
+#endif
+
+#if NEED_STRCASESTR
+#define strcasestr xstrcasestr
+extern _X_EXPORT char *xstrcasestr(const char *s, const char *find);
+#endif
+
+#ifndef HAS_STRLCPY
+extern _X_EXPORT size_t strlcpy(char *dst, const char *src, size_t siz);
+extern _X_EXPORT size_t strlcat(char *dst, const char *src, size_t siz);
+#endif
+
+/* Logging. */
+typedef enum _LogParameter {
+    XLOG_FLUSH,
+    XLOG_SYNC,
+    XLOG_VERBOSITY,
+    XLOG_FILE_VERBOSITY
+} LogParameter;
+
+/* Flags for log messages. */
+typedef enum {
+    X_PROBED,			/* Value was probed */
+    X_CONFIG,			/* Value was given in the config file */
+    X_DEFAULT,			/* Value is a default */
+    X_CMDLINE,			/* Value was given on the command line */
+    X_NOTICE,			/* Notice */
+    X_ERROR,			/* Error message */
+    X_WARNING,			/* Warning message */
+    X_INFO,			/* Informational message */
+    X_NONE,			/* No prefix */
+    X_NOT_IMPLEMENTED,		/* Not implemented */
+    X_UNKNOWN = -1		/* unknown -- this must always be last */
+} MessageType;
+
+extern _X_EXPORT const char *LogInit(const char *fname, const char *backup);
+extern _X_EXPORT void LogClose(void);
+extern _X_EXPORT Bool LogSetParameter(LogParameter param, int value);
+extern _X_EXPORT void LogVWrite(int verb, const char *f, va_list args) _X_ATTRIBUTE_PRINTF(2,0);
+extern _X_EXPORT void LogWrite(int verb, const char *f, ...) _X_ATTRIBUTE_PRINTF(2,3);
+extern _X_EXPORT void LogVMessageVerb(MessageType type, int verb, const char *format,
+			    va_list args) _X_ATTRIBUTE_PRINTF(3,0);
+extern _X_EXPORT void LogMessageVerb(MessageType type, int verb, const char *format,
+			   ...) _X_ATTRIBUTE_PRINTF(3,4);
+extern _X_EXPORT void LogMessage(MessageType type, const char *format, ...)
+			_X_ATTRIBUTE_PRINTF(2,3);
+extern _X_EXPORT void FreeAuditTimer(void);
+extern _X_EXPORT void AuditF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern _X_EXPORT void VAuditF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);
+extern _X_EXPORT void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
+
+#ifdef DEBUG
+#define DebugF ErrorF
+#else
+#define DebugF(...) /* */
+#endif
+
+extern _X_EXPORT void VErrorF(const char *f, va_list args) _X_ATTRIBUTE_PRINTF(1,0);
+extern _X_EXPORT void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
+extern _X_EXPORT void Error(const char *str);
+extern _X_EXPORT void LogPrintMarkers(void);
+
+extern _X_EXPORT void xorg_backtrace(void);
+
+#endif /* OS_H */
diff --git a/xorg-server/include/regionstr.h b/xorg-server/include/regionstr.h
index 3759fe17b..3dfef5c83 100644
--- a/xorg-server/include/regionstr.h
+++ b/xorg-server/include/regionstr.h
@@ -132,6 +132,11 @@ static inline void RegionInit(RegionPtr _pReg, BoxPtr _rect, int _size)
     }
 }
 
+static inline Bool RegionInitBoxes(RegionPtr pReg, BoxPtr boxes, int nBoxes)
+{
+    return pixman_region_init_rects (pReg, boxes, nBoxes);
+}
+
 static inline void RegionUninit(RegionPtr _pReg)
 {
     if ((_pReg)->data && (_pReg)->data->size) {