svn merge -r588:HEAD ^/branches/released .

5 files changed, 677 insertions, 690 deletions

diff --git a/xorg-server/xfixes/cursor.c b/xorg-server/xfixes/cursor.c
index a44356fe9..0d7213a48 100644
--- a/xorg-server/xfixes/cursor.c
+++ b/xorg-server/xfixes/cursor.c
@@ -198,7 +198,7 @@ CursorCloseScreen (int index, ScreenPtr pScreen)
     Unwrap (cs, pScreen, DisplayCursor, display_proc);

     deleteCursorHideCountsForScreen(pScreen);

     ret = (*pScreen->CloseScreen) (index, pScreen);

-    xfree (cs);

+    free(cs);

     return ret;

 }

 

@@ -231,7 +231,7 @@ XFixesSelectCursorInput (ClientPtr	pClient,
     }

     if (!e)

     {

-	e = (CursorEventPtr) xalloc (sizeof (CursorEventRec));

+	e = (CursorEventPtr) malloc(sizeof (CursorEventRec));

 	if (!e)

 	    return BadAlloc;

 

@@ -251,7 +251,7 @@ XFixesSelectCursorInput (ClientPtr	pClient,
 	    if (!AddResource (pWindow->drawable.id, CursorWindowType,

 			      (pointer) pWindow))

 	    {

-		xfree (e);

+		free(e);

 		return BadAlloc;

 	    }

 

@@ -391,7 +391,7 @@ ProcXFixesGetCursorImage (ClientPtr client)
     width = pCursor->bits->width;

     height = pCursor->bits->height;

     npixels = width * height;

-    rep = xalloc (sizeof (xXFixesGetCursorImageReply) +

+    rep = malloc(sizeof (xXFixesGetCursorImageReply) +

 		  npixels * sizeof (CARD32));

     if (!rep)

 	return BadAlloc;

@@ -425,8 +425,8 @@ ProcXFixesGetCursorImage (ClientPtr client)
     }

     WriteToClient(client, sizeof (xXFixesGetCursorImageReply) +

 			 (npixels << 2), (char *) rep);

-    xfree (rep);

-    return client->noClientException;

+    free(rep);

+    return Success;

 }

 

 int

@@ -454,7 +454,7 @@ ProcXFixesSetCursorName (ClientPtr client)
 	return BadAlloc;

     

     pCursor->name = atom;

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -503,7 +503,7 @@ ProcXFixesGetCursorName (ClientPtr client)
     WriteReplyToClient(client, sizeof(xXFixesGetCursorNameReply), &reply);

     WriteToClient(client, len, str);

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -546,7 +546,7 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     name = pCursor->name ? NameForAtom (pCursor->name) : "";

     nbytes = strlen (name);

     nbytesRound = pad_to_int32(nbytes);

-    rep = xalloc (sizeof (xXFixesGetCursorImageAndNameReply) +

+    rep = malloc(sizeof (xXFixesGetCursorImageAndNameReply) +

 		  npixels * sizeof (CARD32) + nbytesRound);

     if (!rep)

 	return BadAlloc;

@@ -585,8 +585,8 @@ ProcXFixesGetCursorImageAndName (ClientPtr client)
     }

     WriteToClient(client, sizeof (xXFixesGetCursorImageAndNameReply) +

 			 (npixels << 2) + nbytesRound, (char *) rep);

-    xfree (rep);

-    return client->noClientException;

+    free(rep);

+    return Success;

 }

 

 int

@@ -721,7 +721,7 @@ ProcXFixesChangeCursor (ClientPtr client)
 		   DixWriteAccess|DixSetAttrAccess);

 

     ReplaceCursor (pSource, TestForCursor, (pointer) pDestination);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -759,7 +759,7 @@ ProcXFixesChangeCursorByName (ClientPtr client)
     name = MakeAtom (tchar, stuff->nbytes, FALSE);

     if (name)

 	ReplaceCursor (pSource, TestForCursorName, &name);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -803,7 +803,7 @@ createCursorHideCount (ClientPtr pClient, ScreenPtr pScreen)
     CursorScreenPtr    cs = GetCursorScreen(pScreen);

     CursorHideCountPtr pChc;

 

-    pChc = (CursorHideCountPtr) xalloc(sizeof(CursorHideCountRec));

+    pChc = (CursorHideCountPtr) malloc(sizeof(CursorHideCountRec));

     if (pChc == NULL) {

 	return BadAlloc;

     }

@@ -820,7 +820,7 @@ createCursorHideCount (ClientPtr pClient, ScreenPtr pScreen)
      */

     if (!AddResource (pChc->resource, CursorHideCountType, 

 		      (pointer) pChc)) {

-	xfree(pChc);

+	free(pChc);

 	return BadAlloc;

     }

 

