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

4 files changed, 1000 insertions, 999 deletions

diff --git a/xorg-server/composite/compalloc.c b/xorg-server/composite/compalloc.c
index 978fe5c17..c2c8a0687 100644
--- a/xorg-server/composite/compalloc.c
+++ b/xorg-server/composite/compalloc.c
@@ -99,7 +99,7 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
      * The client *could* allocate multiple, but while supported,

      * it is not expected to be common

      */

-    ccw = xalloc (sizeof (CompClientWindowRec));

+    ccw = malloc(sizeof (CompClientWindowRec));

     if (!ccw)

 	return BadAlloc;

     ccw->id = FakeClientID (pClient->index);

@@ -109,10 +109,10 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
      */

     if (!cw)

     {

-	cw = xcalloc (1,sizeof (CompWindowRec));

+	cw = calloc (1,sizeof (CompWindowRec));

 	if (!cw)

 	{

-	    xfree (ccw);

+	    free(ccw);

 	    return BadAlloc;

 	}

 	cw->damage = DamageCreate (compReportDamage,

@@ -123,8 +123,8 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
 				   pWin);

 	if (!cw->damage)

 	{

-	    xfree (ccw);

-	    xfree (cw);

+	    free(ccw);

+	    free(cw);

 	    return BadAlloc;

 	}

 	if (wasMapped)

@@ -207,7 +207,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
 	    *prev = ccw->next;

 	    if (ccw->update == CompositeRedirectManual)

 		cw->update = CompositeRedirectAutomatic;

-	    xfree (ccw);

+	    free(ccw);

 	    break;

 	}

     }

@@ -229,7 +229,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
 	REGION_UNINIT (pScreen, &cw->borderClip);

     

 	dixSetPrivate(&pWin->devPrivates, CompWindowPrivateKey, NULL);

-	xfree (cw);

+	free(cw);

     }

     else if (cw->update == CompositeRedirectAutomatic &&

 	     !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone)

@@ -295,7 +295,7 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
      * The client *could* allocate multiple, but while supported,

      * it is not expected to be common

      */

-    ccw = xalloc (sizeof (CompClientWindowRec));

+    ccw = malloc(sizeof (CompClientWindowRec));

     if (!ccw)

 	return BadAlloc;

     ccw->id = FakeClientID (pClient->index);

@@ -305,10 +305,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
      */

     if (!csw)

     {

-	csw = xalloc (sizeof (CompSubwindowsRec));

+	csw = malloc(sizeof (CompSubwindowsRec));

 	if (!csw)

 	{

-	    xfree (ccw);

+	    free(ccw);

 	    return BadAlloc;

 	}

 	csw->update = CompositeRedirectAutomatic;

@@ -327,10 +327,10 @@ compRedirectSubwindows (ClientPtr pClient, WindowPtr pWin, int update)
 		(void) compUnredirectWindow (pClient, pChild, update);

 	    if (!csw->clients)

 	    {

-		xfree (csw);

+		free(csw);

 		dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, 0);

 	    }

-	    xfree (ccw);

+	    free(ccw);

 	    return ret;

 	}

     }

@@ -391,7 +391,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
 	    for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib)

 		(void) compUnredirectWindow (pClient, pChild, ccw->update);

 

-	    xfree (ccw);

+	    free(ccw);

 	    break;

 	}

     }

@@ -402,7 +402,7 @@ compFreeClientSubwindows (WindowPtr pWin, XID id)
     if (!csw->clients)

     {

 	dixSetPrivate(&pWin->devPrivates, CompSubwindowsPrivateKey, NULL);

-	xfree (csw);

+	free(csw);

     }

 }

 

