libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 278 insertions, 271 deletions

diff --git a/xorg-server/hw/xquartz/xpr/dri.c b/xorg-server/hw/xquartz/xpr/dri.c
index a58f2c76d..0ce1d0771 100644
--- a/xorg-server/hw/xquartz/xpr/dri.c
+++ b/xorg-server/hw/xquartz/xpr/dri.c
@@ -75,12 +75,16 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <AvailabilityMacros.h>
 
 static DevPrivateKeyRec DRIScreenPrivKeyRec;
+
 #define DRIScreenPrivKey (&DRIScreenPrivKeyRec)
 static DevPrivateKeyRec DRIWindowPrivKeyRec;
+
 #define DRIWindowPrivKey (&DRIWindowPrivKeyRec)
 static DevPrivateKeyRec DRIPixmapPrivKeyRec;
+
 #define DRIPixmapPrivKey (&DRIPixmapPrivKeyRec)
 static DevPrivateKeyRec DRIPixmapBufferPrivKeyRec;
+
 #define DRIPixmapBufferPrivKey (&DRIPixmapBufferPrivKeyRec)
 
 static RESTYPE DRIDrawablePrivResType;
@@ -96,29 +100,29 @@ typedef struct {
     int width;
     int height;
     char shmPath[PATH_MAX];
-    int fd; /* From shm_open (for now) */
-    size_t length; /* length of buffer */
-    void *buffer;       
+    int fd;                     /* From shm_open (for now) */
+    size_t length;              /* length of buffer */
+    void *buffer;
 } DRIPixmapBuffer, *DRIPixmapBufferPtr;
 
 Bool
 DRIScreenInit(ScreenPtr pScreen)
 {
-    DRIScreenPrivPtr    pDRIPriv;
-    int                 i;
+    DRIScreenPrivPtr pDRIPriv;
+    int i;
 
     if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))
-	return FALSE;
+        return FALSE;
     if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))
-	return FALSE;
+        return FALSE;
     if (!dixRegisterPrivateKey(&DRIPixmapPrivKeyRec, PRIVATE_PIXMAP, 0))
-	return FALSE;
+        return FALSE;
     if (!dixRegisterPrivateKey(&DRIPixmapBufferPrivKeyRec, PRIVATE_PIXMAP, 0))
-	return FALSE;
+        return FALSE;
 
     pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));
     if (!pDRIPriv) {
-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+        dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
         return FALSE;
     }
 
@@ -137,7 +141,7 @@ DRIScreenInit(ScreenPtr pScreen)
 Bool
 DRIFinishScreenInit(ScreenPtr pScreen)
 {
-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
     /* Wrap DRI support */
     pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
@@ -167,7 +171,7 @@ DRICloseScreen(ScreenPtr pScreen)
 
     if (pDRIPriv && pDRIPriv->directRenderingSupport) {
         free(pDRIPriv);
-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+        dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
     }
 }
 
@@ -175,7 +179,7 @@ Bool
 DRIExtensionInit(void)
 {
     DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
-						   "DRIDrawable");
+                                                   "DRIDrawable");
 
     return DRIDrawablePrivResType != 0;
 }
@@ -193,7 +197,7 @@ DRIReset(void)
 }
 
 Bool
-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool *isCapable)
 {
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
@@ -213,7 +217,8 @@ DRIAuthConnection(ScreenPtr pScreen, unsigned int magic)
 
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
 
-    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
+    if (drmAuthMagic(pDRIPriv->drmFD, magic))
+        return FALSE;
 #endif
     return TRUE;
 }
@@ -246,12 +251,13 @@ DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
 
         wc.shape_nrects = RegionNumRects(&pWin->clipList);
         wc.shape_rects = RegionRects(&pWin->clipList);
