1 files changed, 94 insertions, 105 deletions
diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c
index e351c502d..8b7c7040c 100644
--- a/hw/xwin/wingc.c
+++ b/hw/xwin/wingc.c
@@ -34,8 +34,9 @@
 #include "win.h"
 
 void
-winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int dy, int xOrg, int yOrg);
 
+winPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx,
+              int dy, int xOrg, int yOrg);
 
 /*
  * Local prototypes
@@ -43,208 +44,196 @@ winPushPixels (GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDrawable, int dx, int
 
 #if 0
 static void
-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges);
+ winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges);
 #endif
 
 static void
-winValidateGCNativeGDI (GCPtr pGC,
-			unsigned long changes,
-			DrawablePtr pDrawable);
+
+winValidateGCNativeGDI(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable);
 
 #if 0
 static void
-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
+ winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst);
 #endif
 
 static void
-winDestroyGCNativeGDI (GCPtr pGC);
+ winDestroyGCNativeGDI(GCPtr pGC);
 
 #if 0
 static void
-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects);
+ winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects);
 
 static void
-winDestroyClipNativeGDI (GCPtr pGC);
+ winDestroyClipNativeGDI(GCPtr pGC);
 
 static void
-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc);
+ winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc);
 #endif
 
 #if 0
 /* GC Handling Routines */
 const GCFuncs winGCFuncs = {
-  winValidateGCNativeGDI,
-  winChangeGCNativeGDI,
-  winCopyGCNativeGDI,
-  winDestroyGCNativeGDI,
-  winChangeClipNativeGDI,
-  winDestroyClipNativeGDI,
-  winCopyClipNativeGDI,
+    winValidateGCNativeGDI,
+    winChangeGCNativeGDI,
+    winCopyGCNativeGDI,
+    winDestroyGCNativeGDI,
+    winChangeClipNativeGDI,
+    winDestroyClipNativeGDI,
+    winCopyClipNativeGDI,
 };
 #else
 const GCFuncs winGCFuncs = {
-  winValidateGCNativeGDI,
-  miChangeGC,
-  miCopyGC,
-  winDestroyGCNativeGDI,
-  miChangeClip,
-  miDestroyClip,
-  miCopyClip,
+    winValidateGCNativeGDI,
+    miChangeGC,
+    miCopyGC,
+    winDestroyGCNativeGDI,
+    miChangeClip,
+    miDestroyClip,
+    miCopyClip,
 };
 #endif
 
 /* Drawing Primitives */
 const GCOps winGCOps = {
-  winFillSpansNativeGDI,
-  winSetSpansNativeGDI,
-  miPutImage,
-  miCopyArea,
-  miCopyPlane,
-  miPolyPoint,
-  winPolyLineNativeGDI,
-  miPolySegment,
-  miPolyRectangle,
-  miPolyArc,
-  miFillPolygon,
-  miPolyFillRect,
-  miPolyFillArc,
-  miPolyText8,
-  miPolyText16,
-  miImageText8,
-  miImageText16,
+    winFillSpansNativeGDI,
+    winSetSpansNativeGDI,
+    miPutImage,
+    miCopyArea,
+    miCopyPlane,
+    miPolyPoint,
+    winPolyLineNativeGDI,
+    miPolySegment,
+    miPolyRectangle,
+    miPolyArc,
+    miFillPolygon,
+    miPolyFillRect,
+    miPolyFillArc,
+    miPolyText8,
+    miPolyText16,
+    miImageText8,
+    miImageText16,
 #if 0
-  winImageGlyphBltNativeGDI,
-  winPolyGlyphBltNativeGDI,
+    winImageGlyphBltNativeGDI,
+    winPolyGlyphBltNativeGDI,
 #else
-  miImageGlyphBlt,
-  miPolyGlyphBlt,
+    miImageGlyphBlt,
+    miPolyGlyphBlt,
 #endif
-  miPushPixels,
+    miPushPixels,
 };
 
-
 /* See Porting Layer Definition - p. 45 */
 /* See mfb/mfbgc.c - mfbCreateGC() */
 /* See Strategies for Porting - pp. 15, 16 */
 Bool