@@ -497,10 +497,11 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
 	 */

 	if (pGC)

 	{

-	    XID val = IncludeInferiors;

+	    ChangeGCVal val;

+	    val.val = IncludeInferiors;

 	    

 	    ValidateGC(&pPixmap->drawable, pGC);

-	    dixChangeGC (serverClient, pGC, GCSubwindowMode, &val, NULL);

+	    ChangeGC (serverClient, pGC, GCSubwindowMode, &val);

 	    (*pGC->ops->CopyArea) (&pParent->drawable,

 				   &pPixmap->drawable,

 				   pGC,

diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c
index 17c4bae1e..664b0fcc3 100644
--- a/xorg-server/composite/compext.c
+++ b/xorg-server/composite/compext.c
@@ -1,587 +1,587 @@
-/*
- * 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 © 2003 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 "compint.h"
-#include "xace.h"
-#include "protocol-versions.h"
-
-static CARD8	CompositeReqCode;
-static int CompositeClientPrivateKeyIndex;
-static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKeyIndex;
-RESTYPE		CompositeClientWindowType;
-RESTYPE		CompositeClientSubwindowsType;
-RESTYPE		CompositeClientOverlayType;
-
-typedef struct _CompositeClient {
-    int	    major_version;
-    int	    minor_version;
-} CompositeClientRec, *CompositeClientPtr;
-
-#define GetCompositeClient(pClient) ((CompositeClientPtr) \
-    dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))
-
-static void
-CompositeClientCallback (CallbackListPtr	*list,
-		      pointer		closure,
-		      pointer		data)
-{
-    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;
-    ClientPtr		pClient = clientinfo->client;
-    CompositeClientPtr	pCompositeClient = GetCompositeClient (pClient);
-
-    pCompositeClient->major_version = 0;
-    pCompositeClient->minor_version = 0;
-}
-
-static int
-FreeCompositeClientWindow (pointer value, XID ccwid)
-{
-    WindowPtr	pWin = value;
-
-    compFreeClientWindow (pWin, ccwid);
-    return Success;
-}
-
-static int
-FreeCompositeClientSubwindows (pointer value, XID ccwid)
-{
-    WindowPtr	pWin = value;
-
-    compFreeClientSubwindows (pWin, ccwid);
-    return Success;
-}
-
-static int
-FreeCompositeClientOverlay (pointer value, XID ccwid)
-{
-    CompOverlayClientPtr pOc = (CompOverlayClientPtr) value;
-
-    compFreeOverlayClient (pOc);
-    return Success;
-}
-
-static int
-ProcCompositeQueryVersion (ClientPtr client)
-{
-    CompositeClientPtr pCompositeClient = GetCompositeClient (client);
-    xCompositeQueryVersionReply rep;
-    register int n;
-    REQUEST(xCompositeQueryVersionReq);
-
-    REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);
-    rep.type = X_Reply;
-    rep.length = 0;
-    rep.sequenceNumber = client->sequence;
-    if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) {
-	rep.majorVersion = stuff->majorVersion;
-	rep.minorVersion = stuff->minorVersion;
-    } else {
-	rep.majorVersion = SERVER_COMPOSITE_MAJOR_VERSION;
-        rep.minorVersion = SERVER_COMPOSITE_MINOR_VERSION;
-    }
-    pCompositeClient->major_version = rep.majorVersion;
-    pCompositeClient->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(xCompositeQueryVersionReply), (char *)&rep);
-    return(client->noClientException);
-}
-
-#define VERIFY_WINDOW(pWindow, wid, client, mode)			\
-    do {								\
-	int err;							\
-	err = dixLookupResourceByType((pointer *) &pWindow, wid,	\
-				      RT_WINDOW, client, mode);		\
-	if (err == BadValue) {						\
-	    client->errorValue = wid;					\
-	    return BadWindow;						\
-	} else if (err != Success) {					\
-	    client->errorValue = wid;					\
-	    return err;							\
-	}								\
-    } while (0)
-
-static int
-ProcCompositeRedirectWindow (ClientPtr client)
-{
-    WindowPtr	pWin;
-    REQUEST(xCompositeRedirectWindowReq);
-
-    REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);
-    VERIFY_WINDOW(pWin, stuff->window, client,
-		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);
-
-    return compRedirectWindow (client, pWin, stuff->update);
-}
-
-static int
-ProcCompositeRedirectSubwindows (ClientPtr client)
-{
-    WindowPtr	pWin;
-    REQUEST(xCompositeRedirectSubwindowsReq);
-
-    REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);
-    VERIFY_WINDOW(pWin, stuff->window, client,
-		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);
-
-    return compRedirectSubwindows (client, pWin, stuff->update);
-}
-
-static int
-ProcCompositeUnredirectWindow (ClientPtr client)
-{
-    WindowPtr	pWin;
-    REQUEST(xCompositeUnredirectWindowReq);
-
-    REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq);
-    VERIFY_WINDOW(pWin, stuff->window, client,
-		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);
-
-    return compUnredirectWindow (client, pWin, stuff->update);
-}
-
-static int
-ProcCompositeUnredirectSubwindows (ClientPtr client)
-{
-    WindowPtr	pWin;
-    REQUEST(xCompositeUnredirectSubwindowsReq);
-
-    REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq);
-    VERIFY_WINDOW(pWin, stuff->window, client,
-		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);
-
-    return compUnredirectSubwindows (client, pWin, stuff->update);
-}
-
-static int
-ProcCompositeCreateRegionFromBorderClip (ClientPtr client)
-{
-    WindowPtr	    pWin;
-    CompWindowPtr   cw;
-    RegionPtr	    pBorderClip, pRegion;
-    REQUEST(xCompositeCreateRegionFromBorderClipReq);
-
-    REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);
-    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
-    LEGAL_NEW_RESOURCE (stuff->region, client);
-    
-    cw = GetCompWindow (pWin);
-    if (cw)
-	pBorderClip = &cw->borderClip;
-    else
-	pBorderClip = &pWin->borderClip;
-    pRegion = XFixesRegionCopy (pBorderClip);
-    if (!pRegion)
-	return BadAlloc;
-    REGION_TRANSLATE (pScreen, pRegion, -pWin->drawable.x, -pWin->drawable.y);
-    
-    if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))
-	return BadAlloc;
-
-    return(client->noClientException);
-}
-
-static int
-ProcCompositeNameWindowPixmap (ClientPtr client)
-{
-    WindowPtr	    pWin;
-    CompWindowPtr   cw;
-    PixmapPtr	    pPixmap;
-    int rc;
-    REQUEST(xCompositeNameWindowPixmapReq);
-
-    REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);
-    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
-
-    if (!pWin->viewable)
-	return BadMatch;
-
-    LEGAL_NEW_RESOURCE (stuff->pixmap, client);
-    
-    cw = GetCompWindow (pWin);
-    if (!cw)
-	return BadMatch;
-
-    pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin);
-    if (!pPixmap)
-	return BadMatch;
-
-    /* security creation/labeling check */
-    rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pixmap, RT_PIXMAP,
-		  pPixmap, RT_WINDOW, pWin, DixCreateAccess);
-    if (rc != Success)
-	return rc;
-
-    ++pPixmap->refcnt;
-
-    if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
-	return BadAlloc;
-
-    return(client->noClientException);
-}
-
-
-static int
-ProcCompositeGetOverlayWindow (ClientPtr client)
-{
-    REQUEST(xCompositeGetOverlayWindowReq); 
-    xCompositeGetOverlayWindowReply rep;
-    WindowPtr pWin;
-    ScreenPtr pScreen;
-    CompScreenPtr cs;
-    CompOverlayClientPtr pOc;
-    int rc;
-
-    REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);
-    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
-    pScreen = pWin->drawable.pScreen;
-
-    /* 
-     * Create an OverlayClient structure to mark this client's
-     * interest in the overlay window
-     */
-    pOc = compCreateOverlayClient(pScreen, client);
-    if (pOc == NULL)
-	return BadAlloc;
-
-    /*
-     * Make sure the overlay window exists
-     */
-    cs = GetCompScreen(pScreen);
-    if (cs->pOverlayWin == NULL)
-	if (!compCreateOverlayWindow(pScreen))
-	{
-	    FreeResource (pOc->resource, RT_NONE);
-	    return BadAlloc;
-	}
-
-    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cs->pOverlayWin->drawable.id,
-		  RT_WINDOW, cs->pOverlayWin, RT_NONE, NULL, DixGetAttrAccess);
-    if (rc != Success)
-    {
-	FreeResource (pOc->resource, RT_NONE);
-	return rc;
-    }
-
-    rep.type = X_Reply;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    rep.overlayWin = cs->pOverlayWin->drawable.id;
-
-    if (client->swapped)
-    {
-	int n;
-	swaps(&rep.sequenceNumber, n);
-    	swapl(&rep.length, n);
-	swapl(&rep.overlayWin, n);
-    }
-    (void) WriteToClient(client, sz_xCompositeGetOverlayWindowReply, (char *)&rep);
-
-    return client->noClientException;
-}
-
-static int
-ProcCompositeReleaseOverlayWindow (ClientPtr client)
-{
-    REQUEST(xCompositeReleaseOverlayWindowReq); 
-    WindowPtr pWin;
-    ScreenPtr pScreen;
-    CompOverlayClientPtr pOc;
-
-    REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);
-    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);
-    pScreen = pWin->drawable.pScreen;
-
-    /* 
-     * Has client queried a reference to the overlay window
-     * on this screen? If not, generate an error.
-     */
-    pOc = compFindOverlayClient (pWin->drawable.pScreen, client);
-    if (pOc == NULL)
-	return BadMatch;
-
-    /* The delete function will free the client structure */
-    FreeResource (pOc->resource, RT_NONE);
-
-    return client->noClientException;
-}
-
-static int (*ProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
-    ProcCompositeQueryVersion,
-    ProcCompositeRedirectWindow,
-    ProcCompositeRedirectSubwindows,
-    ProcCompositeUnredirectWindow,
-    ProcCompositeUnredirectSubwindows,
-    ProcCompositeCreateRegionFromBorderClip,
-    ProcCompositeNameWindowPixmap,
-    ProcCompositeGetOverlayWindow,
-    ProcCompositeReleaseOverlayWindow,
-};
-
-static int
-ProcCompositeDispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-    
-    if (stuff->data < CompositeNumberRequests)
-	return (*ProcCompositeVector[stuff->data]) (client);
-    else
-	return BadRequest;
-}
-
-static int
-SProcCompositeQueryVersion (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeQueryVersionReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);
-    swapl(&stuff->majorVersion, n);
-    swapl(&stuff->minorVersion, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeRedirectWindow (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeRedirectWindowReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);
-    swapl (&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeRedirectSubwindows (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeRedirectSubwindowsReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);
-    swapl (&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeUnredirectWindow (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeUnredirectWindowReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq);
-    swapl (&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeUnredirectSubwindows (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeUnredirectSubwindowsReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq);
-    swapl (&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeCreateRegionFromBorderClip (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeCreateRegionFromBorderClipReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);
-    swapl (&stuff->region, n);
-    swapl (&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeNameWindowPixmap (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeNameWindowPixmapReq);
-
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);
-    swapl (&stuff->window, n);
-    swapl (&stuff->pixmap, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeGetOverlayWindow (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeGetOverlayWindowReq);
-
-    swaps (&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);
-    swapl(&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int
-SProcCompositeReleaseOverlayWindow (ClientPtr client)
-{
-    int n;
-    REQUEST(xCompositeReleaseOverlayWindowReq);
-
-    swaps (&stuff->length, n);
-    REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);
-    swapl(&stuff->window, n);
-    return (*ProcCompositeVector[stuff->compositeReqType]) (client);
-}
-
-static int (*SProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {
-    SProcCompositeQueryVersion,
-    SProcCompositeRedirectWindow,
-    SProcCompositeRedirectSubwindows,
-    SProcCompositeUnredirectWindow,
-    SProcCompositeUnredirectSubwindows,
-    SProcCompositeCreateRegionFromBorderClip,
-    SProcCompositeNameWindowPixmap,
-    SProcCompositeGetOverlayWindow,
-    SProcCompositeReleaseOverlayWindow,
-};
-
-static int
-SProcCompositeDispatch (ClientPtr client)
-{
-    REQUEST(xReq);
-    
-    if (stuff->data < CompositeNumberRequests)
-	return (*SProcCompositeVector[stuff->data]) (client);
-    else
-	return BadRequest;
-}
-
-void
-CompositeExtensionInit (void)
-{
-    ExtensionEntry  *extEntry;
-    int		    s;
-
-    /* Assume initialization is going to fail */
-    noCompositeExtension = TRUE;
-
-    for (s = 0; s < screenInfo.numScreens; s++) {
-	ScreenPtr pScreen = screenInfo.screens[s];
-	VisualPtr vis;
-
-	/* Composite on 8bpp pseudocolor root windows appears to fail, so
-	 * just disable it on anything pseudocolor for safety.
-	 */
-	for (vis = pScreen->visuals; vis->vid != pScreen->rootVisual; vis++)
-	    ;
-	if ((vis->class | DynamicClass) == PseudoColor)
-	    return;
-
-	/* Ensure that Render is initialized, which is required for automatic
-	 * compositing.
-	 */
-	if (GetPictureScreenIfSet(pScreen) == NULL)
-	    return;
-    }
-#ifdef PANORAMIX
-    /* Xinerama's rewriting of window drawing before Composite gets to it
-     * breaks Composite.
-     */
-    if (!noPanoramiXExtension)
-	return;
-#endif
-
-    CompositeClientWindowType = CreateNewResourceType
-	(FreeCompositeClientWindow, "CompositeClientWindow");
-    if (!CompositeClientWindowType)
-	return;
-
-    CompositeClientSubwindowsType = CreateNewResourceType
-	(FreeCompositeClientSubwindows, "CompositeClientSubwindows");
-    if (!CompositeClientSubwindowsType)
-	return;
-
-    CompositeClientOverlayType = CreateNewResourceType
-	(FreeCompositeClientOverlay, "CompositeClientOverlay");
-    if (!CompositeClientOverlayType)
-	return;
-
-    if (!dixRequestPrivate(CompositeClientPrivateKey,
-			   sizeof(CompositeClientRec)))
-	return;
-
-    if (!AddCallback (&ClientStateCallback, CompositeClientCallback, 0))
-	return;
-
-    for (s = 0; s < screenInfo.numScreens; s++)
-	if (!compScreenInit (screenInfo.screens[s]))
-	    return;
-
-    extEntry = AddExtension (COMPOSITE_NAME, 0, 0,
-			     ProcCompositeDispatch, SProcCompositeDispatch,
-			     NULL, StandardMinorOpcode);
-    if (!extEntry)
-	return;
-    CompositeReqCode = (CARD8) extEntry->base;
-
-    miRegisterRedirectBorderClipProc (compSetRedirectBorderClip,
-				      compGetRedirectBorderClip);
-
-    /* Initialization succeeded */
-    noCompositeExtension = FALSE;
-}
+/*

+ * 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 © 2003 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 "compint.h"

+#include "xace.h"

+#include "protocol-versions.h"

+

+static CARD8	CompositeReqCode;

+static int CompositeClientPrivateKeyIndex;

+static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKeyIndex;

+RESTYPE		CompositeClientWindowType;

+RESTYPE		CompositeClientSubwindowsType;

+RESTYPE		CompositeClientOverlayType;

+

+typedef struct _CompositeClient {

+    int	    major_version;

+    int	    minor_version;

+} CompositeClientRec, *CompositeClientPtr;

+

+#define GetCompositeClient(pClient) ((CompositeClientPtr) \

+    dixLookupPrivate(&(pClient)->devPrivates, CompositeClientPrivateKey))

+

+static void

+CompositeClientCallback (CallbackListPtr	*list,

+		      pointer		closure,

+		      pointer		data)

+{

+    NewClientInfoRec	*clientinfo = (NewClientInfoRec *) data;

+    ClientPtr		pClient = clientinfo->client;

+    CompositeClientPtr	pCompositeClient = GetCompositeClient (pClient);

+

+    pCompositeClient->major_version = 0;

+    pCompositeClient->minor_version = 0;

+}

+

+static int

+FreeCompositeClientWindow (pointer value, XID ccwid)

+{

+    WindowPtr	pWin = value;

+

+    compFreeClientWindow (pWin, ccwid);

+    return Success;

+}

+

+static int

+FreeCompositeClientSubwindows (pointer value, XID ccwid)

+{

+    WindowPtr	pWin = value;

+

+    compFreeClientSubwindows (pWin, ccwid);

+    return Success;

+}

+

+static int

+FreeCompositeClientOverlay (pointer value, XID ccwid)

+{

+    CompOverlayClientPtr pOc = (CompOverlayClientPtr) value;

+

+    compFreeOverlayClient (pOc);

+    return Success;

+}

+

+static int

+ProcCompositeQueryVersion (ClientPtr client)

+{

+    CompositeClientPtr pCompositeClient = GetCompositeClient (client);

+    xCompositeQueryVersionReply rep;

+    register int n;

+    REQUEST(xCompositeQueryVersionReq);

+

+    REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);

+    rep.type = X_Reply;

+    rep.length = 0;

+    rep.sequenceNumber = client->sequence;

+    if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR_VERSION) {

+	rep.majorVersion = stuff->majorVersion;

+	rep.minorVersion = stuff->minorVersion;

+    } else {

+	rep.majorVersion = SERVER_COMPOSITE_MAJOR_VERSION;

+        rep.minorVersion = SERVER_COMPOSITE_MINOR_VERSION;

+    }

+    pCompositeClient->major_version = rep.majorVersion;

+    pCompositeClient->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(xCompositeQueryVersionReply), (char *)&rep);

+    return Success;

+}

+

+#define VERIFY_WINDOW(pWindow, wid, client, mode)			\

+    do {								\

+	int err;							\

+	err = dixLookupResourceByType((pointer *) &pWindow, wid,	\

+				      RT_WINDOW, client, mode);		\

+	if (err == BadValue) {						\

+	    client->errorValue = wid;					\

+	    return BadWindow;						\

+	} else if (err != Success) {					\

+	    client->errorValue = wid;					\

+	    return err;							\

+	}								\

+    } while (0)

+

+static int

+ProcCompositeRedirectWindow (ClientPtr client)

+{

+    WindowPtr	pWin;

+    REQUEST(xCompositeRedirectWindowReq);

+

+    REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);

+    VERIFY_WINDOW(pWin, stuff->window, client,

+		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);

+

+    return compRedirectWindow (client, pWin, stuff->update);

+}

+

+static int

+ProcCompositeRedirectSubwindows (ClientPtr client)

+{

+    WindowPtr	pWin;

+    REQUEST(xCompositeRedirectSubwindowsReq);

+

+    REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);

+    VERIFY_WINDOW(pWin, stuff->window, client,

+		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);

+

+    return compRedirectSubwindows (client, pWin, stuff->update);

+}

+

+static int

+ProcCompositeUnredirectWindow (ClientPtr client)

+{

+    WindowPtr	pWin;

+    REQUEST(xCompositeUnredirectWindowReq);

+

+    REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq);

+    VERIFY_WINDOW(pWin, stuff->window, client,

+		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);

+

+    return compUnredirectWindow (client, pWin, stuff->update);

+}

+

+static int

+ProcCompositeUnredirectSubwindows (ClientPtr client)

+{

+    WindowPtr	pWin;

+    REQUEST(xCompositeUnredirectSubwindowsReq);

+

+    REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq);

+    VERIFY_WINDOW(pWin, stuff->window, client,

+		  DixSetAttrAccess|DixManageAccess|DixBlendAccess);

+

+    return compUnredirectSubwindows (client, pWin, stuff->update);

+}

+

+static int

+ProcCompositeCreateRegionFromBorderClip (ClientPtr client)

+{

+    WindowPtr	    pWin;

+    CompWindowPtr   cw;

+    RegionPtr	    pBorderClip, pRegion;

+    REQUEST(xCompositeCreateRegionFromBorderClipReq);

+

+    REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);

+    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);

+    LEGAL_NEW_RESOURCE (stuff->region, client);

+    

+    cw = GetCompWindow (pWin);

+    if (cw)

+	pBorderClip = &cw->borderClip;

+    else

+	pBorderClip = &pWin->borderClip;

+    pRegion = XFixesRegionCopy (pBorderClip);

+    if (!pRegion)

+	return BadAlloc;

+    REGION_TRANSLATE (pScreen, pRegion, -pWin->drawable.x, -pWin->drawable.y);

+    

+    if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))

+	return BadAlloc;

+

+    return Success;

+}

+

+static int

+ProcCompositeNameWindowPixmap (ClientPtr client)

+{

+    WindowPtr	    pWin;

+    CompWindowPtr   cw;

+    PixmapPtr	    pPixmap;

+    int rc;

+    REQUEST(xCompositeNameWindowPixmapReq);

+

+    REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);

+    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);

+

+    if (!pWin->viewable)

+	return BadMatch;

+

+    LEGAL_NEW_RESOURCE (stuff->pixmap, client);

+    

+    cw = GetCompWindow (pWin);

+    if (!cw)

+	return BadMatch;

+

+    pPixmap = (*pWin->drawable.pScreen->GetWindowPixmap) (pWin);

+    if (!pPixmap)

+	return BadMatch;

+

+    /* security creation/labeling check */

+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pixmap, RT_PIXMAP,

+		  pPixmap, RT_WINDOW, pWin, DixCreateAccess);

+    if (rc != Success)

+	return rc;

+

+    ++pPixmap->refcnt;

+

+    if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))

+	return BadAlloc;

+

+    return Success;

+}

+

+

+static int

+ProcCompositeGetOverlayWindow (ClientPtr client)

+{

+    REQUEST(xCompositeGetOverlayWindowReq); 

+    xCompositeGetOverlayWindowReply rep;

+    WindowPtr pWin;

+    ScreenPtr pScreen;

+    CompScreenPtr cs;

+    CompOverlayClientPtr pOc;

+    int rc;

+

+    REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);

+    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);

+    pScreen = pWin->drawable.pScreen;

+

+    /* 

+     * Create an OverlayClient structure to mark this client's

+     * interest in the overlay window

+     */

+    pOc = compCreateOverlayClient(pScreen, client);

+    if (pOc == NULL)

+	return BadAlloc;

+

+    /*

+     * Make sure the overlay window exists

+     */

+    cs = GetCompScreen(pScreen);

+    if (cs->pOverlayWin == NULL)

+	if (!compCreateOverlayWindow(pScreen))

+	{

+	    FreeResource (pOc->resource, RT_NONE);

+	    return BadAlloc;

+	}

+

+    rc = XaceHook(XACE_RESOURCE_ACCESS, client, cs->pOverlayWin->drawable.id,

+		  RT_WINDOW, cs->pOverlayWin, RT_NONE, NULL, DixGetAttrAccess);

+    if (rc != Success)

+    {

+	FreeResource (pOc->resource, RT_NONE);

+	return rc;

+    }

+

+    rep.type = X_Reply;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    rep.overlayWin = cs->pOverlayWin->drawable.id;

+

+    if (client->swapped)

+    {

+	int n;

+	swaps(&rep.sequenceNumber, n);

+    	swapl(&rep.length, n);

+	swapl(&rep.overlayWin, n);

+    }

+    (void) WriteToClient(client, sz_xCompositeGetOverlayWindowReply, (char *)&rep);

+

+    return Success;

+}

+

+static int

+ProcCompositeReleaseOverlayWindow (ClientPtr client)

+{

+    REQUEST(xCompositeReleaseOverlayWindowReq); 

+    WindowPtr pWin;

+    ScreenPtr pScreen;

+    CompOverlayClientPtr pOc;

+

+    REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);

+    VERIFY_WINDOW(pWin, stuff->window, client, DixGetAttrAccess);

+    pScreen = pWin->drawable.pScreen;

+

+    /* 

+     * Has client queried a reference to the overlay window

+     * on this screen? If not, generate an error.

+     */

+    pOc = compFindOverlayClient (pWin->drawable.pScreen, client);

+    if (pOc == NULL)

+	return BadMatch;

+

+    /* The delete function will free the client structure */

+    FreeResource (pOc->resource, RT_NONE);

+

+    return Success;

+}