-        wc.shape_tx = - (pTopWin->drawable.x - pTopWin->borderWidth);
-        wc.shape_ty = - (pTopWin->drawable.y - pTopWin->borderWidth);
+        wc.shape_tx = -(pTopWin->drawable.x - pTopWin->borderWidth);
+        wc.shape_ty = -(pTopWin->drawable.y - pTopWin->borderWidth);
 
         flags |= XP_BOUNDS | XP_SHAPE;
 
-    } else if (pDraw->type == DRAWABLE_PIXMAP) {
+    }
+    else if (pDraw->type == DRAWABLE_PIXMAP) {
         wc.x = 0;
         wc.y = 0;
         wc.width = pDraw->width;
@@ -265,7 +271,8 @@ DRIUpdateSurface(DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
 
 /* Return NULL if an error occurs. */
 static DRIDrawablePrivPtr
-CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id *widPtr) {
+CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id * widPtr)
+{
     DRIDrawablePrivPtr pDRIDrawablePriv;
     xp_window_id wid = 0;
 
@@ -274,50 +281,49 @@ CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id *widPtr)
     pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
 
     if (pDRIDrawablePriv == NULL) {
-	xp_error err;
-	xp_window_changes wc;
-	
-	/* allocate a DRI Window Private record */
-	if (!(pDRIDrawablePriv = malloc(sizeof(*pDRIDrawablePriv)))) {
-	    return NULL;
-	}
-	
-	pDRIDrawablePriv->pDraw = (DrawablePtr)pWin;
-	pDRIDrawablePriv->pScreen = pScreen;
-	pDRIDrawablePriv->refCount = 0;
-	pDRIDrawablePriv->drawableIndex = -1;
-	pDRIDrawablePriv->notifiers = NULL;
-	
-	/* find the physical window */
-	wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, TRUE));
-
-	if (wid == 0) {
-	    free(pDRIDrawablePriv);
-	    return NULL;
-	}
-	
-	/* allocate the physical surface */
-	err = xp_create_surface(wid, &pDRIDrawablePriv->sid);
-
-	if (err != Success) {
-	    free(pDRIDrawablePriv);
-	    return NULL;
-	}
-
-	/* Make it visible */
-	wc.stack_mode = XP_MAPPED_ABOVE;
-	wc.sibling = 0;
-	err = xp_configure_surface(pDRIDrawablePriv->sid, XP_STACKING, &wc);
-
-	if (err != Success) {
-	    xp_destroy_surface(pDRIDrawablePriv->sid);
-	    free(pDRIDrawablePriv);
-	    return NULL;
-	}
-
-	/* save private off of preallocated index */
-	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
-		      pDRIDrawablePriv);
+        xp_error err;
+        xp_window_changes wc;
+
+        /* allocate a DRI Window Private record */
+        if (!(pDRIDrawablePriv = malloc(sizeof(*pDRIDrawablePriv)))) {
+            return NULL;
+        }
+
+        pDRIDrawablePriv->pDraw = (DrawablePtr) pWin;
+        pDRIDrawablePriv->pScreen = pScreen;
+        pDRIDrawablePriv->refCount = 0;
+        pDRIDrawablePriv->drawableIndex = -1;
+        pDRIDrawablePriv->notifiers = NULL;
+
+        /* find the physical window */
+        wid = x_cvt_vptr_to_uint(RootlessFrameForWindow(pWin, TRUE));
+
+        if (wid == 0) {
+            free(pDRIDrawablePriv);
+            return NULL;
+        }
+
+        /* allocate the physical surface */
+        err = xp_create_surface(wid, &pDRIDrawablePriv->sid);
+
+        if (err != Success) {
+            free(pDRIDrawablePriv);
+            return NULL;
+        }
+
+        /* Make it visible */
+        wc.stack_mode = XP_MAPPED_ABOVE;
+        wc.sibling = 0;
+        err = xp_configure_surface(pDRIDrawablePriv->sid, XP_STACKING, &wc);
+
+        if (err != Success) {
+            xp_destroy_surface(pDRIDrawablePriv->sid);
+            free(pDRIDrawablePriv);
+            return NULL;
+        }
+
+        /* save private off of preallocated index */
+        dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, pDRIDrawablePriv);
     }
 
     *widPtr = wid;