@@ -841,7 +841,7 @@ deleteCursorHideCount (CursorHideCountPtr pChcToDel, ScreenPtr pScreen)
     while (pChc != NULL) {

 	pNext = pChc->pNext;

 	if (pChc == pChcToDel) {

-	    xfree(pChc);

+	    free(pChc);

 	    if (pChcLast == NULL) {

 		cs->pCursorHideCounts = pNext;

 	    } else {

@@ -897,7 +897,7 @@ ProcXFixesHideCursor (ClientPtr client)
     pChc = findCursorHideCount(client, pWin->drawable.pScreen);

     if (pChc != NULL) {

 	pChc->hideCount++;

-	return client->noClientException;

+	return Success;

     }

 

     /* 

@@ -971,7 +971,7 @@ ProcXFixesShowCursor (ClientPtr client)
 	FreeResource(pChc->resource, 0);

     }

 

-    return (client->noClientException);

+    return Success;

 }

 

 int 

@@ -997,7 +997,7 @@ CursorFreeClient (pointer data, XID id)
 	if (e == old)

 	{

 	    *prev = e->next;

-	    xfree (e);

+	    free(e);

 	    break;

 	}

     }

@@ -1045,8 +1045,8 @@ createInvisibleCursor (void)
     unsigned char *psrcbits, *pmaskbits;

     CursorMetricRec cm;

 

-    psrcbits = (unsigned char *) xcalloc(4, 1);

-    pmaskbits = (unsigned char *) xcalloc(4, 1);

+    psrcbits = (unsigned char *) calloc(4, 1);

+    pmaskbits = (unsigned char *) calloc(4, 1);

     if (psrcbits == NULL || pmaskbits == NULL) {

 	return NULL;

     }

@@ -1082,7 +1082,7 @@ XFixesCursorInit (void)
 	ScreenPtr	pScreen = screenInfo.screens[i];

 	CursorScreenPtr	cs;

 

-	cs = (CursorScreenPtr) xalloc (sizeof (CursorScreenRec));

+	cs = (CursorScreenPtr) malloc(sizeof (CursorScreenRec));

 	if (!cs)

 	    return FALSE;

 	Wrap (cs, pScreen, CloseScreen, CursorCloseScreen);

diff --git a/xorg-server/xfixes/region.c b/xorg-server/xfixes/region.c
index dc050c9fc..2276ab8b6 100644
--- a/xorg-server/xfixes/region.c
+++ b/xorg-server/xfixes/region.c
@@ -87,7 +87,7 @@ ProcXFixesCreateRegion (ClientPtr client)
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

 	return BadAlloc;

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -132,7 +132,7 @@ ProcXFixesCreateRegionFromBitmap (ClientPtr client)
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

 	return BadAlloc;

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -194,7 +194,7 @@ ProcXFixesCreateRegionFromWindow (ClientPtr client)
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

 	return BadAlloc;

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -244,7 +244,7 @@ ProcXFixesCreateRegionFromGC (ClientPtr client)
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

 	return BadAlloc;

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -291,7 +291,7 @@ ProcXFixesCreateRegionFromPicture (ClientPtr client)
     if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

 	return BadAlloc;

     

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -316,7 +316,7 @@ ProcXFixesDestroyRegion (ClientPtr client)
     REQUEST_SIZE_MATCH(xXFixesDestroyRegionReq);

     VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess);

     FreeResource (stuff->region, RT_NONE);

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -355,7 +355,7 @@ ProcXFixesSetRegion (ClientPtr client)
 	return BadAlloc;

     }

     REGION_DESTROY (0, pNew);

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -383,7 +383,7 @@ ProcXFixesCopyRegion (ClientPtr client)
     if (!REGION_COPY(pScreen, pDestination, pSource))

 	return BadAlloc;

 

-    return(client->noClientException);

+    return Success;

 }

 

 int

@@ -403,7 +403,6 @@ int
 ProcXFixesCombineRegion (ClientPtr client)

 {

     RegionPtr	pSource1, pSource2, pDestination;

-    int		ret = Success;

     REQUEST (xXFixesCombineRegionReq);

 

     REQUEST_SIZE_MATCH (xXFixesCombineRegionReq);

@@ -414,21 +413,19 @@ ProcXFixesCombineRegion (ClientPtr client)
     switch (stuff->xfixesReqType) {

     case X_XFixesUnionRegion:

 	if (!REGION_UNION (0, pDestination, pSource1, pSource2))

-	    ret = BadAlloc;

+	    return BadAlloc;

 	break;

     case X_XFixesIntersectRegion:

 	if (!REGION_INTERSECT (0, pDestination, pSource1, pSource2))

-	    ret = BadAlloc;

+	    return BadAlloc;

 	break;

     case X_XFixesSubtractRegion:

 	if (!REGION_SUBTRACT (0, pDestination, pSource1, pSource2))

-	    ret = BadAlloc;

+	    return BadAlloc;

 	break;

     }

     

-    if (ret == Success) 

-	ret = client->noClientException;

-    return ret;

+    return Success;

 }

 

 int

@@ -450,7 +447,6 @@ ProcXFixesInvertRegion (ClientPtr client)
 {

     RegionPtr	pSource, pDestination;

     BoxRec	bounds;

-    int		ret = Success;

     REQUEST(xXFixesInvertRegionReq);

 

     REQUEST_SIZE_MATCH(xXFixesInvertRegionReq);

@@ -471,11 +467,9 @@ ProcXFixesInvertRegion (ClientPtr client)
 	bounds.y2 = stuff->y + stuff->height;

 

     if (!REGION_INVERSE(0, pDestination, pSource, &bounds))

-	ret = BadAlloc;

+	return BadAlloc;

 

-    if (ret == Success)

-	ret = client->noClientException;

-    return ret;

+    return Success;

 }

 

 int

@@ -505,7 +499,7 @@ ProcXFixesTranslateRegion (ClientPtr client)
     VERIFY_REGION(pRegion, stuff->region, client, DixWriteAccess);

 

     REGION_TRANSLATE(pScreen, pRegion, stuff->dx, stuff->dy);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -534,7 +528,7 @@ ProcXFixesRegionExtents (ClientPtr client)
 

     REGION_RESET (0, pDestination, REGION_EXTENTS (0, pSource));

 

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -568,7 +562,7 @@ ProcXFixesFetchRegion (ClientPtr client)
     pBox = REGION_RECTS (pRegion);

     nBox = REGION_NUM_RECTS (pRegion);

     

-    reply = xalloc (sizeof (xXFixesFetchRegionReply) +

+    reply = malloc(sizeof (xXFixesFetchRegionReply) +

 		    nBox * sizeof (xRectangle));

     if (!reply)

 	return BadAlloc;

@@ -601,8 +595,8 @@ ProcXFixesFetchRegion (ClientPtr client)
     }

     (void) WriteToClient(client, sizeof (xXFixesFetchRegionReply) +

 			 nBox * sizeof (xRectangle), (char *) reply);

-    xfree (reply);

-    return (client->noClientException);

+    free(reply);

+    return Success;

 }

 

 int

@@ -622,7 +616,7 @@ ProcXFixesSetGCClipRegion (ClientPtr client)
 {

     GCPtr	pGC;

     RegionPtr	pRegion;

-    XID		vals[2];

+    ChangeGCVal	vals[2];

     int		rc;

     REQUEST(xXFixesSetGCClipRegionReq);

     REQUEST_SIZE_MATCH(xXFixesSetGCClipRegionReq);

@@ -640,12 +634,12 @@ ProcXFixesSetGCClipRegion (ClientPtr client)
 	    return BadAlloc;

     }

     

-    vals[0] = stuff->xOrigin;

-    vals[1] = stuff->yOrigin;

-    DoChangeGC (pGC, GCClipXOrigin|GCClipYOrigin, vals, 0);

+    vals[0].val = stuff->xOrigin;

+    vals[1].val = stuff->yOrigin;

+    ChangeGC (NullClient, pGC, GCClipXOrigin|GCClipYOrigin, vals);

     (*pGC->funcs->ChangeClip)(pGC, pRegion ? CT_REGION : CT_NONE, (pointer)pRegion, 0);

 

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -741,7 +735,7 @@ ProcXFixesSetWindowShapeRegion (ClientPtr client)
     *pDestRegion = pRegion;

     (*pScreen->SetShape) (pWin);

     SendShapeNotify (pWin, stuff->destKind);

-    return (client->noClientException);

+    return Success;

 }

 

 int

@@ -797,7 +791,6 @@ int
 ProcXFixesExpandRegion (ClientPtr client)

 {

     RegionPtr	pSource, pDestination;

-    int		ret = Success;

     REQUEST (xXFixesExpandRegionReq);

     BoxPtr	pTmp;

     BoxPtr	pSrc;

@@ -812,7 +805,7 @@ ProcXFixesExpandRegion (ClientPtr client)
     pSrc = REGION_RECTS(pSource);

     if (nBoxes)

     {

-	pTmp = xalloc (nBoxes * sizeof (BoxRec));

+	pTmp = malloc(nBoxes * sizeof (BoxRec));

 	if (!pTmp)

 	    return BadAlloc;

 	for (i = 0; i < nBoxes; i++)

@@ -829,11 +822,9 @@ ProcXFixesExpandRegion (ClientPtr client)
 	    REGION_INIT (pScreen, &r, &pTmp[i], 0);

 	    REGION_UNION (pScreen, pDestination, pDestination, &r);

 	}

-	xfree(pTmp);

+	free(pTmp);

     }

-    if (ret == Success) 

-	ret = client->noClientException;

-    return ret;

+    return Success;

 }

 

 int

diff --git a/xorg-server/xfixes/saveset.c b/xorg-server/xfixes/saveset.c
index 29de0d8f2..72bbb4952 100644
--- a/xorg-server/xfixes/saveset.c
+++ b/xorg-server/xfixes/saveset.c
@@ -1,76 +1,72 @@
-/*
- * Copyright © 2002 Keith Packard
- *
- * 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 the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "xfixesint.h"
-
-int
-ProcXFixesChangeSaveSet(ClientPtr client)
-{
-    Bool	toRoot, map;
-    int		result;
-    WindowPtr	pWin;
-    REQUEST(xXFixesChangeSaveSetReq);
-		  
-    REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);
-    result = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);
-    if (result != Success)
-        return result;
-    if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))
-        return BadMatch;
-    if ((stuff->mode != SetModeInsert) && (stuff->mode != SetModeDelete))
-    {
-	client->errorValue = stuff->mode;
-	return( BadValue );
-    }
-    if ((stuff->target != SaveSetNearest) && (stuff->target != SaveSetRoot))
-    {
-	client->errorValue = stuff->target;
-	return( BadValue );
-    }
-    if ((stuff->map != SaveSetMap) && (stuff->map != SaveSetUnmap))
-    {
-	client->errorValue = stuff->map;
-	return( BadValue );
-    }
-    toRoot = (stuff->target == SaveSetRoot);
-    map = (stuff->map == SaveSetMap);
-    result = AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map);
-    if (client->noClientException != Success)
-	return(client->noClientException);
-    else
-	return(result);
-}
-
-int
-SProcXFixesChangeSaveSet(ClientPtr client)
-{
-    register int n;
-    REQUEST(xXFixesChangeSaveSetReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    return (*ProcXFixesVector[stuff->xfixesReqType])(client);
-}
+/*

+ * Copyright © 2002 Keith Packard

+ *

+ * 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 the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "xfixesint.h"

+

+int

+ProcXFixesChangeSaveSet(ClientPtr client)

+{

+    Bool	toRoot, map;

+    int		result;

+    WindowPtr	pWin;

+    REQUEST(xXFixesChangeSaveSetReq);

+		  

+    REQUEST_SIZE_MATCH(xXFixesChangeSaveSetReq);

+    result = dixLookupWindow(&pWin, stuff->window, client, DixManageAccess);

+    if (result != Success)

+        return result;

+    if (client->clientAsMask == (CLIENT_BITS(pWin->drawable.id)))

+        return BadMatch;

+    if ((stuff->mode != SetModeInsert) && (stuff->mode != SetModeDelete))

+    {

+	client->errorValue = stuff->mode;

+	return( BadValue );

+    }

+    if ((stuff->target != SaveSetNearest) && (stuff->target != SaveSetRoot))

+    {

+	client->errorValue = stuff->target;

+	return( BadValue );

+    }

+    if ((stuff->map != SaveSetMap) && (stuff->map != SaveSetUnmap))

+    {

+	client->errorValue = stuff->map;

+	return( BadValue );

+    }

+    toRoot = (stuff->target == SaveSetRoot);

+    map = (stuff->map == SaveSetMap);

+    return AlterSaveSetForClient(client, pWin, stuff->mode, toRoot, map);

+}

+

+int

+SProcXFixesChangeSaveSet(ClientPtr client)

+{

+    register int n;

+    REQUEST(xXFixesChangeSaveSetReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    return (*ProcXFixesVector[stuff->xfixesReqType])(client);

+}

diff --git a/xorg-server/xfixes/select.c b/xorg-server/xfixes/select.c
index 5ba7896cb..044294ee1 100644
--- a/xorg-server/xfixes/select.c
+++ b/xorg-server/xfixes/select.c
@@ -1,292 +1,292 @@
-/*
- * Copyright © 2002 Keith Packard
- *
- * 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 the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "xfixesint.h"
-#include "xace.h"
-
-static RESTYPE		SelectionClientType, SelectionWindowType;
-static Bool		SelectionCallbackRegistered = FALSE;
-
-/*
- * There is a global list of windows selecting for selection events
- * on every selection.  This should be plenty efficient for the
- * expected usage, if it does become a problem, it should be easily
- * replaced with a hash table of some kind keyed off the selection atom
- */
-
-typedef struct _SelectionEvent *SelectionEventPtr;
-
-typedef struct _SelectionEvent {
-    SelectionEventPtr	next;
-    Atom		selection;
-    CARD32		eventMask;
-    ClientPtr		pClient;
-    WindowPtr		pWindow;
-    XID			clientResource;
-} SelectionEventRec;
-
-static SelectionEventPtr	selectionEvents;
-
-static void
-XFixesSelectionCallback (CallbackListPtr *callbacks, pointer data, pointer args)
-{
-    SelectionEventPtr	e;
-    SelectionInfoRec	*info = (SelectionInfoRec *) args;
-    Selection		*selection = info->selection;
-    int			subtype;
-    CARD32		eventMask;
-    
-    switch (info->kind) {
-    case SelectionSetOwner:
-	subtype = XFixesSetSelectionOwnerNotify;
-	eventMask = XFixesSetSelectionOwnerNotifyMask;
-	break;
-    case SelectionWindowDestroy:
-	subtype = XFixesSelectionWindowDestroyNotify;
-	eventMask = XFixesSelectionWindowDestroyNotifyMask;
-	break;
-    case SelectionClientClose:
-	subtype = XFixesSelectionClientCloseNotify;
-	eventMask = XFixesSelectionClientCloseNotifyMask;
-	break;
-    default:
-	return;
-    }
-    for (e = selectionEvents; e; e = e->next)
-    {
-	if (e->selection == selection->selection && 
-	    (e->eventMask & eventMask) &&
-	    !e->pClient->clientGone)
-	{
-	    xXFixesSelectionNotifyEvent	ev;
-
-	    memset(&ev, 0, sizeof(xXFixesSelectionNotifyEvent));
-	    ev.type = XFixesEventBase + XFixesSelectionNotify;
-	    ev.subtype = subtype;
-	    ev.sequenceNumber = e->pClient->sequence;
-	    ev.window = e->pWindow->drawable.id;
-	    if (subtype == XFixesSetSelectionOwnerNotify)
-		ev.owner = selection->window;
-	    else
-		ev.owner = 0;
-	    ev.selection = e->selection;
-	    ev.timestamp = currentTime.milliseconds;
-	    ev.selectionTimestamp = selection->lastTimeChanged.milliseconds;
-	    WriteEventsToClient (e->pClient, 1, (xEvent *) &ev);
-	}
-    }
-}
-
-static Bool
-CheckSelectionCallback (void)
-{
-    if (selectionEvents)
-    {
-	if (!SelectionCallbackRegistered)
-	{
-	    if (!AddCallback (&SelectionCallback, XFixesSelectionCallback, NULL))
-		return FALSE;
-	    SelectionCallbackRegistered = TRUE;
-	}
-    }
-    else
-    {
-	if (SelectionCallbackRegistered)
-	{
-	    DeleteCallback (&SelectionCallback, XFixesSelectionCallback, NULL);
-	    SelectionCallbackRegistered = FALSE;
-	}
-    }
-    return TRUE;
-}
-
-#define SelectionAllEvents (XFixesSetSelectionOwnerNotifyMask |\
-			    XFixesSelectionWindowDestroyNotifyMask |\
-			    XFixesSelectionClientCloseNotifyMask)
-
-static int
-XFixesSelectSelectionInput (ClientPtr	pClient,
-			    Atom	selection,
-			    WindowPtr	pWindow,
-			    CARD32	eventMask)
-{
-    pointer val;
-    int rc;
-    SelectionEventPtr	*prev, e;
-
-    rc = XaceHook(XACE_SELECTION_ACCESS, pClient, selection, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    for (prev = &selectionEvents; (e = *prev); prev = &e->next)
-    {
-	if (e->selection == selection &&
-	    e->pClient == pClient &&
-	    e->pWindow == pWindow)
-	{
-	    break;
-	}
-    }
-    if (!eventMask)
-    {
-	if (e)
-	{
-	    FreeResource (e->clientResource, 0);
-	}
-	return Success;
-    }
-    if (!e)
-    {
-	e = (SelectionEventPtr) xalloc (sizeof (SelectionEventRec));
-	if (!e)
-	    return BadAlloc;
-
-	e->next = 0;
-	e->selection = selection;
-	e->pClient = pClient;
-	e->pWindow = pWindow;
-	e->clientResource = FakeClientID(pClient->index);
-
-	/*
-	 * Add a resource hanging from the window to
-	 * catch window destroy
-	 */
-	rc = dixLookupResourceByType (&val, pWindow->drawable.id,
-				      SelectionWindowType, serverClient,
-				      DixGetAttrAccess);
-	if (rc != Success)
-	    if (!AddResource (pWindow->drawable.id, SelectionWindowType,
-			      (pointer) pWindow))
-	    {
-		xfree (e);
-		return BadAlloc;
-	    }
-
-	if (!AddResource (e->clientResource, SelectionClientType, (pointer) e))
-	    return BadAlloc;
-
-	*prev = e;
-	if (!CheckSelectionCallback ())
-	{
-	    FreeResource (e->clientResource, 0);
-	    return BadAlloc;
-	}
-    }
-    e->eventMask = eventMask;
-    return Success;
-}
-
-int
-ProcXFixesSelectSelectionInput (ClientPtr client)
-{
-    REQUEST (xXFixesSelectSelectionInputReq);
-    WindowPtr	pWin;
-    int		rc;
-
-    REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq);
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-    if (rc != Success)
-        return rc;
-    if (stuff->eventMask & ~SelectionAllEvents)
-    {
-	client->errorValue = stuff->eventMask;
-	return( BadValue );
-    }
-    return XFixesSelectSelectionInput (client, stuff->selection,
-				       pWin, stuff->eventMask);
-}
-
-int
-SProcXFixesSelectSelectionInput (ClientPtr client)
-{
-    register int n;
-    REQUEST(xXFixesSelectSelectionInputReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->window, n);
-    swapl(&stuff->selection, n);
-    swapl(&stuff->eventMask, n);
-    return (*ProcXFixesVector[stuff->xfixesReqType])(client);
-}
-    
-void
-SXFixesSelectionNotifyEvent (xXFixesSelectionNotifyEvent *from,
-			     xXFixesSelectionNotifyEvent *to)
-{
-    to->type = from->type;
-    cpswaps (from->sequenceNumber, to->sequenceNumber);
-    cpswapl (from->window, to->window);
-    cpswapl (from->owner, to->owner);
-    cpswapl (from->selection, to->selection);
-    cpswapl (from->timestamp, to->timestamp);
-    cpswapl (from->selectionTimestamp, to->selectionTimestamp);
-}
-
-static int
-SelectionFreeClient (pointer data, XID id)
-{
-    SelectionEventPtr	old = (SelectionEventPtr) data;
-    SelectionEventPtr	*prev, e;
-    
-    for (prev = &selectionEvents; (e = *prev); prev = &e->next)
-    {
-	if (e == old)
-	{
-	    *prev = e->next;
-	    xfree (e);
-	    CheckSelectionCallback ();
-	    break;
-	}
-    }
-    return 1;
-}
-
-static int
-SelectionFreeWindow (pointer data, XID id)
-{
-    WindowPtr		pWindow = (WindowPtr) data;
-    SelectionEventPtr	e, next;
-
-    for (e = selectionEvents; e; e = next)
-    {
-	next = e->next;
-	if (e->pWindow == pWindow)
-	{
-	    FreeResource (e->clientResource, 0);
-	}
-    }
-    return 1;
-}
-
-Bool
-XFixesSelectionInit (void)
-{
-    SelectionClientType = CreateNewResourceType(SelectionFreeClient,
-						"XFixesSelectionClient");
-    SelectionWindowType = CreateNewResourceType(SelectionFreeWindow,
-						"XFixesSelectionWindow");
-    return SelectionClientType && SelectionWindowType;
-}
+/*

+ * Copyright © 2002 Keith Packard

+ *

+ * 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 the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "xfixesint.h"

+#include "xace.h"

+

+static RESTYPE		SelectionClientType, SelectionWindowType;

+static Bool		SelectionCallbackRegistered = FALSE;

+

+/*

+ * There is a global list of windows selecting for selection events

+ * on every selection.  This should be plenty efficient for the

+ * expected usage, if it does become a problem, it should be easily

+ * replaced with a hash table of some kind keyed off the selection atom

+ */

+

+typedef struct _SelectionEvent *SelectionEventPtr;

+

+typedef struct _SelectionEvent {

+    SelectionEventPtr	next;

+    Atom		selection;

+    CARD32		eventMask;

+    ClientPtr		pClient;

+    WindowPtr		pWindow;

+    XID			clientResource;

+} SelectionEventRec;

+

+static SelectionEventPtr	selectionEvents;

+

+static void

+XFixesSelectionCallback (CallbackListPtr *callbacks, pointer data, pointer args)

+{

+    SelectionEventPtr	e;

+    SelectionInfoRec	*info = (SelectionInfoRec *) args;

+    Selection		*selection = info->selection;

+    int			subtype;

+    CARD32		eventMask;

+    

+    switch (info->kind) {

+    case SelectionSetOwner:

+	subtype = XFixesSetSelectionOwnerNotify;

+	eventMask = XFixesSetSelectionOwnerNotifyMask;

+	break;

+    case SelectionWindowDestroy:

+	subtype = XFixesSelectionWindowDestroyNotify;

+	eventMask = XFixesSelectionWindowDestroyNotifyMask;

+	break;

+    case SelectionClientClose:

+	subtype = XFixesSelectionClientCloseNotify;

+	eventMask = XFixesSelectionClientCloseNotifyMask;

+	break;

+    default:

+	return;

+    }

+    for (e = selectionEvents; e; e = e->next)

+    {

+	if (e->selection == selection->selection && 

+	    (e->eventMask & eventMask) &&

+	    !e->pClient->clientGone)

+	{

+	    xXFixesSelectionNotifyEvent	ev;

+

+	    memset(&ev, 0, sizeof(xXFixesSelectionNotifyEvent));

+	    ev.type = XFixesEventBase + XFixesSelectionNotify;

+	    ev.subtype = subtype;

+	    ev.sequenceNumber = e->pClient->sequence;

+	    ev.window = e->pWindow->drawable.id;

+	    if (subtype == XFixesSetSelectionOwnerNotify)

+		ev.owner = selection->window;

+	    else

+		ev.owner = 0;

+	    ev.selection = e->selection;

+	    ev.timestamp = currentTime.milliseconds;

+	    ev.selectionTimestamp = selection->lastTimeChanged.milliseconds;

+	    WriteEventsToClient (e->pClient, 1, (xEvent *) &ev);

+	}

+    }

+}

+

+static Bool

+CheckSelectionCallback (void)

+{

+    if (selectionEvents)

+    {

+	if (!SelectionCallbackRegistered)

+	{

+	    if (!AddCallback (&SelectionCallback, XFixesSelectionCallback, NULL))

+		return FALSE;

+	    SelectionCallbackRegistered = TRUE;

+	}

+    }

+    else

+    {

+	if (SelectionCallbackRegistered)

+	{

+	    DeleteCallback (&SelectionCallback, XFixesSelectionCallback, NULL);

+	    SelectionCallbackRegistered = FALSE;

+	}

+    }

+    return TRUE;

+}

+

+#define SelectionAllEvents (XFixesSetSelectionOwnerNotifyMask |\

+			    XFixesSelectionWindowDestroyNotifyMask |\

+			    XFixesSelectionClientCloseNotifyMask)

+

+static int

+XFixesSelectSelectionInput (ClientPtr	pClient,

+			    Atom	selection,

+			    WindowPtr	pWindow,

+			    CARD32	eventMask)

+{

+    pointer val;

+    int rc;

+    SelectionEventPtr	*prev, e;

+

+    rc = XaceHook(XACE_SELECTION_ACCESS, pClient, selection, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    for (prev = &selectionEvents; (e = *prev); prev = &e->next)

+    {

+	if (e->selection == selection &&

+	    e->pClient == pClient &&

+	    e->pWindow == pWindow)

+	{

+	    break;

+	}

+    }

+    if (!eventMask)

+    {

+	if (e)

+	{

+	    FreeResource (e->clientResource, 0);

+	}

+	return Success;

+    }

+    if (!e)

+    {

+	e = (SelectionEventPtr) malloc(sizeof (SelectionEventRec));

+	if (!e)

+	    return BadAlloc;

+

+	e->next = 0;

+	e->selection = selection;

+	e->pClient = pClient;

+	e->pWindow = pWindow;

+	e->clientResource = FakeClientID(pClient->index);

+

+	/*

+	 * Add a resource hanging from the window to

+	 * catch window destroy

+	 */

+	rc = dixLookupResourceByType (&val, pWindow->drawable.id,

+				      SelectionWindowType, serverClient,

+				      DixGetAttrAccess);

+	if (rc != Success)

+	    if (!AddResource (pWindow->drawable.id, SelectionWindowType,

+			      (pointer) pWindow))

+	    {

+		free(e);

+		return BadAlloc;

+	    }

+

+	if (!AddResource (e->clientResource, SelectionClientType, (pointer) e))

+	    return BadAlloc;

+

+	*prev = e;

+	if (!CheckSelectionCallback ())

+	{

+	    FreeResource (e->clientResource, 0);

+	    return BadAlloc;

+	}

+    }

+    e->eventMask = eventMask;

+    return Success;

+}

+

+int

+ProcXFixesSelectSelectionInput (ClientPtr client)

+{

+    REQUEST (xXFixesSelectSelectionInputReq);

+    WindowPtr	pWin;

+    int		rc;

+

+    REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq);

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

+    if (rc != Success)

+        return rc;

+    if (stuff->eventMask & ~SelectionAllEvents)

+    {

+	client->errorValue = stuff->eventMask;

+	return( BadValue );

+    }

+    return XFixesSelectSelectionInput (client, stuff->selection,

+				       pWin, stuff->eventMask);

+}

+

+int

+SProcXFixesSelectSelectionInput (ClientPtr client)

+{

+    register int n;

+    REQUEST(xXFixesSelectSelectionInputReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->window, n);

+    swapl(&stuff->selection, n);

+    swapl(&stuff->eventMask, n);

+    return (*ProcXFixesVector[stuff->xfixesReqType])(client);

+}

+    

+void

+SXFixesSelectionNotifyEvent (xXFixesSelectionNotifyEvent *from,

+			     xXFixesSelectionNotifyEvent *to)

+{

+    to->type = from->type;

+    cpswaps (from->sequenceNumber, to->sequenceNumber);

+    cpswapl (from->window, to->window);

+    cpswapl (from->owner, to->owner);

+    cpswapl (from->selection, to->selection);

+    cpswapl (from->timestamp, to->timestamp);

+    cpswapl (from->selectionTimestamp, to->selectionTimestamp);

+}

+

+static int

+SelectionFreeClient (pointer data, XID id)

+{

+    SelectionEventPtr	old = (SelectionEventPtr) data;

+    SelectionEventPtr	*prev, e;

+    

+    for (prev = &selectionEvents; (e = *prev); prev = &e->next)

+    {

+	if (e == old)

+	{

+	    *prev = e->next;

+	    free(e);

+	    CheckSelectionCallback ();

+	    break;

+	}

+    }

+    return 1;

+}

+

+static int

+SelectionFreeWindow (pointer data, XID id)

+{

+    WindowPtr		pWindow = (WindowPtr) data;

+    SelectionEventPtr	e, next;

+

+    for (e = selectionEvents; e; e = next)

+    {

+	next = e->next;

+	if (e->pWindow == pWindow)

+	{

+	    FreeResource (e->clientResource, 0);

+	}

+    }

+    return 1;

+}

+

+Bool

+XFixesSelectionInit (void)

+{

+    SelectionClientType = CreateNewResourceType(SelectionFreeClient,

+						"XFixesSelectionClient");

+    SelectionWindowType = CreateNewResourceType(SelectionFreeWindow,

+						"XFixesSelectionWindow");

+    return SelectionClientType && SelectionWindowType;

+}

diff --git a/xorg-server/xfixes/xfixes.c b/xorg-server/xfixes/xfixes.c
index 5163dc11e..fd23a5cb7 100644
--- a/xorg-server/xfixes/xfixes.c
+++ b/xorg-server/xfixes/xfixes.c
@@ -1,263 +1,263 @@
-/*
- * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Copyright © 2002 Keith Packard
- *
- * 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 the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD 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.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "xfixesint.h"
-#include "protocol-versions.h"
-/*
- * Must use these instead of the constants from xfixeswire.h.  They advertise
- * what we implement, not what the protocol headers define.
- */
-
-static unsigned char	XFixesReqCode;
-int		XFixesEventBase;
-int		XFixesErrorBase;
-
-static int XFixesClientPrivateKeyIndex;
-static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex;
-
-static int
-ProcXFixesQueryVersion(ClientPtr client)
-{
-    XFixesClientPtr pXFixesClient = GetXFixesClient (client);
-    xXFixesQueryVersionReply rep;
-    register int n;
-    REQUEST(xXFixesQueryVersionReq);
-
-    REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);
-    memset(&rep, 0, sizeof(xXFixesQueryVersionReply));
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) {
-	rep.majorVersion = stuff->majorVersion;
-	rep.minorVersion = stuff->minorVersion;
-    } else {
-	rep.majorVersion = SERVER_XFIXES_MAJOR_VERSION;
-	if (stuff->majorVersion == SERVER_XFIXES_MAJOR_VERSION &&
-	    stuff->minorVersion < SERVER_XFIXES_MINOR_VERSION)
-	    rep.minorVersion = stuff->minorVersion;
-	else
-	    rep.minorVersion = SERVER_XFIXES_MINOR_VERSION;
-    }
-    pXFixesClient->major_version = rep.majorVersion;
-    pXFixesClient->minor_version = rep.minorVersion;
-    if (client->swapped) {
-    	swaps(&rep.sequenceNumber, n);
-    	swapl(&rep.length, n);
-	swapl(&rep.majorVersion, n);
-	swapl(&rep.minorVersion, n);
-    }
-    WriteToClient(client, sizeof(xXFixesQueryVersionReply), (char *)&rep);
-    return(client->noClientException);
-}
-
-/* Major version controls available requests */
-static const int version_requests[] = {
-    X_XFixesQueryVersion,	/* before client sends QueryVersion */
-    X_XFixesGetCursorImage,	/* Version 1 */
-    X_XFixesChangeCursorByName,	/* Version 2 */
-    X_XFixesExpandRegion,	/* Version 3 */
-    X_XFixesShowCursor,	        /* Version 4 */
-};
-
-#define NUM_VERSION_REQUESTS	(sizeof (version_requests) / sizeof (version_requests[0]))
-    
-int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
-/*************** Version 1 ******************/
-    ProcXFixesQueryVersion,
-    ProcXFixesChangeSaveSet,
-    ProcXFixesSelectSelectionInput,
-    ProcXFixesSelectCursorInput,
-    ProcXFixesGetCursorImage,
-/*************** Version 2 ******************/
-    ProcXFixesCreateRegion,
-    ProcXFixesCreateRegionFromBitmap,
-    ProcXFixesCreateRegionFromWindow,
-    ProcXFixesCreateRegionFromGC,
-    ProcXFixesCreateRegionFromPicture,
-    ProcXFixesDestroyRegion,
-    ProcXFixesSetRegion,
-    ProcXFixesCopyRegion,
-    ProcXFixesCombineRegion,
-    ProcXFixesCombineRegion,
-    ProcXFixesCombineRegion,
-    ProcXFixesInvertRegion,
-    ProcXFixesTranslateRegion,
-    ProcXFixesRegionExtents,
-    ProcXFixesFetchRegion,
-    ProcXFixesSetGCClipRegion,
-    ProcXFixesSetWindowShapeRegion,
-    ProcXFixesSetPictureClipRegion,
-    ProcXFixesSetCursorName,
-    ProcXFixesGetCursorName,
-    ProcXFixesGetCursorImageAndName,
-    ProcXFixesChangeCursor,
-    ProcXFixesChangeCursorByName,
-/*************** Version 3 ******************/
-    ProcXFixesExpandRegion,
-/*************** Version 4 ****************/
-    ProcXFixesHideCursor,
-    ProcXFixesShowCursor,
-};
-
-static int
-ProcXFixesDispatch (ClientPtr client)
-{
-    REQUEST(xXFixesReq);
-    XFixesClientPtr pXFixesClient = GetXFixesClient (client);
-
-    if (pXFixesClient->major_version >= NUM_VERSION_REQUESTS)
-	return BadRequest;
-    if (stuff->xfixesReqType > version_requests[pXFixesClient->major_version])
-	return BadRequest;
-    return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
-}
-
-static int
-SProcXFixesQueryVersion(ClientPtr client)
-{
-    register int n;
-    REQUEST(xXFixesQueryVersionReq);
-
-    swaps(&stuff->length, n);
-    swapl(&stuff->majorVersion, n);
-    swapl(&stuff->minorVersion, n);
-    return (*ProcXFixesVector[stuff->xfixesReqType]) (client);
-}
-
-static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {
-/*************** Version 1 ******************/
-    SProcXFixesQueryVersion,
-    SProcXFixesChangeSaveSet,
-    SProcXFixesSelectSelectionInput,
-    SProcXFixesSelectCursorInput,
-    SProcXFixesGetCursorImage,
-/*************** Version 2 ******************/
-    SProcXFixesCreateRegion,
-    SProcXFixesCreateRegionFromBitmap,
-    SProcXFixesCreateRegionFromWindow,
-    SProcXFixesCreateRegionFromGC,
-    SProcXFixesCreateRegionFromPicture,
-    SProcXFixesDestroyRegion,
-    SProcXFixesSetRegion,
-    SProcXFixesCopyRegion,
-    SProcXFixesCombineRegion,
-    SProcXFixesCombineRegion,
-    SProcXFixesCombineRegion,
-    SProcXFixesInvertRegion,
-    SProcXFixesTranslateRegion,
-    SProcXFixesRegionExtents,
-    SProcXFixesFetchRegion,
-    SProcXFixesSetGCClipRegion,
-    SProcXFixesSetWindowShapeRegion,
-    SProcXFixesSetPictureClipRegion,
-    SProcXFixesSetCursorName,
-    SProcXFixesGetCursorName,
-    SProcXFixesGetCursorImageAndName,
-    SProcXFixesChangeCursor,
-    SProcXFixesChangeCursorByName,
-/*************** Version 3 ******************/
-    SProcXFixesExpandRegion,
-/*************** Version 4 ****************/
-    SProcXFixesHideCursor,
-    SProcXFixesShowCursor,
-};
-
-static int
-SProcXFixesDispatch (ClientPtr client)
-{
-    REQUEST(xXFixesReq);
-    if (stuff->xfixesReqType >= XFixesNumberRequests)
-	return BadRequest;
-    return (*SProcXFixesVector[stuff->xfixesReqType]) (client);
-}
-
-static void
-XFixesClientCallback (CallbackListPtr	*list,
-		      pointer		closure,
-		      pointer		data)
-{
-    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;
-    ClientPtr		pClient = clientinfo->client;
-    XFixesClientPtr	pXFixesClient = GetXFixesClient (pClient);
-
-    pXFixesClient->major_version = 0;
-    pXFixesClient->minor_version = 0;
-}
-
-/*ARGSUSED*/
-static void
-XFixesResetProc (ExtensionEntry *extEntry)
-{
-    DeleteCallback (&ClientStateCallback, XFixesClientCallback, 0);
-}
-
-void
-XFixesExtensionInit(void)
-{
-    ExtensionEntry *extEntry;
-
-    if (!dixRequestPrivate(XFixesClientPrivateKey, sizeof (XFixesClientRec)))
-	return;
-    if (!AddCallback (&ClientStateCallback, XFixesClientCallback, 0))
-	return;
-
-    if (XFixesSelectionInit() && XFixesCursorInit () && XFixesRegionInit () &&
-	(extEntry = AddExtension(XFIXES_NAME, XFixesNumberEvents, 
-				 XFixesNumberErrors,
-				 ProcXFixesDispatch, SProcXFixesDispatch,
-				 XFixesResetProc, StandardMinorOpcode)) != 0)
-    {
-	XFixesReqCode = (unsigned char)extEntry->base;
-	XFixesEventBase = extEntry->eventBase;
-	XFixesErrorBase = extEntry->errorBase;
-	EventSwapVector[XFixesEventBase + XFixesSelectionNotify] =
-	    (EventSwapPtr) SXFixesSelectionNotifyEvent;
-	EventSwapVector[XFixesEventBase + XFixesCursorNotify] =
-	    (EventSwapPtr) SXFixesCursorNotifyEvent;
-    }
-}
+/*

+ * Copyright © 2006 Sun Microsystems, Inc.  All rights reserved.

+ *

+ * Permission is hereby granted, free of charge, to any person obtaining a

+ * copy of this software and associated documentation files (the "Software"),

+ * to deal in the Software without restriction, including without limitation

+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,

+ * and/or sell copies of the Software, and to permit persons to whom the

+ * Software is furnished to do so, subject to the following conditions:

+ *

+ * The above copyright notice and this permission notice (including the next

+ * paragraph) 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 AUTHORS OR COPYRIGHT HOLDERS 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.

+ *

+ * Copyright © 2002 Keith Packard

+ *

+ * 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 the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD 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.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#include "xfixesint.h"

+#include "protocol-versions.h"

+/*

+ * Must use these instead of the constants from xfixeswire.h.  They advertise

+ * what we implement, not what the protocol headers define.

+ */