+

+static int (*ProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {

+    ProcCompositeQueryVersion,

+    ProcCompositeRedirectWindow,

+    ProcCompositeRedirectSubwindows,

+    ProcCompositeUnredirectWindow,

+    ProcCompositeUnredirectSubwindows,

+    ProcCompositeCreateRegionFromBorderClip,

+    ProcCompositeNameWindowPixmap,

+    ProcCompositeGetOverlayWindow,

+    ProcCompositeReleaseOverlayWindow,

+};

+

+static int

+ProcCompositeDispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+    

+    if (stuff->data < CompositeNumberRequests)

+	return (*ProcCompositeVector[stuff->data]) (client);

+    else

+	return BadRequest;

+}

+

+static int

+SProcCompositeQueryVersion (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeQueryVersionReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeQueryVersionReq);

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

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeRedirectWindow (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeRedirectWindowReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeRedirectWindowReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeRedirectSubwindows (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeRedirectSubwindowsReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeRedirectSubwindowsReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeUnredirectWindow (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeUnredirectWindowReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeUnredirectWindowReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeUnredirectSubwindows (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeUnredirectSubwindowsReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeUnredirectSubwindowsReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeCreateRegionFromBorderClip (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeCreateRegionFromBorderClipReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeCreateRegionFromBorderClipReq);

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

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeNameWindowPixmap (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeNameWindowPixmapReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeNameWindowPixmapReq);

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

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeGetOverlayWindow (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeGetOverlayWindowReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeGetOverlayWindowReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int

+SProcCompositeReleaseOverlayWindow (ClientPtr client)

+{

+    int n;

+    REQUEST(xCompositeReleaseOverlayWindowReq);

+

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

+    REQUEST_SIZE_MATCH(xCompositeReleaseOverlayWindowReq);

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

+    return (*ProcCompositeVector[stuff->compositeReqType]) (client);

+}

+

+static int (*SProcCompositeVector[CompositeNumberRequests])(ClientPtr) = {

+    SProcCompositeQueryVersion,

+    SProcCompositeRedirectWindow,

+    SProcCompositeRedirectSubwindows,

+    SProcCompositeUnredirectWindow,

+    SProcCompositeUnredirectSubwindows,

+    SProcCompositeCreateRegionFromBorderClip,

+    SProcCompositeNameWindowPixmap,

+    SProcCompositeGetOverlayWindow,

+    SProcCompositeReleaseOverlayWindow,

+};

+

+static int

+SProcCompositeDispatch (ClientPtr client)

+{

+    REQUEST(xReq);

+    

+    if (stuff->data < CompositeNumberRequests)

+	return (*SProcCompositeVector[stuff->data]) (client);

+    else

+	return BadRequest;

+}

+

+void

+CompositeExtensionInit (void)

+{

+    ExtensionEntry  *extEntry;

+    int		    s;

+

+    /* Assume initialization is going to fail */

+    noCompositeExtension = TRUE;

+

+    for (s = 0; s < screenInfo.numScreens; s++) {

+	ScreenPtr pScreen = screenInfo.screens[s];

+	VisualPtr vis;

+

+	/* Composite on 8bpp pseudocolor root windows appears to fail, so

+	 * just disable it on anything pseudocolor for safety.

+	 */

+	for (vis = pScreen->visuals; vis->vid != pScreen->rootVisual; vis++)

+	    ;

+	if ((vis->class | DynamicClass) == PseudoColor)

+	    return;

+

+	/* Ensure that Render is initialized, which is required for automatic

+	 * compositing.

+	 */

+	if (GetPictureScreenIfSet(pScreen) == NULL)

+	    return;

+    }

+#ifdef PANORAMIX

+    /* Xinerama's rewriting of window drawing before Composite gets to it

+     * breaks Composite.

+     */

+    if (!noPanoramiXExtension)

+	return;

+#endif

+

+    CompositeClientWindowType = CreateNewResourceType

+	(FreeCompositeClientWindow, "CompositeClientWindow");

+    if (!CompositeClientWindowType)

+	return;

+

+    CompositeClientSubwindowsType = CreateNewResourceType

+	(FreeCompositeClientSubwindows, "CompositeClientSubwindows");

+    if (!CompositeClientSubwindowsType)

+	return;

+

+    CompositeClientOverlayType = CreateNewResourceType

+	(FreeCompositeClientOverlay, "CompositeClientOverlay");

+    if (!CompositeClientOverlayType)

+	return;

+

+    if (!dixRequestPrivate(CompositeClientPrivateKey,

+			   sizeof(CompositeClientRec)))

+	return;

+

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

+	return;

+

+    for (s = 0; s < screenInfo.numScreens; s++)

+	if (!compScreenInit (screenInfo.screens[s]))

+	    return;

+

+    extEntry = AddExtension (COMPOSITE_NAME, 0, 0,

+			     ProcCompositeDispatch, SProcCompositeDispatch,

+			     NULL, StandardMinorOpcode);

+    if (!extEntry)

+	return;

+    CompositeReqCode = (CARD8) extEntry->base;

+

+    miRegisterRedirectBorderClipProc (compSetRedirectBorderClip,

+				      compGetRedirectBorderClip);

+

+    /* Initialization succeeded */

+    noCompositeExtension = FALSE;

+}

diff --git a/xorg-server/composite/compinit.c b/xorg-server/composite/compinit.c
index e8b563de6..9a99ce633 100644
--- a/xorg-server/composite/compinit.c
+++ b/xorg-server/composite/compinit.c
@@ -1,394 +1,394 @@
-/*
- * 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 © 2003 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 "compint.h"
-#include "compositeext.h"
-
-static int CompScreenPrivateKeyIndex;
-DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKeyIndex;
-static int CompWindowPrivateKeyIndex;
-DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKeyIndex;
-static int CompSubwindowsPrivateKeyIndex;
-DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKeyIndex;
-
-
-static Bool
-compCloseScreen (int index, ScreenPtr pScreen)
-{
-    CompScreenPtr   cs = GetCompScreen (pScreen);
-    Bool	    ret;
-
-    xfree (cs->alternateVisuals);
-
-    pScreen->CloseScreen = cs->CloseScreen;
-    pScreen->BlockHandler = cs->BlockHandler;
-    pScreen->InstallColormap = cs->InstallColormap;
-    pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
-    pScreen->ReparentWindow = cs->ReparentWindow;
-    pScreen->MoveWindow = cs->MoveWindow;
-    pScreen->ResizeWindow = cs->ResizeWindow;
-    pScreen->ChangeBorderWidth = cs->ChangeBorderWidth;
-    
-    pScreen->ClipNotify = cs->ClipNotify;
-    pScreen->UnrealizeWindow = cs->UnrealizeWindow;
-    pScreen->RealizeWindow = cs->RealizeWindow;
-    pScreen->DestroyWindow = cs->DestroyWindow;
-    pScreen->CreateWindow = cs->CreateWindow;
-    pScreen->CopyWindow = cs->CopyWindow;
-    pScreen->PositionWindow = cs->PositionWindow;
-
-    xfree (cs);
-    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);
-    ret = (*pScreen->CloseScreen) (index, pScreen);
-
-    return ret;
-}
-
-static void
-compInstallColormap (ColormapPtr pColormap)
-{
-    VisualPtr	    pVisual = pColormap->pVisual;
-    ScreenPtr	    pScreen = pColormap->pScreen;
-    CompScreenPtr   cs = GetCompScreen (pScreen);
-    int		    a;
-
-    for (a = 0; a < cs->numAlternateVisuals; a++)
-	if (pVisual->vid == cs->alternateVisuals[a])
-	    return;
-    pScreen->InstallColormap = cs->InstallColormap;
-    (*pScreen->InstallColormap) (pColormap);
-    cs->InstallColormap = pScreen->InstallColormap;
-    pScreen->InstallColormap = compInstallColormap;
-}
-
-/* Fake backing store via automatic redirection */
-static Bool
-compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)
-{
-    ScreenPtr pScreen = pWin->drawable.pScreen;
-    CompScreenPtr cs = GetCompScreen (pScreen);
-    Bool ret;
-
-    pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
-    ret = pScreen->ChangeWindowAttributes(pWin, mask);
-
-    if (ret && (mask & CWBackingStore) &&
-	    pScreen->backingStoreSupport != NotUseful) {
-	if (pWin->backingStore != NotUseful) {
-	    compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
-	    pWin->backStorage = (pointer) (intptr_t) 1;
-	} else {
-	    compUnredirectWindow(serverClient, pWin,
-				 CompositeRedirectAutomatic);
-	    pWin->backStorage = NULL;
-	}
-    }
-
-    pScreen->ChangeWindowAttributes = compChangeWindowAttributes;
-
-    return ret;
-}
-
-static void
-compScreenUpdate (ScreenPtr pScreen)
-{
-    CompScreenPtr   cs = GetCompScreen (pScreen);
-
-    compCheckTree (pScreen);
-    if (cs->damaged)
-    {
-	compWindowUpdate (WindowTable[pScreen->myNum]);
-	cs->damaged = FALSE;
-    }
-}
-
-static void
-compBlockHandler (int	    i,
-		  pointer   blockData,
-		  pointer   pTimeout,
-		  pointer   pReadmask)
-{
-    ScreenPtr	    pScreen = screenInfo.screens[i];
-    CompScreenPtr   cs = GetCompScreen (pScreen);
-
-    pScreen->BlockHandler = cs->BlockHandler;
-    compScreenUpdate (pScreen);
-    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-    cs->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = compBlockHandler;
-}
-
-/*
- * Add alternate visuals -- always expose an ARGB32 and RGB24 visual
- */
-
-static DepthPtr
-compFindVisuallessDepth (ScreenPtr pScreen, int d)
-{
-    int		i;
-
-    for (i = 0; i < pScreen->numDepths; i++)
-    {
-	DepthPtr    depth = &pScreen->allowedDepths[i];
-	if (depth->depth == d)
-	{
-	    /*
-	     * Make sure it doesn't have visuals already
-	     */
-	    if (depth->numVids)
-		return 0;
-	    /*
-	     * looks fine
-	     */
-	    return depth;
-	}
-    }
-    /*
-     * If there isn't one, then it's gonna be hard to have 
-     * an associated visual
-     */
-    return 0;
-}
-
-/*
- * Add a list of visual IDs to the list of visuals to implicitly redirect.
- */
-static Bool
-compRegisterAlternateVisuals (CompScreenPtr cs, VisualID *vids, int nVisuals)
-{
-    VisualID *p;
-
-    p = xrealloc(cs->alternateVisuals,
-		 sizeof(VisualID) * (cs->numAlternateVisuals + nVisuals));
-    if(p == NULL)
-	return FALSE;
-
-    memcpy(&p[cs->numAlternateVisuals], vids, sizeof(VisualID) * nVisuals);
-
-    cs->alternateVisuals = p;
-    cs->numAlternateVisuals += nVisuals;
-
-    return TRUE;
-}
-
-Bool CompositeRegisterAlternateVisuals (ScreenPtr pScreen, VisualID *vids,
-					int nVisuals)
-{
-    CompScreenPtr cs = GetCompScreen (pScreen);
-    return compRegisterAlternateVisuals(cs, vids, nVisuals);
-}
-
-typedef struct _alternateVisual {
-    int		depth;
-    CARD32	format;
-} CompAlternateVisual;
-
-static CompAlternateVisual  altVisuals[] = {
-#if COMP_INCLUDE_RGB24_VISUAL
-    {	24,	PICT_r8g8b8 },
-#endif
-    {	32,	PICT_a8r8g8b8 },
-};
-
-static const int NUM_COMP_ALTERNATE_VISUALS = sizeof(altVisuals) /
-					      sizeof(CompAlternateVisual);
-
-static Bool
-compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs,
-		       CompAlternateVisual *alt)
-{
-    VisualPtr	    visual;
-    DepthPtr	    depth;
-    PictFormatPtr   pPictFormat;
-    unsigned long   alphaMask;
-
-    /*
-     * The ARGB32 visual is always available.  Other alternate depth visuals
-     * are only provided if their depth is less than the root window depth.
-     * There's no deep reason for this.
-     */
-    if (alt->depth >= pScreen->rootDepth && alt->depth != 32)
-	return FALSE;
-
-    depth = compFindVisuallessDepth (pScreen, alt->depth);
-    if (!depth)
-	/* alt->depth doesn't exist or already has alternate visuals. */
-	return TRUE;
-
-    pPictFormat = PictureMatchFormat (pScreen, alt->depth, alt->format);
-    if (!pPictFormat)
-	return FALSE;
-
-    if (ResizeVisualArray(pScreen, 1, depth) == FALSE) {
-        return FALSE;
-    }
-
-    visual = pScreen->visuals + (pScreen->numVisuals - 1); /* the new one */
-
-    /* Initialize the visual */
-    visual->bitsPerRGBValue = 8;
-    if (PICT_FORMAT_TYPE(alt->format) == PICT_TYPE_COLOR) {
-	visual->class = PseudoColor;
-	visual->nplanes = PICT_FORMAT_BPP(alt->format);
-	visual->ColormapEntries = 1 << visual->nplanes;
-    } else {
-	DirectFormatRec *direct = &pPictFormat->direct;
-	visual->class = TrueColor;
-	visual->redMask   = ((unsigned long)direct->redMask) << direct->red;
-	visual->greenMask = ((unsigned long)direct->greenMask) << direct->green;
-	visual->blueMask  = ((unsigned long)direct->blueMask) << direct->blue;
-	alphaMask = ((unsigned long)direct->alphaMask) << direct->alpha;
-	visual->offsetRed   = direct->red;
-	visual->offsetGreen = direct->green;
-	visual->offsetBlue  = direct->blue;
-	/*
-	 * Include A bits in this (unlike GLX which includes only RGB)
-	 * This lets DIX compute suitable masks for colormap allocations
-	 */
-	visual->nplanes = Ones (visual->redMask |
-		visual->greenMask |
-		visual->blueMask |
-		alphaMask);
-	/* find widest component */
-	visual->ColormapEntries = (1 << max (Ones (visual->redMask),
-		    max (Ones (visual->greenMask),
-			Ones (visual->blueMask))));
-    }
-
-    /* remember the visual ID to detect auto-update windows */
-    compRegisterAlternateVisuals(cs, &visual->vid, 1);
-
-    return TRUE;
-}
-
-static Bool
-compAddAlternateVisuals (ScreenPtr pScreen, CompScreenPtr cs)
-{
-    int alt, ret = 0;
-
-    for (alt = 0; alt < NUM_COMP_ALTERNATE_VISUALS; alt++)
-	ret |= compAddAlternateVisual(pScreen, cs, altVisuals + alt);
-
-    return !!ret;
-}
-
-Bool
-compScreenInit (ScreenPtr pScreen)
-{
-    CompScreenPtr   cs;
-
-    if (GetCompScreen (pScreen))
-	return TRUE;
-    cs = (CompScreenPtr) xalloc (sizeof (CompScreenRec));
-    if (!cs)
-	return FALSE;
-
-    cs->damaged = FALSE;
-    cs->overlayWid = FakeClientID(0);
-    cs->pOverlayWin = NULL;
-    cs->pOverlayClients = NULL;
-
-    cs->numAlternateVisuals = 0;
-    cs->alternateVisuals = NULL;
-
-    if (!compAddAlternateVisuals (pScreen, cs))
-    {
-	xfree (cs);
-	return FALSE;
-    }
-
-    cs->PositionWindow = pScreen->PositionWindow;
-    pScreen->PositionWindow = compPositionWindow;
-
-    cs->CopyWindow = pScreen->CopyWindow;
-    pScreen->CopyWindow = compCopyWindow;
-
-    cs->CreateWindow = pScreen->CreateWindow;
-    pScreen->CreateWindow = compCreateWindow;
-
-    cs->DestroyWindow = pScreen->DestroyWindow;
-    pScreen->DestroyWindow = compDestroyWindow;
-
-    cs->RealizeWindow = pScreen->RealizeWindow;
-    pScreen->RealizeWindow = compRealizeWindow;
-
-    cs->UnrealizeWindow = pScreen->UnrealizeWindow;
-    pScreen->UnrealizeWindow = compUnrealizeWindow;
-
-    cs->ClipNotify = pScreen->ClipNotify;
-    pScreen->ClipNotify = compClipNotify;
-
-    cs->MoveWindow = pScreen->MoveWindow;
-    pScreen->MoveWindow = compMoveWindow;
-
-    cs->ResizeWindow = pScreen->ResizeWindow;
-    pScreen->ResizeWindow = compResizeWindow;
-
-    cs->ChangeBorderWidth = pScreen->ChangeBorderWidth;
-    pScreen->ChangeBorderWidth = compChangeBorderWidth;
-
-    cs->ReparentWindow = pScreen->ReparentWindow;
-    pScreen->ReparentWindow = compReparentWindow;
-
-    cs->InstallColormap = pScreen->InstallColormap;
-    pScreen->InstallColormap = compInstallColormap;
-
-    cs->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;
-    pScreen->ChangeWindowAttributes = compChangeWindowAttributes;
-
-    cs->BlockHandler = pScreen->BlockHandler;
-    pScreen->BlockHandler = compBlockHandler;
-
-    cs->CloseScreen = pScreen->CloseScreen;
-    pScreen->CloseScreen = compCloseScreen;
-
-    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs);
-
-    RegisterRealChildHeadProc(CompositeRealChildHead);
-
-    return TRUE;
-}
+/*

+ * 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 © 2003 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 "compint.h"

+#include "compositeext.h"

+

+static int CompScreenPrivateKeyIndex;

+DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKeyIndex;

+static int CompWindowPrivateKeyIndex;

+DevPrivateKey CompWindowPrivateKey = &CompWindowPrivateKeyIndex;

+static int CompSubwindowsPrivateKeyIndex;

+DevPrivateKey CompSubwindowsPrivateKey = &CompSubwindowsPrivateKeyIndex;

+

+

+static Bool

+compCloseScreen (int index, ScreenPtr pScreen)

+{

+    CompScreenPtr   cs = GetCompScreen (pScreen);

+    Bool	    ret;

+

+    free(cs->alternateVisuals);

+

+    pScreen->CloseScreen = cs->CloseScreen;

+    pScreen->BlockHandler = cs->BlockHandler;

+    pScreen->InstallColormap = cs->InstallColormap;

+    pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;

+    pScreen->ReparentWindow = cs->ReparentWindow;

+    pScreen->MoveWindow = cs->MoveWindow;

+    pScreen->ResizeWindow = cs->ResizeWindow;

+    pScreen->ChangeBorderWidth = cs->ChangeBorderWidth;

+    

+    pScreen->ClipNotify = cs->ClipNotify;

+    pScreen->UnrealizeWindow = cs->UnrealizeWindow;

+    pScreen->RealizeWindow = cs->RealizeWindow;

+    pScreen->DestroyWindow = cs->DestroyWindow;

+    pScreen->CreateWindow = cs->CreateWindow;

+    pScreen->CopyWindow = cs->CopyWindow;

+    pScreen->PositionWindow = cs->PositionWindow;

+

+    free(cs);

+    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, NULL);

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

+

+    return ret;

+}

+

+static void

+compInstallColormap (ColormapPtr pColormap)

+{

+    VisualPtr	    pVisual = pColormap->pVisual;

+    ScreenPtr	    pScreen = pColormap->pScreen;

+    CompScreenPtr   cs = GetCompScreen (pScreen);

+    int		    a;

+

+    for (a = 0; a < cs->numAlternateVisuals; a++)

+	if (pVisual->vid == cs->alternateVisuals[a])

+	    return;

+    pScreen->InstallColormap = cs->InstallColormap;

+    (*pScreen->InstallColormap) (pColormap);

+    cs->InstallColormap = pScreen->InstallColormap;

+    pScreen->InstallColormap = compInstallColormap;

+}

+

+/* Fake backing store via automatic redirection */

+static Bool

+compChangeWindowAttributes(WindowPtr pWin, unsigned long mask)

+{

+    ScreenPtr pScreen = pWin->drawable.pScreen;

+    CompScreenPtr cs = GetCompScreen (pScreen);

+    Bool ret;

+

+    pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;

+    ret = pScreen->ChangeWindowAttributes(pWin, mask);

+

+    if (ret && (mask & CWBackingStore) &&

+	    pScreen->backingStoreSupport != NotUseful) {

+	if (pWin->backingStore != NotUseful) {

+	    compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);

+	    pWin->backStorage = (pointer) (intptr_t) 1;

+	} else {

+	    compUnredirectWindow(serverClient, pWin,

+				 CompositeRedirectAutomatic);

+	    pWin->backStorage = NULL;

+	}

+    }

+

+    pScreen->ChangeWindowAttributes = compChangeWindowAttributes;

+

+    return ret;

+}

+

+static void

+compScreenUpdate (ScreenPtr pScreen)

+{

+    CompScreenPtr   cs = GetCompScreen (pScreen);

+

+    compCheckTree (pScreen);

+    if (cs->damaged)

+    {

+	compWindowUpdate (WindowTable[pScreen->myNum]);

+	cs->damaged = FALSE;

+    }

+}

+

+static void

+compBlockHandler (int	    i,

+		  pointer   blockData,

+		  pointer   pTimeout,

+		  pointer   pReadmask)

+{

+    ScreenPtr	    pScreen = screenInfo.screens[i];

+    CompScreenPtr   cs = GetCompScreen (pScreen);

+

+    pScreen->BlockHandler = cs->BlockHandler;

+    compScreenUpdate (pScreen);

+    (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);

+    cs->BlockHandler = pScreen->BlockHandler;

+    pScreen->BlockHandler = compBlockHandler;

+}

+

+/*

+ * Add alternate visuals -- always expose an ARGB32 and RGB24 visual

+ */

+

+static DepthPtr

+compFindVisuallessDepth (ScreenPtr pScreen, int d)

+{

+    int		i;

+

+    for (i = 0; i < pScreen->numDepths; i++)

+    {

+	DepthPtr    depth = &pScreen->allowedDepths[i];

+	if (depth->depth == d)

+	{

+	    /*

+	     * Make sure it doesn't have visuals already

+	     */

+	    if (depth->numVids)

+		return 0;

+	    /*

+	     * looks fine

+	     */

+	    return depth;

+	}

+    }

+    /*

+     * If there isn't one, then it's gonna be hard to have 

+     * an associated visual

+     */

+    return 0;

+}

+

+/*

+ * Add a list of visual IDs to the list of visuals to implicitly redirect.

+ */

+static Bool

+compRegisterAlternateVisuals (CompScreenPtr cs, VisualID *vids, int nVisuals)

+{

+    VisualID *p;

+

+    p = realloc(cs->alternateVisuals,

+		 sizeof(VisualID) * (cs->numAlternateVisuals + nVisuals));

+    if(p == NULL)

+	return FALSE;

+

+    memcpy(&p[cs->numAlternateVisuals], vids, sizeof(VisualID) * nVisuals);

+

+    cs->alternateVisuals = p;

+    cs->numAlternateVisuals += nVisuals;

+

+    return TRUE;

+}

+

+Bool CompositeRegisterAlternateVisuals (ScreenPtr pScreen, VisualID *vids,

+					int nVisuals)

+{

+    CompScreenPtr cs = GetCompScreen (pScreen);

+    return compRegisterAlternateVisuals(cs, vids, nVisuals);

+}

+

+typedef struct _alternateVisual {

+    int		depth;

+    CARD32	format;

+} CompAlternateVisual;

+

+static CompAlternateVisual  altVisuals[] = {

+#if COMP_INCLUDE_RGB24_VISUAL

+    {	24,	PICT_r8g8b8 },

+#endif

+    {	32,	PICT_a8r8g8b8 },

+};

+

+static const int NUM_COMP_ALTERNATE_VISUALS = sizeof(altVisuals) /

+					      sizeof(CompAlternateVisual);

+

+static Bool

+compAddAlternateVisual(ScreenPtr pScreen, CompScreenPtr cs,

+		       CompAlternateVisual *alt)

+{

+    VisualPtr	    visual;

+    DepthPtr	    depth;

+    PictFormatPtr   pPictFormat;

+    unsigned long   alphaMask;

+

+    /*

+     * The ARGB32 visual is always available.  Other alternate depth visuals

+     * are only provided if their depth is less than the root window depth.

+     * There's no deep reason for this.

+     */

+    if (alt->depth >= pScreen->rootDepth && alt->depth != 32)

+	return FALSE;

+

+    depth = compFindVisuallessDepth (pScreen, alt->depth);

+    if (!depth)

+	/* alt->depth doesn't exist or already has alternate visuals. */

+	return TRUE;

+

+    pPictFormat = PictureMatchFormat (pScreen, alt->depth, alt->format);

+    if (!pPictFormat)

+	return FALSE;

+

+    if (ResizeVisualArray(pScreen, 1, depth) == FALSE) {

+        return FALSE;

+    }

+

+    visual = pScreen->visuals + (pScreen->numVisuals - 1); /* the new one */

+

+    /* Initialize the visual */

+    visual->bitsPerRGBValue = 8;

+    if (PICT_FORMAT_TYPE(alt->format) == PICT_TYPE_COLOR) {

+	visual->class = PseudoColor;

+	visual->nplanes = PICT_FORMAT_BPP(alt->format);

+	visual->ColormapEntries = 1 << visual->nplanes;

+    } else {

+	DirectFormatRec *direct = &pPictFormat->direct;

+	visual->class = TrueColor;

+	visual->redMask   = ((unsigned long)direct->redMask) << direct->red;

+	visual->greenMask = ((unsigned long)direct->greenMask) << direct->green;

+	visual->blueMask  = ((unsigned long)direct->blueMask) << direct->blue;

+	alphaMask = ((unsigned long)direct->alphaMask) << direct->alpha;

+	visual->offsetRed   = direct->red;

+	visual->offsetGreen = direct->green;

+	visual->offsetBlue  = direct->blue;

+	/*

+	 * Include A bits in this (unlike GLX which includes only RGB)

+	 * This lets DIX compute suitable masks for colormap allocations

+	 */

+	visual->nplanes = Ones (visual->redMask |

+		visual->greenMask |

+		visual->blueMask |

+		alphaMask);

+	/* find widest component */

+	visual->ColormapEntries = (1 << max (Ones (visual->redMask),

+		    max (Ones (visual->greenMask),

+			Ones (visual->blueMask))));

+    }

+

+    /* remember the visual ID to detect auto-update windows */

+    compRegisterAlternateVisuals(cs, &visual->vid, 1);

+

+    return TRUE;

+}

+

+static Bool

+compAddAlternateVisuals (ScreenPtr pScreen, CompScreenPtr cs)

+{

+    int alt, ret = 0;

+

+    for (alt = 0; alt < NUM_COMP_ALTERNATE_VISUALS; alt++)

+	ret |= compAddAlternateVisual(pScreen, cs, altVisuals + alt);

+

+    return !!ret;

+}

+

+Bool

+compScreenInit (ScreenPtr pScreen)

+{

+    CompScreenPtr   cs;

+

+    if (GetCompScreen (pScreen))

+	return TRUE;

+    cs = (CompScreenPtr) malloc(sizeof (CompScreenRec));

+    if (!cs)

+	return FALSE;

+

+    cs->damaged = FALSE;

+    cs->overlayWid = FakeClientID(0);

+    cs->pOverlayWin = NULL;

+    cs->pOverlayClients = NULL;

+

+    cs->numAlternateVisuals = 0;

+    cs->alternateVisuals = NULL;

+

+    if (!compAddAlternateVisuals (pScreen, cs))

+    {

+	free(cs);

+	return FALSE;

+    }

+

+    cs->PositionWindow = pScreen->PositionWindow;

+    pScreen->PositionWindow = compPositionWindow;

+

+    cs->CopyWindow = pScreen->CopyWindow;

+    pScreen->CopyWindow = compCopyWindow;

+

+    cs->CreateWindow = pScreen->CreateWindow;

+    pScreen->CreateWindow = compCreateWindow;

+

+    cs->DestroyWindow = pScreen->DestroyWindow;

+    pScreen->DestroyWindow = compDestroyWindow;

+

+    cs->RealizeWindow = pScreen->RealizeWindow;

+    pScreen->RealizeWindow = compRealizeWindow;

+

+    cs->UnrealizeWindow = pScreen->UnrealizeWindow;

+    pScreen->UnrealizeWindow = compUnrealizeWindow;

+

+    cs->ClipNotify = pScreen->ClipNotify;

+    pScreen->ClipNotify = compClipNotify;

+

+    cs->MoveWindow = pScreen->MoveWindow;

+    pScreen->MoveWindow = compMoveWindow;

+

+    cs->ResizeWindow = pScreen->ResizeWindow;

+    pScreen->ResizeWindow = compResizeWindow;

+

+    cs->ChangeBorderWidth = pScreen->ChangeBorderWidth;

+    pScreen->ChangeBorderWidth = compChangeBorderWidth;

+

+    cs->ReparentWindow = pScreen->ReparentWindow;

+    pScreen->ReparentWindow = compReparentWindow;

+

+    cs->InstallColormap = pScreen->InstallColormap;

+    pScreen->InstallColormap = compInstallColormap;

+

+    cs->ChangeWindowAttributes = pScreen->ChangeWindowAttributes;

+    pScreen->ChangeWindowAttributes = compChangeWindowAttributes;

+

+    cs->BlockHandler = pScreen->BlockHandler;

+    pScreen->BlockHandler = compBlockHandler;

+

+    cs->CloseScreen = pScreen->CloseScreen;

+    pScreen->CloseScreen = compCloseScreen;

+

+    dixSetPrivate(&pScreen->devPrivates, CompScreenPrivateKey, cs);

+

+    RegisterRealChildHeadProc(CompositeRealChildHead);

+

+    return TRUE;

+}

diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c
index ce6db9977..5846c34c5 100644
--- a/xorg-server/composite/compoverlay.c
+++ b/xorg-server/composite/compoverlay.c
@@ -66,7 +66,7 @@ compFreeOverlayClient (CompOverlayClientPtr pOcToDel)
     {

 	if (pOc == pOcToDel) {

 	    *pPrev = pOc->pNext;

-	    xfree (pOc);

+	    free(pOc);

 	    break;

 	}

     }

@@ -101,7 +101,7 @@ compCreateOverlayClient (ScreenPtr pScreen, ClientPtr pClient)
     CompScreenPtr    cs = GetCompScreen(pScreen);

     CompOverlayClientPtr pOc;

 

-    pOc = (CompOverlayClientPtr) xalloc(sizeof(CompOverlayClientRec));

+    pOc = (CompOverlayClientPtr) malloc(sizeof(CompOverlayClientRec));

     if (pOc == NULL)

 	return NULL;