@@ -327,111 +333,109 @@ CreateSurfaceForWindow(ScreenPtr pScreen, WindowPtr pWin, xp_window_id *widPtr)
 
 /* Return NULL if an error occurs. */
 static DRIDrawablePrivPtr
-CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix) {
+CreateSurfaceForPixmap(ScreenPtr pScreen, PixmapPtr pPix)
+{
     DRIDrawablePrivPtr pDRIDrawablePriv;
-     
+
     pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
 
     if (pDRIDrawablePriv == NULL) {
-	xp_error err;
-
-	/* allocate a DRI Window Private record */
-	if (!(pDRIDrawablePriv = calloc(1, sizeof(*pDRIDrawablePriv)))) {
-	    return NULL;
-	}
-	
-	pDRIDrawablePriv->pDraw = (DrawablePtr)pPix;
-	pDRIDrawablePriv->pScreen = pScreen;
-	pDRIDrawablePriv->refCount = 0;
-	pDRIDrawablePriv->drawableIndex = -1;
-	pDRIDrawablePriv->notifiers = NULL;
-	
-	/* Passing a null window id to Xplugin in 10.3+ asks for
-	   an accelerated offscreen surface. */
-	
-	err = xp_create_surface(0, &pDRIDrawablePriv->sid);
-	if (err != Success) {
-	    free(pDRIDrawablePriv);
-	    return NULL;
-	}
-
-	/* 
-	 * The DRIUpdateSurface will be called to resize the surface
-	 * after this function, if the export is successful.
-	 */
-
-	/* save private off of preallocated index */
-	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey,
-		      pDRIDrawablePriv);
-    }
-    
+        xp_error err;
+
+        /* allocate a DRI Window Private record */
+        if (!(pDRIDrawablePriv = calloc(1, sizeof(*pDRIDrawablePriv)))) {
+            return NULL;
+        }
+
+        pDRIDrawablePriv->pDraw = (DrawablePtr) pPix;
+        pDRIDrawablePriv->pScreen = pScreen;
+        pDRIDrawablePriv->refCount = 0;
+        pDRIDrawablePriv->drawableIndex = -1;
+        pDRIDrawablePriv->notifiers = NULL;
+
+        /* Passing a null window id to Xplugin in 10.3+ asks for
+           an accelerated offscreen surface. */
+
+        err = xp_create_surface(0, &pDRIDrawablePriv->sid);
+        if (err != Success) {
+            free(pDRIDrawablePriv);
+            return NULL;
+        }
+
+        /* 
+         * The DRIUpdateSurface will be called to resize the surface
+         * after this function, if the export is successful.
+         */
+
+        /* save private off of preallocated index */
+        dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, pDRIDrawablePriv);
+    }
+
     return pDRIDrawablePriv;
 }
 
-
 Bool
 DRICreateSurface(ScreenPtr pScreen, Drawable id,
                  DrawablePtr pDrawable, xp_client_id client_id,
-                 xp_surface_id *surface_id, unsigned int ret_key[2],
+                 xp_surface_id * surface_id, unsigned int ret_key[2],
                  void (*notify) (void *arg, void *data), void *notify_data)
 {
-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    xp_window_id        wid = 0;
-    DRIDrawablePrivPtr  pDRIDrawablePriv;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    xp_window_id wid = 0;
+    DRIDrawablePrivPtr pDRIDrawablePriv;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	pDRIDrawablePriv = CreateSurfaceForWindow(pScreen, 
-						  (WindowPtr)pDrawable, &wid);
+        pDRIDrawablePriv = CreateSurfaceForWindow(pScreen,
+                                                  (WindowPtr) pDrawable, &wid);
 
-	if(NULL == pDRIDrawablePriv)
-	    return FALSE; /*error*/
+        if (NULL == pDRIDrawablePriv)
+            return FALSE;       /*error */
     }
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
     else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen, 