-winCreateGCNativeGDI (GCPtr pGC)
+winCreateGCNativeGDI(GCPtr pGC)
 {
-  winPrivGCPtr		pGCPriv = NULL;
-  winPrivScreenPtr	pScreenPriv = NULL;
+    winPrivGCPtr pGCPriv = NULL;
+    winPrivScreenPtr pScreenPriv = NULL;
 
 #if 0
-  ErrorF ("winCreateGCNativeGDI - depth: %d\n",
-	  pGC->depth);
+    ErrorF("winCreateGCNativeGDI - depth: %d\n", pGC->depth);
 #endif
 
-  pGC->ops = (GCOps *) &winGCOps;
-  pGC->funcs = (GCFuncs *) &winGCFuncs;
+    pGC->ops = (GCOps *) & winGCOps;
+    pGC->funcs = (GCFuncs *) & winGCFuncs;
 
-  /* We want all coordinates passed to spans functions to be screen relative */
-  pGC->miTranslate = TRUE;
+    /* We want all coordinates passed to spans functions to be screen relative */
+    pGC->miTranslate = TRUE;
 
-  /* Allocate privates for this GC */
-  pGCPriv = winGetGCPriv (pGC);
-  if (pGCPriv == NULL)
-    {
-      ErrorF ("winCreateGCNativeGDI () - Privates pointer was NULL\n");
-      return FALSE;
+    /* Allocate privates for this GC */
+    pGCPriv = winGetGCPriv(pGC);
+    if (pGCPriv == NULL) {
+        ErrorF("winCreateGCNativeGDI () - Privates pointer was NULL\n");
+        return FALSE;
     }
 
-  /* Create a new screen DC for the display window */
-  pScreenPriv = winGetScreenPriv (pGC->pScreen);
-  pGCPriv->hdc = GetDC (pScreenPriv->hwndScreen);
+    /* Create a new screen DC for the display window */
+    pScreenPriv = winGetScreenPriv(pGC->pScreen);
+    pGCPriv->hdc = GetDC(pScreenPriv->hwndScreen);
 
-  /* Allocate a memory DC for the GC */
-  pGCPriv->hdcMem = CreateCompatibleDC (pGCPriv->hdc);
+    /* Allocate a memory DC for the GC */
+    pGCPriv->hdcMem = CreateCompatibleDC(pGCPriv->hdc);
 
-  return TRUE;
+    return TRUE;
 }
 
-
 #if 0
 /* See Porting Layer Definition - p. 45 */
 static void
-winChangeGCNativeGDI (GCPtr pGC, unsigned long ulChanges)
+winChangeGCNativeGDI(GCPtr pGC, unsigned long ulChanges)
 {
 #if 0
-  ErrorF ("winChangeGCNativeGDI () - Doing nothing\n");
+    ErrorF("winChangeGCNativeGDI () - Doing nothing\n");
 #endif
 }
 #endif
 
-
 static void
-winValidateGCNativeGDI (GCPtr pGC,
-			unsigned long ulChanges,
-			DrawablePtr pDrawable)
+winValidateGCNativeGDI(GCPtr pGC,
+                       unsigned long ulChanges, DrawablePtr pDrawable)
 {
-  if ((ulChanges & (GCClipXOrigin | GCClipYOrigin | GCClipMask | GCSubwindowMode)) 
-      || (pDrawable->serialNumber != (pGC->serialNumber & DRAWABLE_SERIAL_BITS)))
-  {
-    miComputeCompositeClip (pGC, pDrawable);
-  }
+    if ((ulChanges &
+         (GCClipXOrigin | GCClipYOrigin | GCClipMask | GCSubwindowMode))
+        || (pDrawable->serialNumber !=
+            (pGC->serialNumber & DRAWABLE_SERIAL_BITS))) {
+        miComputeCompositeClip(pGC, pDrawable);
+    }
 }
 
-
 #if 0
 /* See Porting Layer Definition - p. 46 */
 static void
-winCopyGCNativeGDI (GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
+winCopyGCNativeGDI(GCPtr pGCsrc, unsigned long ulMask, GCPtr pGCdst)
 {
 
 }
 #endif
 
-
 /* See Porting Layer Definition - p. 46 */
 static void
-winDestroyGCNativeGDI (GCPtr pGC)
+winDestroyGCNativeGDI(GCPtr pGC)
 {
-  winGCPriv(pGC);
-  winScreenPriv(pGC->pScreen);
+    winGCPriv(pGC);
+    winScreenPriv(pGC->pScreen);
 
-  if (pGC->freeCompClip)
-	RegionDestroy(pGC->pCompositeClip);
+    if (pGC->freeCompClip)
+        RegionDestroy(pGC->pCompositeClip);
 
-  /* Free the memory DC */
-  if (pGCPriv->hdcMem != NULL)
-    {
-      DeleteDC (pGCPriv->hdcMem);
-      pGCPriv->hdcMem = NULL;
+    /* Free the memory DC */
+    if (pGCPriv->hdcMem != NULL) {
+        DeleteDC(pGCPriv->hdcMem);
+        pGCPriv->hdcMem = NULL;
     }
 
-  /* Release the screen DC for the display window */
-  if (pGCPriv->hdc != NULL)
-    {
-      ReleaseDC (pScreenPriv->hwndScreen, pGCPriv->hdc);
-      pGCPriv->hdc = NULL;
+    /* Release the screen DC for the display window */
+    if (pGCPriv->hdc != NULL) {
+        ReleaseDC(pScreenPriv->hwndScreen, pGCPriv->hdc);
+        pGCPriv->hdc = NULL;
     }
 
-  /* Invalidate the GC privates pointer */
-  winSetGCPriv (pGC, NULL);
+    /* Invalidate the GC privates pointer */
+    winSetGCPriv(pGC, NULL);
 }
 
 #if 0
 /* See Porting Layer Definition - p. 46 */
 static void
-winChangeClipNativeGDI (GCPtr pGC, int nType, pointer pValue, int nRects)
+winChangeClipNativeGDI(GCPtr pGC, int nType, pointer pValue, int nRects)
 {
 
 }
 
-
 /* See Porting Layer Definition - p. 47 */
 static void
-winDestroyClipNativeGDI (GCPtr pGC)
+winDestroyClipNativeGDI(GCPtr pGC)
 {
 
 }
 
-
 /* See Porting Layer Definition - p. 47 */
 static void
-winCopyClipNativeGDI (GCPtr pGCdst, GCPtr pGCsrc)
+winCopyClipNativeGDI(GCPtr pGCdst, GCPtr pGCsrc)
 {
 
 }