+

+static unsigned char	XFixesReqCode;

+int		XFixesEventBase;

+int		XFixesErrorBase;

+

+static int XFixesClientPrivateKeyIndex;

+static DevPrivateKey XFixesClientPrivateKey = &XFixesClientPrivateKeyIndex;

+

+static int

+ProcXFixesQueryVersion(ClientPtr client)

+{

+    XFixesClientPtr pXFixesClient = GetXFixesClient (client);

+    xXFixesQueryVersionReply rep;

+    register int n;

+    REQUEST(xXFixesQueryVersionReq);

+

+    REQUEST_SIZE_MATCH(xXFixesQueryVersionReq);

+    memset(&rep, 0, sizeof(xXFixesQueryVersionReply));

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    if (stuff->majorVersion < SERVER_XFIXES_MAJOR_VERSION) {

+	rep.majorVersion = stuff->majorVersion;

+	rep.minorVersion = stuff->minorVersion;

+    } else {

+	rep.majorVersion = SERVER_XFIXES_MAJOR_VERSION;

+	if (stuff->majorVersion == SERVER_XFIXES_MAJOR_VERSION &&

+	    stuff->minorVersion < SERVER_XFIXES_MINOR_VERSION)

+	    rep.minorVersion = stuff->minorVersion;

+	else

+	    rep.minorVersion = SERVER_XFIXES_MINOR_VERSION;

+    }

+    pXFixesClient->major_version = rep.majorVersion;

+    pXFixesClient->minor_version = rep.minorVersion;

+    if (client->swapped) {

+    	swaps(&rep.sequenceNumber, n);

+    	swapl(&rep.length, n);

+	swapl(&rep.majorVersion, n);

+	swapl(&rep.minorVersion, n);

+    }

+    WriteToClient(client, sizeof(xXFixesQueryVersionReply), (char *)&rep);

+    return Success;

+}