-						  (PixmapPtr)pDrawable);
+        pDRIDrawablePriv = CreateSurfaceForPixmap(pScreen,
+                                                  (PixmapPtr) pDrawable);
 
-	if(NULL == pDRIDrawablePriv)
-	    return FALSE; /*error*/
+        if (NULL == pDRIDrawablePriv)
+            return FALSE;       /*error */
     }
 #endif
     else {
-	/* We handle GLXPbuffers in a different way (via CGL). */
+        /* We handle GLXPbuffers in a different way (via CGL). */
         return FALSE;
     }
-    
-    
+
     /* Finish initialization of new surfaces */
     if (pDRIDrawablePriv->refCount == 0) {
-        unsigned int key[2] = {0};
+        unsigned int key[2] = { 0 };
         xp_error err;
 
         /* try to give the client access to the surface */
         if (client_id != 0) {
-	    /*
-	     * Xplugin accepts a 0 wid if the surface id is offscreen, such 
-	     * as for a pixmap.
-	     */
-            err = xp_export_surface(wid, pDRIDrawablePriv->sid,
-                                    client_id, key);
+            /*
+             * Xplugin accepts a 0 wid if the surface id is offscreen, such 
+             * as for a pixmap.
+             */
+            err = xp_export_surface(wid, pDRIDrawablePriv->sid, client_id, key);
             if (err != Success) {
                 xp_destroy_surface(pDRIDrawablePriv->sid);
                 free(pDRIDrawablePriv);
-		
-		/* 
-		 * Now set the dix privates to NULL that were previously set.
-		 * This prevents reusing an invalid pointer.
-		 */
-		if(pDrawable->type == DRAWABLE_WINDOW) {
-		    WindowPtr pWin = (WindowPtr)pDrawable;
-		    
-		    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
-		} else if(pDrawable->type == DRAWABLE_PIXMAP) {
-		    PixmapPtr pPix = (PixmapPtr)pDrawable;
-		    
-		    dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
-		}
-		
+
+                /* 
+                 * Now set the dix privates to NULL that were previously set.
+                 * This prevents reusing an invalid pointer.
+                 */
+                if (pDrawable->type == DRAWABLE_WINDOW) {
+                    WindowPtr pWin = (WindowPtr) pDrawable;
+
+                    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
+                }
+                else if (pDrawable->type == DRAWABLE_PIXMAP) {
+                    PixmapPtr pPix = (PixmapPtr) pDrawable;
+
+                    dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
+                }
+
                 return FALSE;
             }
         }
@@ -445,10 +449,11 @@ DRICreateSurface(ScreenPtr pScreen, Drawable id,
         if (surface_hash == NULL)
             surface_hash = x_hash_table_new(NULL, NULL, NULL, NULL);
         x_hash_table_insert(surface_hash,
-                            x_cvt_uint_to_vptr(pDRIDrawablePriv->sid), pDRIDrawablePriv);
+                            x_cvt_uint_to_vptr(pDRIDrawablePriv->sid),
+                            pDRIDrawablePriv);
 
         /* track this in case this window is destroyed */
-        AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+        AddResource(id, DRIDrawablePrivResType, (pointer) pDrawable);
 
         /* Initialize shape */
         DRIUpdateSurface(pDRIDrawablePriv, pDrawable);
@@ -475,38 +480,40 @@ Bool
 DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
                   void (*notify) (void *, void *), void *notify_data)
 {
-    DRIDrawablePrivPtr  pDRIDrawablePriv;
+    DRIDrawablePrivPtr pDRIDrawablePriv;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr)pDrawable);
-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr)pDrawable);
-    } else {
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr) pDrawable);
+    }
+    else if (pDrawable->type == DRAWABLE_PIXMAP) {
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr) pDrawable);
+    }
+    else {
         return FALSE;
     }
 
     if (pDRIDrawablePriv != NULL) {
-	/*
-	 * This doesn't seem to be used, because notify is NULL in all callers.
-	 */
+        /*
+         * This doesn't seem to be used, because notify is NULL in all callers.
+         */
 
         if (notify != NULL) {
-            pDRIDrawablePriv->notifiers = x_hook_remove(pDRIDrawablePriv->notifiers,
-                                                        notify, notify_data);
+            pDRIDrawablePriv->notifiers =
+                x_hook_remove(pDRIDrawablePriv->notifiers, notify, notify_data);
         }
 
-	--pDRIDrawablePriv->refCount;
+        --pDRIDrawablePriv->refCount;
 
-	/* 
-	 * Check if the drawable privates still have a reference to the
-	 * surface.
-	 */
+        /* 
+         * Check if the drawable privates still have a reference to the
+         * surface.
+         */
 
         if (pDRIDrawablePriv->refCount <= 0) {
             /*
-	     * This calls back to DRIDrawablePrivDelete which
-	     * frees the private area and dispatches events, if needed. 
-	     */
+             * This calls back to DRIDrawablePrivDelete which
+             * frees the private area and dispatches events, if needed. 
+             */
             FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
         }
     }
@@ -521,38 +528,38 @@ DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
 Bool
 DRIDrawablePrivDelete(pointer pResource, XID id)
 {
-    DrawablePtr         pDrawable = (DrawablePtr)pResource;
-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
-    DRIDrawablePrivPtr  pDRIDrawablePriv = NULL;
-    WindowPtr           pWin = NULL;
-    PixmapPtr           pPix = NULL;
+    DrawablePtr pDrawable = (DrawablePtr) pResource;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv = NULL;
+    WindowPtr pWin = NULL;
+    PixmapPtr pPix = NULL;
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-        pWin = (WindowPtr)pDrawable;
+        pWin = (WindowPtr) pDrawable;
         pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-        pPix = (PixmapPtr)pDrawable;
+    }
+    else if (pDrawable->type == DRAWABLE_PIXMAP) {
+        pPix = (PixmapPtr) pDrawable;
         pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
     }
 
     if (pDRIDrawablePriv == NULL) {
-	/* 
-	 * We reuse __func__ and the resource type for the GLXPixmap code.
-	 * Attempt to free a pixmap buffer associated with the resource
-	 * if possible.
-	 */
-	return DRIFreePixmapImp(pDrawable);
-    }
-    
+        /* 
+         * We reuse __func__ and the resource type for the GLXPixmap code.
+         * Attempt to free a pixmap buffer associated with the resource
+         * if possible.
+         */
+        return DRIFreePixmapImp(pDrawable);
+    }
+
     if (pDRIDrawablePriv->drawableIndex != -1) {
         /* release drawable table entry */
         pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
     }
 
     if (pDRIDrawablePriv->sid != 0) {
-	DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);
+        DRISurfaceNotify(pDRIDrawablePriv->sid, AppleDRISurfaceNotifyDestroyed);
     }
-  
 
     if (pDRIDrawablePriv->notifiers != NULL)
         x_hook_free(pDRIDrawablePriv->notifiers);
@@ -560,9 +567,10 @@ DRIDrawablePrivDelete(pointer pResource, XID id)
     free(pDRIDrawablePriv);
 
     if (pDrawable->type == DRAWABLE_WINDOW) {
-	dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
-    } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
+        dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
+    }
+    else if (pDrawable->type == DRAWABLE_PIXMAP) {
+        dixSetPrivate(&pPix->devPrivates, DRIPixmapPrivKey, NULL);
     }
 
     --pDRIPriv->nrWindows;
@@ -583,7 +591,7 @@ DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
 
     pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
 
-    (*pScreen->WindowExposures)(pWin, prgn, bsreg);
+    (*pScreen->WindowExposures) (pWin, prgn, bsreg);
 
     pScreen->WindowExposures = DRIWindowExposures;
 }