+

+/* Major version controls available requests */

+static const int version_requests[] = {

+    X_XFixesQueryVersion,	/* before client sends QueryVersion */

+    X_XFixesGetCursorImage,	/* Version 1 */

+    X_XFixesChangeCursorByName,	/* Version 2 */

+    X_XFixesExpandRegion,	/* Version 3 */

+    X_XFixesShowCursor,	        /* Version 4 */

+};

+

+#define NUM_VERSION_REQUESTS	(sizeof (version_requests) / sizeof (version_requests[0]))

+    

+int	(*ProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {

+/*************** Version 1 ******************/

+    ProcXFixesQueryVersion,

+    ProcXFixesChangeSaveSet,

+    ProcXFixesSelectSelectionInput,

+    ProcXFixesSelectCursorInput,

+    ProcXFixesGetCursorImage,

+/*************** Version 2 ******************/

+    ProcXFixesCreateRegion,

+    ProcXFixesCreateRegionFromBitmap,

+    ProcXFixesCreateRegionFromWindow,

+    ProcXFixesCreateRegionFromGC,

+    ProcXFixesCreateRegionFromPicture,

+    ProcXFixesDestroyRegion,

+    ProcXFixesSetRegion,

+    ProcXFixesCopyRegion,

+    ProcXFixesCombineRegion,

+    ProcXFixesCombineRegion,

+    ProcXFixesCombineRegion,

+    ProcXFixesInvertRegion,

+    ProcXFixesTranslateRegion,

+    ProcXFixesRegionExtents,

+    ProcXFixesFetchRegion,

+    ProcXFixesSetGCClipRegion,

+    ProcXFixesSetWindowShapeRegion,

+    ProcXFixesSetPictureClipRegion,

+    ProcXFixesSetCursorName,

+    ProcXFixesGetCursorName,

+    ProcXFixesGetCursorImageAndName,

+    ProcXFixesChangeCursor,

+    ProcXFixesChangeCursorByName,

+/*************** Version 3 ******************/

+    ProcXFixesExpandRegion,

+/*************** Version 4 ****************/

+    ProcXFixesHideCursor,

+    ProcXFixesShowCursor,

+};

+

+static int

+ProcXFixesDispatch (ClientPtr client)

+{

+    REQUEST(xXFixesReq);

+    XFixesClientPtr pXFixesClient = GetXFixesClient (client);

+

+    if (pXFixesClient->major_version >= NUM_VERSION_REQUESTS)

+	return BadRequest;

+    if (stuff->xfixesReqType > version_requests[pXFixesClient->major_version])

+	return BadRequest;

+    return (*ProcXFixesVector[stuff->xfixesReqType]) (client);

+}

+

+static int

+SProcXFixesQueryVersion(ClientPtr client)

+{

+    register int n;

+    REQUEST(xXFixesQueryVersionReq);

+

+    swaps(&stuff->length, n);

+    swapl(&stuff->majorVersion, n);

+    swapl(&stuff->minorVersion, n);

+    return (*ProcXFixesVector[stuff->xfixesReqType]) (client);

+}

+

+static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = {

+/*************** Version 1 ******************/

+    SProcXFixesQueryVersion,

+    SProcXFixesChangeSaveSet,

+    SProcXFixesSelectSelectionInput,

+    SProcXFixesSelectCursorInput,

+    SProcXFixesGetCursorImage,

+/*************** Version 2 ******************/

+    SProcXFixesCreateRegion,

+    SProcXFixesCreateRegionFromBitmap,

+    SProcXFixesCreateRegionFromWindow,

+    SProcXFixesCreateRegionFromGC,

+    SProcXFixesCreateRegionFromPicture,

+    SProcXFixesDestroyRegion,

+    SProcXFixesSetRegion,

+    SProcXFixesCopyRegion,

+    SProcXFixesCombineRegion,

+    SProcXFixesCombineRegion,

+    SProcXFixesCombineRegion,

+    SProcXFixesInvertRegion,

+    SProcXFixesTranslateRegion,

+    SProcXFixesRegionExtents,

+    SProcXFixesFetchRegion,

+    SProcXFixesSetGCClipRegion,

+    SProcXFixesSetWindowShapeRegion,

+    SProcXFixesSetPictureClipRegion,

+    SProcXFixesSetCursorName,

+    SProcXFixesGetCursorName,

+    SProcXFixesGetCursorImageAndName,

+    SProcXFixesChangeCursor,

+    SProcXFixesChangeCursorByName,

+/*************** Version 3 ******************/

+    SProcXFixesExpandRegion,

+/*************** Version 4 ****************/

+    SProcXFixesHideCursor,

+    SProcXFixesShowCursor,

+};

+

+static int

+SProcXFixesDispatch (ClientPtr client)

+{

+    REQUEST(xXFixesReq);

+    if (stuff->xfixesReqType >= XFixesNumberRequests)

+	return BadRequest;

+    return (*SProcXFixesVector[stuff->xfixesReqType]) (client);

+}

+

+static void

+XFixesClientCallback (CallbackListPtr	*list,

+		      pointer		closure,

+		      pointer		data)

+{

+    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;

+    ClientPtr		pClient = clientinfo->client;

+    XFixesClientPtr	pXFixesClient = GetXFixesClient (pClient);

+

+    pXFixesClient->major_version = 0;

+    pXFixesClient->minor_version = 0;

+}

+

+/*ARGSUSED*/

+static void

+XFixesResetProc (ExtensionEntry *extEntry)

+{

+    DeleteCallback (&ClientStateCallback, XFixesClientCallback, 0);

+}

+

+void

+XFixesExtensionInit(void)

+{

+    ExtensionEntry *extEntry;

+

+    if (!dixRequestPrivate(XFixesClientPrivateKey, sizeof (XFixesClientRec)))

+	return;

+    if (!AddCallback (&ClientStateCallback, XFixesClientCallback, 0))

+	return;

+

+    if (XFixesSelectionInit() && XFixesCursorInit () && XFixesRegionInit () &&

+	(extEntry = AddExtension(XFIXES_NAME, XFixesNumberEvents, 

+				 XFixesNumberErrors,

+				 ProcXFixesDispatch, SProcXFixesDispatch,

+				 XFixesResetProc, StandardMinorOpcode)) != 0)

+    {

+	XFixesReqCode = (unsigned char)extEntry->base;

+	XFixesEventBase = extEntry->eventBase;

+	XFixesErrorBase = extEntry->errorBase;

+	EventSwapVector[XFixesEventBase + XFixesSelectionNotify] =

+	    (EventSwapPtr) SXFixesSelectionNotifyEvent;

+	EventSwapVector[XFixesEventBase + XFixesCursorNotify] =

+	    (EventSwapPtr) SXFixesCursorNotifyEvent;

+    }

+}