@@ -596,17 +604,17 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     DRIDrawablePrivPtr pDRIDrawablePriv;
 
     if (pDRIPriv->nrWindows > 0) {
-       pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
-       if (pDRIDrawablePriv != NULL) {
+        pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+        if (pDRIDrawablePriv != NULL) {
             DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);
-       }
+        }
     }
 
     /* unwrap */
     pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
 
     /* call lower layers */
-    (*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
+    (*pScreen->CopyWindow) (pWin, ptOldOrg, prgnSrc);
 
     /* rewrap */
     pScreen->CopyWindow = DRICopyWindow;
@@ -623,7 +631,7 @@ DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
     pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
 
     /* call lower layers */
-    returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
+    returnValue = (*pScreen->ValidateTree) (pParent, pChild, kind);
 
     /* rewrap */
     pScreen->ValidateTree = DRIValidateTree;
@@ -639,7 +647,8 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
 
     if (pParent) {
         pScreen = pParent->drawable.pScreen;
-    } else {
+    }
+    else {
         pScreen = pChild->drawable.pScreen;
     }
     pDRIPriv = DRI_SCREEN_PRIV(pScreen);
@@ -649,7 +658,7 @@ DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
         pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
 
         /* call lower layers */
-        (*pScreen->PostValidateTree)(pParent, pChild, kind);
+        (*pScreen->PostValidateTree) (pParent, pChild, kind);
 
         /* rewrap */
         pScreen->PostValidateTree = DRIPostValidateTree;
@@ -661,7 +670,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-    DRIDrawablePrivPtr  pDRIDrawablePriv;
+    DRIDrawablePrivPtr pDRIDrawablePriv;
 
     if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
         DRIUpdateSurface(pDRIDrawablePriv, &pWin->drawable);
@@ -670,7 +679,7 @@ DRIClipNotify(WindowPtr pWin, int dx, int dy)
     if (pDRIPriv->wrap.ClipNotify) {
         pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
 
-        (*pScreen->ClipNotify)(pWin, dx, dy);
+        (*pScreen->ClipNotify) (pWin, dx, dy);
 
         pScreen->ClipNotify = DRIClipNotify;
     }
@@ -687,9 +696,7 @@ DRIGetWrappedFuncs(ScreenPtr pScreen)
 }
 
 void
-DRIQueryVersion(int *majorVersion,
-                int *minorVersion,
-                int *patchVersion)
+DRIQueryVersion(int *majorVersion, int *minorVersion, int *patchVersion)
 {
     *majorVersion = APPLE_DRI_MAJOR_VERSION;
     *minorVersion = APPLE_DRI_MINOR_VERSION;
@@ -700,7 +707,7 @@ DRIQueryVersion(int *majorVersion,
  * Note: this also cleans up the hash table in addition to notifying clients.
  * The sid/surface-id should not be used after this, because it will be
  * invalid.
- */ 
+ */
 void
 DRISurfaceNotify(xp_surface_id id, int kind)
 {
@@ -710,8 +717,7 @@ DRISurfaceNotify(xp_surface_id id, int kind)
     arg.id = id;
     arg.kind = kind;
 
-    if (surface_hash != NULL)
-    {
+    if (surface_hash != NULL) {
         pDRIDrawablePriv = x_hash_table_lookup(surface_hash,
                                                x_cvt_uint_to_vptr(id), NULL);
     }
@@ -719,24 +725,22 @@ DRISurfaceNotify(xp_surface_id id, int kind)
     if (pDRIDrawablePriv == NULL)
         return;
 
-    if (kind == AppleDRISurfaceNotifyDestroyed)
-    {
-	x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));
+    if (kind == AppleDRISurfaceNotifyDestroyed) {
+        x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(id));
     }
 
     x_hook_run(pDRIDrawablePriv->notifiers, &arg);
 
-    if (kind == AppleDRISurfaceNotifyDestroyed)
-    {
-	xp_error error;
-	
-	error = xp_destroy_surface(pDRIDrawablePriv->sid);
-	
-	if(error) 
-	    ErrorF("%s: xp_destroy_surface failed: %d\n", __func__, error);
-		
-	/* Guard against reuse, even though we are freeing after this. */
-	pDRIDrawablePriv->sid = 0;
+    if (kind == AppleDRISurfaceNotifyDestroyed) {
+        xp_error error;
+
+        error = xp_destroy_surface(pDRIDrawablePriv->sid);
+
+        if (error)
+            ErrorF("%s: xp_destroy_surface failed: %d\n", __func__, error);
+
+        /* Guard against reuse, even though we are freeing after this. */
+        pDRIDrawablePriv->sid = 0;
 
         FreeResourceByType(pDRIDrawablePriv->pDraw->id,
                            DRIDrawablePrivResType, FALSE);
@@ -747,137 +751,140 @@ DRISurfaceNotify(xp_surface_id id, int kind)
  * This creates a shared memory buffer for use with GLXPixmaps
  * and AppleSGLX.
  */
-Bool DRICreatePixmap(ScreenPtr pScreen, Drawable id,
-		     DrawablePtr pDrawable, char *path,
-		     size_t pathmax) 
+Bool
+DRICreatePixmap(ScreenPtr pScreen, Drawable id,
+                DrawablePtr pDrawable, char *path, size_t pathmax)
 {
     DRIPixmapBufferPtr shared;
     PixmapPtr pPix;
-    
-    if(pDrawable->type != DRAWABLE_PIXMAP)
-	return FALSE;
 
-    pPix = (PixmapPtr)pDrawable;
+    if (pDrawable->type != DRAWABLE_PIXMAP)
+        return FALSE;
+
+    pPix = (PixmapPtr) pDrawable;
 
     shared = malloc(sizeof(*shared));
-    if(NULL == shared) {
+    if (NULL == shared) {
         FatalError("failed to allocate DRIPixmapBuffer in %s\n", __func__);
     }
-        
+
     shared->pDrawable = pDrawable;
     shared->refCount = 1;
 
-    if(pDrawable->bitsPerPixel >= 24) {
-	shared->bytesPerPixel = 4;
-    } else if(pDrawable->bitsPerPixel <= 16) {
-	shared->bytesPerPixel = 2;
+    if (pDrawable->bitsPerPixel >= 24) {
+        shared->bytesPerPixel = 4;
     }
-    
+    else if (pDrawable->bitsPerPixel <= 16) {
+        shared->bytesPerPixel = 2;
+    }
+
     shared->width = pDrawable->width;
     shared->height = pDrawable->height;
-    
-    if(-1 == snprintf(shared->shmPath, sizeof(shared->shmPath),
-                      "%d_0x%lx", getpid(),
-                      (unsigned long)id)) {
+
+    if (-1 == snprintf(shared->shmPath, sizeof(shared->shmPath),
+                       "%d_0x%lx", getpid(), (unsigned long) id)) {
         FatalError("buffer overflow in %s\n", __func__);
     }
-    
-    shared->fd = shm_open(shared->shmPath, 
-                          O_RDWR | O_EXCL | O_CREAT, 
+
+    shared->fd = shm_open(shared->shmPath,
+                          O_RDWR | O_EXCL | O_CREAT,
                           S_IRUSR | S_IWUSR | S_IROTH | S_IWOTH);
-    
-    if(-1 == shared->fd) {
-	free(shared);
+
+    if (-1 == shared->fd) {
+        free(shared);
         return FALSE;
-    }   
-    
+    }
+
     shared->length = shared->width * shared->height * shared->bytesPerPixel;
-    
-    if(-1 == ftruncate(shared->fd, shared->length)) {
-	ErrorF("failed to ftruncate (extend) file.");
-	shm_unlink(shared->shmPath);
-	close(shared->fd);
-	free(shared);
-	return FALSE;
+
+    if (-1 == ftruncate(shared->fd, shared->length)) {
+        ErrorF("failed to ftruncate (extend) file.");
+        shm_unlink(shared->shmPath);
+        close(shared->fd);
+        free(shared);
+        return FALSE;
     }
 
     shared->buffer = mmap(NULL, shared->length,
                           PROT_READ | PROT_WRITE,
                           MAP_FILE | MAP_SHARED, shared->fd, 0);
-    
-    if(MAP_FAILED == shared->buffer) {
-	ErrorF("failed to mmap shared memory.");
-	shm_unlink(shared->shmPath);
-	close(shared->fd);
-	free(shared);
-	return FALSE;
-    }
-    
+
+    if (MAP_FAILED == shared->buffer) {
+        ErrorF("failed to mmap shared memory.");
+        shm_unlink(shared->shmPath);
+        close(shared->fd);
+        free(shared);
+        return FALSE;
+    }
+
     strlcpy(path, shared->shmPath, pathmax);
-    
+
     dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, shared);
 
-    AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
+    AddResource(id, DRIDrawablePrivResType, (pointer) pDrawable);
 
     return TRUE;
 }
 
-
-Bool DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
-		      int *pitch, int *bpp, void **ptr) {
+Bool
+DRIGetPixmapData(DrawablePtr pDrawable, int *width, int *height,
+                 int *pitch, int *bpp, void **ptr)
+{
     PixmapPtr pPix;
     DRIPixmapBufferPtr shared;
 
-    if(pDrawable->type != DRAWABLE_PIXMAP)
-	return FALSE;
+    if (pDrawable->type != DRAWABLE_PIXMAP)
+        return FALSE;
 
-    pPix = (PixmapPtr)pDrawable;
+    pPix = (PixmapPtr) pDrawable;
 
     shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
 
-    if(NULL == shared)
-	return FALSE;
+    if (NULL == shared)
+        return FALSE;
 
     assert(pDrawable->width == shared->width);
     assert(pDrawable->height == shared->height);
-    
+
     *width = shared->width;
     *height = shared->height;
     *bpp = shared->bytesPerPixel;
     *pitch = shared->width * shared->bytesPerPixel;
-    *ptr = shared->buffer;    
+    *ptr = shared->buffer;
 
     return TRUE;
 }
 
 static Bool
-DRIFreePixmapImp(DrawablePtr pDrawable) {
+DRIFreePixmapImp(DrawablePtr pDrawable)
+{
     DRIPixmapBufferPtr shared;
     PixmapPtr pPix;
 
-    if(pDrawable->type != DRAWABLE_PIXMAP)
-	return FALSE;
+    if (pDrawable->type != DRAWABLE_PIXMAP)
+        return FALSE;
 
-    pPix = (PixmapPtr)pDrawable;
+    pPix = (PixmapPtr) pDrawable;
 
     shared = dixLookupPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey);
 
-    if(NULL == shared)
-	return FALSE;
+    if (NULL == shared)
+        return FALSE;
 
     close(shared->fd);
     munmap(shared->buffer, shared->length);
     shm_unlink(shared->shmPath);
     free(shared);
 
-    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer)NULL);
+    dixSetPrivate(&pPix->devPrivates, DRIPixmapBufferPrivKey, (pointer) NULL);
 
     return TRUE;
 }
 
-void 
-DRIDestroyPixmap(DrawablePtr pDrawable) {
-    if(DRIFreePixmapImp(pDrawable))
-	FreeResourceByType(pDrawable->id, DRIDrawablePrivResType, FALSE);
+void
+DRIDestroyPixmap(DrawablePtr pDrawable)
+{
+    if (DRIFreePixmapImp(pDrawable))
+        FreeResourceByType(pDrawable->id, DRIDrawablePrivResType, FALSE);
 
 }